restructure home for desktop and server

flake.nix

@@ -28,8 +28,9 @@
 
   outputs = { self, nixpkgs, home-manager, impermanence, lanzaboote, nixos-hardware, nixvim }@inputs: {
     formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt;
-    nixosConfigurations = {
+    nixosConfigurations = let user = (import ./secrets.nix).users; in {
       Skipper = nixpkgs.lib.nixosSystem {
+
         system = "x86_64-linux";
         specialArgs = inputs;
         modules = [
@@ -45,7 +46,21 @@
 
           ./common
           ./hosts/skipper
-          ./home
+
+          {
+            home-manager = {
+              useUserPackages = true;
+              useGlobalPkgs = true;
+              users.${user.primary.userName} = { pkgs, ... }: {
+                imports = [
+                  impermanence.nixosModules.home-manager.impermanence
+                  nixvim.homeManagerModules.nixvim
+                  ./home/common
+                  ./home/desktop
+                ];
+              };
+            };
+          }
         ];
       };
       Rico2 = nixpkgs.lib.nixosSystem {
@@ -57,8 +72,23 @@
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           }
 
+          home-manager.nixosModules.home-manager
+
           ./common
           ./hosts/rico
+
+          {
+            home-manager = {
+              useUserPackages = true;
+              useGlobalPkgs = true;
+              users.${user.primary.userName} = { pkgs, ... }: {
+                imports = [
+                  ./home/common
+                  ./home/server
+                ];
+              };
+            };
+          }
         ];
       };
     };

home/common/default.nix

@@ -0,0 +1,4 @@
+{ ... }: {
+  imports = [ ./programs ./services ];
+  home.stateVersion = "23.05";
+}

home/common/programs/default.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }: {
+  imports = [
+    ./bat.nix
+    ./btop.nix
+    ./direnv.nix
+    ./exa.nix
+    ./git.nix
+    ./starship.nix
+    ./zsh.nix
+  ];
+
+  home.packages = with pkgs; [
+    lazydocker
+    ripgrep
+  ];
+
+  programs = {
+    fzf.enable = true;
+    lazygit.enable = true;
+    ssh.enable = true;
+    zoxide.enable = true;
+  };
+}

home/common/programs/git.nix

@@ -1,6 +1,6 @@
 { ... }:
 let
-  user = (import ../../secrets.nix).users;
+  user = (import ../../../secrets.nix).users;
 in
 {
   programs.git = {

home/common/services/default.nix

@@ -0,0 +1 @@
+{ ... }: { }

home/default.nix

@@ -1,35 +0,0 @@
-{ impermanence, nixvim, pkgs, ... }:
-let
-  user = (import ../secrets.nix).users;
-in
-{
-  programs.fuse.userAllowOther = true;
-
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
-  home-manager.users.${user.primary.userName} = { pkgs, ... }: {
-    imports = [
-      impermanence.nixosModules.home-manager.impermanence
-      nixvim.homeManagerModules.nixvim
-
-      ./gtk.nix
-      ./persistence.nix
-      ./wm
-      ./programs
-      ./services
-    ];
-
-    xdg.enable = true;
-    xdg.mime.enable = true;
-    xdg.mimeApps.enable = true;
-    xdg.userDirs.enable = true;
-
-    xdg.desktopEntries."nixos-manual" = {
-      name = "NixOS Manual";
-      exec = "nixos-help";
-      noDisplay = true;
-    };
-
-    home.stateVersion = "23.05";
-  };
-}

home/desktop/default.nix

@@ -0,0 +1,14 @@
+{ ... }: {
+  imports = [ ./programs ./services ./wm ./gtk.nix ./persistence.nix ];
+
+  xdg.enable = true;
+  xdg.mime.enable = true;
+  xdg.mimeApps.enable = true;
+  xdg.userDirs.enable = true;
+
+  xdg.desktopEntries."nixos-manual" = {
+    name = "NixOS Manual";
+    exec = "nixos-help";
+    noDisplay = true;
+  };
+}

home/desktop/persistence.nix

@@ -2,6 +2,7 @@
   home.persistence."/persist/home" = {
     allowOther = true;
     directories = [
+      ".cache/aria2"
       ".cache/mesa_shader_cache"
       ".cache/mozilla"
       ".cache/nix"

home/desktop/programs/aria2.nix

@@ -7,6 +7,7 @@
       max-connection-per-server = 8;
       split = 8;
       min-split-size = "1M";
+      file-allocation = "falloc";
     };
   };
 }

home/desktop/programs/default.nix

@@ -1,23 +1,16 @@
 { pkgs, ... }: {
   imports = [
     ./aria2.nix
-    ./bat.nix
-    ./btop.nix
-    ./direnv.nix
-    ./exa.nix
     ./files.nix
     ./firefox.nix
-    ./git.nix
     ./github-cli.nix
     ./gnupg.nix
     ./kitty.nix
     ./mpv.nix
     ./nixvim.nix
-    ./starship.nix
     ./tmux.nix
     ./virt-manager.nix
     ./yt-dlp.nix
-    ./zsh.nix
   ];
 
   home.packages = with pkgs; [
@@ -28,9 +21,7 @@
     gnome.eog
     gnome.gnome-system-monitor
     gnome3.gnome-disk-utility
-    lazydocker
     pavucontrol
-    ripgrep
     spotify-tui
     wl-clipboard
     xdg-utils
@@ -40,11 +31,4 @@
     yubikey-personalization
     yubikey-personalization-gui
   ];
-
-  programs = {
-    fzf.enable = true;
-    lazygit.enable = true;
-    ssh.enable = true;
-    zoxide.enable = true;
-  };
 }

home/server/default.nix

@@ -0,0 +1,3 @@
+{ ... }: {
+  imports = [ ./programs ./services ];
+}

home/server/programs/default.nix

@@ -0,0 +1 @@
+{ ... }: { }

home/server/services/default.nix

@@ -0,0 +1 @@
+{ ... }: { }

hosts/skipper/programs/default.nix

@@ -7,6 +7,7 @@
 
   programs = {
     dconf.enable = true;
+    fuse.userAllowOther = true;
     git.enable = true;
     seahorse.enable = true;
     xwayland.enable = true;