home-manager: split main module into separate modules

4 files changed, 27 insertions, 10 deletions

diff --git a/flake.nix b/flake.nix
index 3c637f3..e02e2b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,21 +50,22 @@
           readJSON = p: builtins.fromJSON (builtins.readFile p);
           mkHomeConfiguration =
             {
-              system,
-              env,
+              profile,
+              flake,
               ...
             }:
             home-manager.lib.homeManagerConfiguration {
-              pkgs = import nixpkgs { inherit system; };
+              pkgs = import nixpkgs { system = flake.system; };
               extraSpecialArgs = {
-                inherit env;
-                nurpkgs = nur-packages.legacyPackages.${system};
+                env = flake.env;
+                nurpkgs = nur-packages.legacyPackages.${flake.system};
               };
               modules = [
-                ./home-manager/home.nix
+                ./home-manager/modules/common.nix
+                ./home-manager/modules/${profile}.nix
               ];
             };
-          mkHomeConfigurationFromJSON = p: mkHomeConfiguration (readJSON p).flake;
+          mkHomeConfigurationFromJSON = p: mkHomeConfiguration (readJSON p);
         in
         {
           akashi = mkHomeConfigurationFromJSON ./mitamae/node.akashi.json;
diff --git a/home-manager/home.nix b/home-manager/modules/common.nix
index 019252c..e8a02f3 100644
--- a/home-manager/home.nix
+++ b/home-manager/modules/common.nix
@@ -151,7 +151,7 @@ in
 
     extraConfig =
       let
-        commonConfig = builtins.readFile ./config/tmux/tmux.conf;
+        commonConfig = builtins.readFile ../config/tmux/tmux.conf;
         clipboardConfig =
           if clipboardCopyCommand != null then
             ''
@@ -177,8 +177,8 @@ in
   programs.fish = {
     enable = true;
 
-    interactiveShellInit = builtins.readFile ./config/fish/config.fish;
-    shellInitLast = builtins.readFile ./config/fish/path.fish;
+    interactiveShellInit = builtins.readFile ../config/fish/config.fish;
+    shellInitLast = builtins.readFile ../config/fish/path.fish;
   };
 
   programs.starship = {
diff --git a/home-manager/modules/private.nix b/home-manager/modules/private.nix
new file mode 100644
index 0000000..153b780
--- /dev/null
+++ b/home-manager/modules/private.nix
@@ -0,0 +1,8 @@
+{
+  pkgs,
+  nurpkgs,
+  env,
+  ...
+}:
+{
+}
diff --git a/home-manager/modules/work.nix b/home-manager/modules/work.nix
new file mode 100644
index 0000000..153b780
--- /dev/null
+++ b/home-manager/modules/work.nix
@@ -0,0 +1,8 @@
+{
+  pkgs,
+  nurpkgs,
+  env,
+  ...
+}:
+{
+}