modules/apps/default.nix

@@ -1,13 +0,0 @@
-{
-  imports = [
-  ./alacritty  
-  ./appimage  
-  ./firefox  
-  ./helix  
-  ./newsboat  
-  ./packages  
-  ./rofi  
-  ./vm	
-  ./zsh
-  ];
-}

modules/default.nix

@@ -1,11 +1,32 @@
 {
   imports = [
-   ./apps  
-   ./desktop  
-   ./hardware  
+    ./fonts
+    ./sound
+    ./vm
+    ./packages
+    ./misc
+    ./gdm
+    ./stylix
+    ./blue
     ./services
-   ./styling  
-   ./system  
-   ./tools
+    ./syncthing
+    ./gpg
+    ./appimage
+    ./update
+    ./polkit
+    ./ssh
+    ./dunst
+    ./zsh
+    ./misc
+    ./rofi
+    ./helix
+    ./firefox
+    ./alacritty
+    ./hyprland
+    ./hypridle
+    ./newsboat
+    ./git
+    ./gtk
+    ./ags
   ];
 }

modules/desktop/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-  ./ags
-  ./hypridle
-  ./hyprland
-  ];
-}

modules/fonts/default.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  fonts.packages = with pkgs; [
+    font-awesome
+    (nerdfonts.override {fonts = ["FiraCode"];})
+  ];
+}

modules/hardware/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./bluetooth  
-    ./sound
-  ];
-}

modules/hyprland/default.nix

@@ -20,7 +20,7 @@
 
     settings = {
       "$mod" = "SUPER";
-      "$scrPath" = "~/nix/modules/desktop/hyprland/scirpts";
+      "$scrPath" = "~/nix/modules/hyprland/scirpts";
 
       dwindle = {
         pseudotile = true;
@@ -49,7 +49,7 @@
 
       exec-once = [
         "ags"
-        "sh ~/nix/modules/desktop/hyprland/scripts/hypridle.sh"
+        "sh ~/nix/modules/hyprland/scripts/hypridle.sh"
       ];
 
       windowrule = [
@@ -79,11 +79,11 @@
         "$mod, A, exec, rofi -show drun"
         "$mod, F, exec, freetube"
         "$mod, C, exec, hyprpicker -a"
-        "$mod+Shift, W, exec, sh  ~/nix/modules/desktop/hyprland/scripts/vm.sh"
+        "$mod+Shift, W, exec, sh  ~/nix/modules/yprland/scripts/vm.sh"
         "$mod+Shift, Z, exec, grim - | swappy -f -"
-        "$mod, Z, exec, sh ~/nix/modules/desktop/hyprland/scripts/screen.sh"
+        "$mod, Z, exec, sh ~/nix/modules/hyprland/scripts/screen.sh"
         "$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
-        "$mod, O, exec, sh ~/nix/modules/desktop/hyprland/scripts/mpv.sh"
+        "$mod, O, exec, sh ~/nix/modules/hyprland/scripts/mpv.sh"
 
         # controles
         "$mod, Q, killactive"
@@ -91,14 +91,14 @@
         "$mod, R, togglesplit"
         "$mod+shift, S, exec, systemctl suspend"
         "$mod+shift, M, exit, hyprland"
-        "$mod, G, exec, sh ~/nix/modules/desktop/hyprland/scripts/gamemode.sh"
-        "$mod+shift, B, exec, sh ~/nix/modules/desktop/hyprland/scripts/ags.sh"
-        "$mod, up, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -i"
-        "$mod, down, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -d"
+        "$mod, G, exec, sh ~/nix/modules/hyprland/scripts/gamemode.sh"
+        "$mod+shift, B, exec, sh ~/nix/modules/hyprland/scripts/ags.sh"
+        "$mod, up, exec, sh ~/nix/modules/hyprland/scripts/volume.sh -i"
+        "$mod, down, exec, sh ~/nix/modules/hyprland/scripts/volume.sh -d"
         "$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch pin" 
 
         # cmus
-        "$mod, D, exec, sh ~/nix/modules/desktop/hyprland/scripts/cmus.sh"
+        "$mod, D, exec, sh ~/nix/modules/hyprland/scripts/cmus.sh"
         "$mod, space, exec, playerctl play-pause"
         "$mod, comma, exec, playerctl previous"
         "$mod, period, exec, playerctl next"
@@ -157,10 +157,10 @@
       bindl = [
         ", XF86MonBrightnessUp, exec, brightnessctl set +10%"
         ", XF86MonBrightnessDown, exec, brightnessctl set 10%-"
-        ", XF86AudioRaiseVolume, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -i"
-        ", XF86AudioLowerVolume, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -d"
-        ", XF86AudioMute, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -m"
-        ", XF86AudioMicMute, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -t"
+        ", XF86AudioRaiseVolume, exec, sh ~/nix/modules/hyprland/scripts/volume.sh -i"
+        ", XF86AudioLowerVolume, exec, sh ~/nix/modules/hyprland/scripts/volume.sh -d"
+        ", XF86AudioMute, exec, sh ~/nix/modules/hyprland/scripts/volume.sh -m"
+        ", XF86AudioMicMute, exec, sh ~/nix/modules/hyprland/scripts/volume.sh -t"
       ];
 
       general = {

modules/misc/default.nix

@@ -1,4 +1,3 @@
-
 {
   inputs,
   pkgs,
@@ -11,11 +10,6 @@
     extraGroups = ["wheel" "docker"];
   };
 
-  fonts.packages = with pkgs; [
-    font-awesome
-    (nerdfonts.override {fonts = ["FiraCode"];})
-  ];
-
   virtualisation.docker.rootless.enable = true;
   virtualisation.docker.enable = true;
   virtualisation.waydroid.enable = true;
@@ -36,11 +30,6 @@
     };
   };
 
-  services.devmon.enable = true;
-  services.udisks2.enable = true;
-  services.gvfs.enable = true;
-
-
   home-manager.users.joy.programs.home-manager.enable = true;
 
   home-manager.users.joy.xdg.mimeApps.defaultApplications = {

modules/services/default.nix

@@ -1,8 +1,5 @@
-{
-  imports = [
-  ./dunst  
-  ./gdm  
-  ./polkit  
-  ./syncthing
-  ];
+{...}: {
+  services.devmon.enable = true;
+  services.udisks2.enable = true;
+  services.gvfs.enable = true;
 }

modules/services/syncthing/services/default.nix

@@ -1,5 +0,0 @@
-{...}: {
-  services.devmon.enable = true;
-  services.udisks2.enable = true;
-  services.gvfs.enable = true;
-}

modules/styling/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-  ./qt
-  # ./gkt
-  ./stylix
-  ];
-}

modules/styling/qt/default.nix

@@ -1,9 +0,0 @@
-{pkgs, ...}: 
-{
-  home-manager.users.joy.qt = {
-    enable = true;
-    style.name = "adwaita-dark";
-    style.package = pkgs.adwaita-qt;
-    platformTheme.name = "adwaita";
-  };
-}

modules/tools/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-  ./git
-  ./ssh
-  ./gpg
-  ];
-}

modules/update/default.nix

@@ -0,0 +1,13 @@
+{inputs, ...}: {
+  system.autoUpgrade = {
+    enable = true;
+    flake = inputs.self.outPath;
+    flags = [
+      "--update-input"
+      "nixpkgs"
+      "-L" # print build logs
+    ];
+    dates = "02:00";
+    randomizedDelaySec = "45min";
+  };
+}