restructure apps

devices/ellaca/default.nix

@@ -32,7 +32,6 @@
 
   hardware = {
     enableRedistributableFirmware = true;
-    enableAllFirmware = true;
     cpu.amd.updateMicrocode = true;
   };
 }

modules/apps/alacritty.conf.nix

@@ -1,4 +1,4 @@
-{config, ...}: let
+config: let
   inherit (config) theme;
 in {
   # Rose Pine

modules/apps/cursor.nix

@@ -0,0 +1,16 @@
+{pkgs, ...}: let
+  getFrom = url: hash: name: {
+    gtk.enable = true;
+    x11.enable = true;
+    name = name;
+    size = 24;
+    package = pkgs.runCommand "moveUp" {} ''
+      mkdir -p $out/share/icons
+      ln -s ${pkgs.fetchzip {
+        url = url;
+        hash = hash;
+      }} $out/share/icons/${name}
+    '';
+  };
+in
+  getFrom "https://github.com/rose-pine/cursor/releases/download/v1.1.0/BreezeX-RosePine-Linux.tar.xz" "sha256-t5xwAPGhuQUfGThedLsmtZEEp1Ljjo3Udhd5Ql3O67c=" "BreezX-RosePine-Linux"

modules/apps/default.nix

@@ -6,32 +6,31 @@
 }: let
   inherit (lib) mkIf mkForce;
   inherit (config) conf;
-in {
+  mkXwlWrapper = import ../niri/xwl-wrapper.nix;
-  imports = [
+  time = pkgs.makeDesktopItem {
-    ./firefox.nix
+    name = "peaclock-desktop";
-    ./media.nix
+    desktopName = "Time";
-    ./programs.nix
+    exec = "alacritty -e ${pkgs.peaclock}/bin/peaclock";
-    ./themes.nix
+  };
-  ];
+in
-
+  mkIf (conf.host != "server") {
-  config = mkIf (conf.host
-    != "server") {
     # Audio
     security.rtkit.enable = true;
 
-    services.pipewire = {
+    services = {
+      pipewire = {
         enable = true;
         alsa.enable = true;
         alsa.support32Bit = true;
         pulse.enable = true;
         jack.enable = mkForce false;
       };
+      # Needed for some features in nautilus such as auto-mounting and trash
+      gvfs.enable = true;
+    };
 
     # Run statically linked and more
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = [pkgs.nix-alien];
-      nix-alien
-    ];
-
     programs.nix-ld.enable = true;
 
     # Bluetooth
@@ -68,5 +67,104 @@ in {
     };
 
     services.blueman.enable = true;
+
+    home-manager.users.${conf.username} = {
+      home = {
+        packages = with pkgs;
+          [
+            adwaita-icon-theme
+            adwaita-qt
+            adwaita-qt6
+            loupe
+            spotify
+            amberol
+            signal-desktop
+            vesktop
+            snapshot
+            nautilus
+            inkscape
+            libresprite
+            gnome-disk-utility
+            fragments
+            element-desktop
+            tor-browser
+            libreoffice-qt6
+            chromium
+            peaclock
+            fractal
+            element-desktop
+            papers
+          ]
+          ++ [
+            time
+          ]
+          ++ [
+            (mkXwlWrapper {
+              pkgs = pkgs;
+              name = "Prusa";
+              pkg = "prusa-slicer";
+            })
+          ];
+
+        file = {
+          ".config/vesktop/settings.json" = {
+            source = ./vesktop.conf.json;
           };
-}
+          ".config/vesktop/settings/settings.json" = {
+            source = ./vencord.conf.json;
+          };
+        };
+
+        pointerCursor = import ./cursor.nix pkgs;
+      };
+
+      qt = {
+        enable = true;
+        platformTheme.name = "adwaita";
+        style.name = "adwaita-dark";
+      };
+
+      gtk = {
+        enable = true;
+        gtk4.extraConfig = {
+          gtk-application-prefer-dark-theme = true;
+        };
+        gtk3.extraConfig = {
+          gtk-application-prefer-dark-theme = true;
+        };
+        gtk2.extraConfig = "gtk-application-prefer-dark-theme=1\n";
+        theme.name = "Adwaita Dark";
+      };
+
+      dconf = {
+        enable = true;
+        settings = {
+          "org/gnome/desktop/interface" = {
+            color-scheme = "prefer-dark";
+          };
+        };
+      };
+
+      programs = {
+        firefox = import ./firefox.nix pkgs;
+
+        thunderbird = {
+          enable = true;
+          profiles = {
+            "default" = {
+              isDefault = true;
+            };
+          };
+        };
+
+        mpv.enable = true;
+
+        pandoc.enable = true;
+
+        alacritty = {
+          enable = true;
+          settings = import ./alacritty.conf.nix config;
+        };
+      };
+    };
+  }

modules/apps/firefox.nix

@@ -1,15 +1,4 @@
-{
+{pkgs, ...}: {
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf;
-  inherit (config) conf;
-in
-  mkIf (conf.host != "server") {
-    home-manager.users.${conf.username} = {
-      programs.firefox = {
   enable = true;
   profiles = {
     "default" = {
@@ -216,6 +205,4 @@ in
       '';
     };
   };
-      };
+}
-    };
-  }

modules/apps/media.nix

@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf;
-  inherit (config) conf;
-in
-  mkIf (conf.host != "server") {
-    home-manager.users.${conf.username} = {
-      home.packages = with pkgs; [
-        loupe
-        spotify
-        amberol
-      ];
-
-      programs.mpv = {
-        enable = true;
-      };
-    };
-  }

modules/apps/programs.nix

@@ -1,84 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf;
-  inherit (config) conf;
-  mkXwlWrapper = import ../niri/xwl-wrapper.nix;
-  time = pkgs.makeDesktopItem {
-    name = "peaclock-desktop";
-    desktopName = "Time";
-    exec = "alacritty -e ${pkgs.peaclock}/bin/peaclock";
-  };
-in
-  mkIf (conf.host != "server") {
-    services = {
-      # Needed for some features in nautilus such as auto-mounting and trash
-      gvfs.enable = true;
-    };
-
-    home-manager.users.${conf.username} = {
-      home.packages = with pkgs;
-        [
-          signal-desktop
-          vesktop
-          snapshot
-          nautilus
-          inkscape
-          libresprite
-          # blender
-          gnome-disk-utility
-          fragments
-          element-desktop
-          tor-browser
-          libreoffice-qt6
-          chromium
-          peaclock
-          fractal
-          element-desktop
-          papers
-        ]
-        ++ [
-          time
-          (mkXwlWrapper {
-            pkgs = pkgs;
-            name = "Prusa";
-            pkg = "prusa-slicer";
-          })
-          (mkXwlWrapper {
-            pkgs = pkgs;
-            name = "Vial";
-            pkg = "vial";
-          })
-        ];
-
-      home.file = {
-        ".config/vesktop/settings.json" = {
-          source = ./vesktop.conf.json;
-        };
-        ".config/vesktop/settings/settings.json" = {
-          source = ./vencord.conf.json;
-        };
-      };
-
-      programs.pandoc = {
-        enable = true;
-      };
-
-      programs.thunderbird = {
-        enable = true;
-        profiles = {
-          "default" = {
-            isDefault = true;
-          };
-        };
-      };
-
-      programs.alacritty = {
-        enable = true;
-        settings = import ./alacritty.conf.nix {config = config;};
-      };
-    };
-  }

modules/apps/themes.nix

@@ -1,62 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf;
-  inherit (config) conf;
-in
-  mkIf (conf.host != "server") {
-    home-manager.users.${conf.username} = {
-      home.packages = with pkgs; [
-        adwaita-icon-theme
-        adwaita-qt
-        adwaita-qt6
-      ];
-
-      qt = {
-        enable = true;
-        platformTheme.name = "adwaita";
-        style.name = "adwaita-dark";
-      };
-
-      gtk = {
-        enable = true;
-        gtk4.extraConfig = {
-          gtk-application-prefer-dark-theme = true;
-        };
-        gtk3.extraConfig = {
-          gtk-application-prefer-dark-theme = true;
-        };
-        gtk2.extraConfig = "gtk-application-prefer-dark-theme=1\n";
-        theme.name = "Adwaita Dark";
-      };
-
-      dconf = {
-        enable = true;
-        settings = {
-          "org/gnome/desktop/interface" = {
-            color-scheme = "prefer-dark";
-          };
-        };
-      };
-
-      home.pointerCursor = let
-        getFrom = url: hash: name: {
-          gtk.enable = true;
-          x11.enable = true;
-          name = name;
-          size = 24;
-          package = pkgs.runCommand "moveUp" {} ''
-            mkdir -p $out/share/icons
-            ln -s ${pkgs.fetchzip {
-              url = url;
-              hash = hash;
-            }} $out/share/icons/${name}
-          '';
-        };
-      in
-        getFrom "https://github.com/rose-pine/cursor/releases/download/v1.1.0/BreezeX-RosePine-Linux.tar.xz" "sha256-t5xwAPGhuQUfGThedLsmtZEEp1Ljjo3Udhd5Ql3O67c=" "BreezX-RosePine-Linux";
-    };
-  }