Refactor: Replace users with home

home/default.nix

@@ -2,13 +2,15 @@
 
 {
   imports = [
-    ../../modules/desktop/apps/communication.nix
-    ../../modules/desktop/apps/games.nix
-    ../../modules/desktop/apps/multimedia.nix
     ./persist.nix
-    ./packages/nh.nix
+
-    ./packages/zsh/zsh.nix
+    ../modules/desktop/apps/communication.nix
-    ./packages/virt-manager.nix
+    ../modules/desktop/apps/games.nix
+    ../modules/desktop/apps/multimedia.nix
+
+    ../modules/packages/nh.nix
+    ../modules/packages/zsh.nix
+    ../modules/packages/virt-manager.nix
   ];
 
   environment.variables = {
@@ -20,7 +22,7 @@
     isNormalUser = true;
     extraGroups = [ "wheel" "libvirtd" ];
     shell = pkgs.zsh;
-    hashedPasswordFile = "/nix/config/secrets/hu/pass";
+    hashedPasswordFile = "/nix/config/secrets/pass";
   };
 
   home-manager = {
@@ -32,7 +34,7 @@
       home.stateVersion = config.system.stateVersion;
 
       imports = [
-        ./packages/zsh/zsh-home.nix
+        ./packages/zsh.nix
         ./packages/git.nix
         ./packages/gtk.nix
         ./packages/hyprland.nix
@@ -40,9 +42,9 @@
         ./packages/firefox.nix
         ./packages/rofi.nix
         ./packages/fastfetch.nix
-        ./packages/nvim/neovim.nix
+        ./packages/nvim.nix
         ./packages/waybar.nix
-        ./packages/virt-manager-home.nix
+        ./packages/virt-manager.nix
       ];
     };
   };

home/packages/nvim.nix

@@ -19,7 +19,7 @@
   };
 
   home.file."${config.xdg.configHome}/nvim" = {
-    source = ./config;
+    source = ../../dotfiles/nvim;
     recursive = true;
   };
 }

home/packages/zsh.nix

@@ -17,7 +17,7 @@
   };
 
   home.file."${config.xdg.configHome}/zsh/conf.d" = {
-    source = ./config/conf.d;
+    source = ../../dotfiles/zsh/conf.d;
     recursive = true;
   };
 
@@ -28,18 +28,8 @@
       SYNTAX_PLUGIN="${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
       AUTOSUGGEST_PLUGIN="${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
       NIX_SHELL_PLUGIN="${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh"
-
+      FZF_TAB_PLUGIN="${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
-      # On systems that are not on glibc 2.38, loading fzf-tab will fail. This prevents that.
+    '' + (builtins.readFile ../../dotfiles/zsh/.zshrc);
-      if [ -f "/lib/x86_64-linux-gnu/libc.so.6" ]; then
-        GLIBC_VERSION="$(/lib/x86_64-linux-gnu/libc.so.6 | head -n1 | sed -e 's/.* //g' | rev | cut -c2- | rev)"
-        if [ "$GLIBC_VERSION" = "2.38" ]; then
-          FZF_TAB_PLUGIN="${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
-        fi
-      else
-        FZF_TAB_PLUGIN="${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
-      fi
-
-    '' + (builtins.readFile config/.zshrc);
   };
 }
 

hosts/workstation/default.nix

@@ -9,7 +9,7 @@
     ../../modules/desktop/environments/hyprland.nix
     ../../modules/system/security.nix
 
-    ../../users/hu/user.nix
+    ../../home/default.nix
   ];
 
   boot.loader.efi.canTouchEfiVariables = true;