refactor: home-manager

home/base/core.nix

@@ -1,7 +1,4 @@
 {username, ...}: {
-  imports = [
-  ];
-
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home = {

home/darwin/default.nix

@@ -1,31 +1,11 @@
 {username, ...}: {
   imports = [
     ../base/desktop
+    ../base/core.nix
 
     ./proxychains
     ./core.nix
     ./rime-squirrel.nix
     ./shell.nix
   ];
-
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home = {
-    inherit username;
-    # set homeDirectory make build fail
-    homeDirectory = "/Users/${username}";
-
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    stateVersion = "23.11";
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
 }

home/linux/desktop-hyprland.nix

@@ -1,31 +0,0 @@
-{username, ...}: {
-  imports = [
-    ../base/desktop
-
-    ./base
-    ./fcitx5
-    ./desktop
-
-    ./hyprland
-  ];
-
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home = {
-    inherit username;
-    homeDirectory = "/home/${username}";
-
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    stateVersion = "23.11";
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-}

home/linux/desktop-i3.nix

@@ -1,31 +0,0 @@
-{username, ...}: {
-  imports = [
-    ../base/desktop
-
-    ./base
-    ./fcitx5
-    ./desktop
-
-    ./i3
-  ];
-
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home = {
-    inherit username;
-    homeDirectory = "/home/${username}";
-
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    stateVersion = "23.11";
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-}

home/linux/desktop.nix

@@ -0,0 +1,10 @@
+{
+  imports = [
+    ../base/desktop
+    ../base/core.nix
+
+    ./base
+    ./fcitx5
+    ./desktop
+  ];
+}

home/linux/server.nix

@@ -1,27 +1,8 @@
-{username, ...}: {
+{
   imports = [
     ../base/server
+    ../base/core.nix
 
     ./base
   ];
-
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home = {
-    inherit username;
-    homeDirectory = "/home/${username}";
-
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    stateVersion = "23.11";
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
 }

systems/vars.nix

@@ -6,7 +6,12 @@
       ../secrets/nixos.nix
       ../modules/nixos/xorg.nix
     ];
-    home-module = import ../home/linux/desktop-i3.nix;
+    home-module = {
+      imports = [
+        ../home/linux/desktop.nix
+        ../home/linux/i3
+      ];
+    };
   };
   idol_ai_modules_hyprland = {
     nixos-modules = [
@@ -14,7 +19,12 @@
       ../secrets/nixos.nix
       ../modules/nixos/wayland.nix
     ];
-    home-module = import ../home/linux/desktop-hyprland.nix;
+    home-module = {
+      imports = [
+        ../home/linux/desktop.nix
+        ../home/linux/hyprland
+      ];
+    };
   };
 
   # 星野 愛久愛海, Hoshino Akuamarin
@@ -59,7 +69,7 @@
       # cross-compilation this flake.
       {nixpkgs.crossSystem.system = "riscv64-linux";}
     ];
-    # home-module = import ../home/linux/server-riscv64.nix;
+    # home-module = import ../home/linux/server.nix;
   };
   rolling_nozomi_tags = ["riscv" "nozomi"];
 
@@ -72,7 +82,7 @@
       # cross-compilation this flake.
       {nixpkgs.crossSystem.system = "riscv64-linux";}
     ];
-    # home-module = import ../home/linux/server-riscv64.nix;
+    # home-module = import ../home/linux/server.nix;
   };
   rolling_yukina_tags = ["riscv" "yukina"];
 
@@ -108,5 +118,4 @@
     ];
     home-module = import ../home/darwin;
   };
-
 }