6 files changed, 28 insertions, 12 deletions

diff --git a/modules/users/schererleander/darwin.nix b/modules/users/schererleander/darwin.nix
index a4ef2a4..967e015 100644
--- a/modules/users/schererleander/darwin.nix
+++ b/modules/users/schererleander/darwin.nix
@@ -8,7 +8,7 @@
         useGlobalPkgs = true;
         useUserPackages = true;
         extraSpecialArgs = { inherit inputs; };
-        users.schererleander = inputs.self.modules.homeManager.schererleander;
+        users.schererleander = inputs.self.modules.homeManager.schererleander-darwin;
       };
     };
 }
diff --git a/modules/users/schererleander/flake-parts.nix b/modules/users/schererleander/flake-parts.nix
index fa43869..806972c 100644
--- a/modules/users/schererleander/flake-parts.nix
+++ b/modules/users/schererleander/flake-parts.nix
@@ -6,7 +6,7 @@
       pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
       extraSpecialArgs = { inherit inputs; };
       modules = [
-        inputs.self.modules.homeManager.user-schererleander
+        inputs.self.modules.homeManager.schererleander-linux
         {
           home.homeDirectory = "/home/schererleander";
         }
@@ -18,7 +18,7 @@
       pkgs = inputs.nixpkgs.legacyPackages.aarch64-darwin;
       extraSpecialArgs = { inherit inputs; };
       modules = [
-        inputs.self.modules.homeManager.user-schererleander
+        inputs.self.modules.homeManager.schererleander-darwin
         {
           home.homeDirectory = "/Users/schererleander";
         }
diff --git a/modules/users/schererleander/configuration.nix b/modules/users/schererleander/hm-base.nix
index c10e4ea..3cda211 100644
--- a/modules/users/schererleander/configuration.nix
+++ b/modules/users/schererleander/hm-base.nix
@@ -1,18 +1,13 @@
 {
-  flake.modules.homeManager.schererleander =
+  flake.modules.homeManager.schererleander-base =
     { inputs, pkgs, ... }:
     {
       imports = with inputs.self.modules.homeManager; [
         gpg
         git
         zsh
-        opencode
         neovim
         zed
-        nixcord
-        spicetify
-        jellyfin-mpv-shim
-        nextcloud-client
       ];
 
       home = {
@@ -21,8 +16,6 @@
         packages = with pkgs; [
           firefox
           obsidian
-          tor-browser
-          gohufont
         ];
       };
     };
diff --git a/modules/users/schererleander/hm-darwin.nix b/modules/users/schererleander/hm-darwin.nix
new file mode 100644
index 0000000..edf80eb
--- /dev/null
+++ b/modules/users/schererleander/hm-darwin.nix
@@ -0,0 +1,9 @@
+{
+  flake.modules.homeManager.schererleander-darwin =
+    { inputs, ... }:
+    {
+      imports = [
+        inputs.self.modules.homeManager.schererleander-base
+      ];
+    };
+}
diff --git a/modules/users/schererleander/hm-linux.nix b/modules/users/schererleander/hm-linux.nix
new file mode 100644
index 0000000..cac5579
--- /dev/null
+++ b/modules/users/schererleander/hm-linux.nix
@@ -0,0 +1,14 @@
+{
+  flake.modules.homeManager.schererleander-linux =
+    { inputs, ... }:
+    {
+      imports = [
+        inputs.self.modules.homeManager.schererleander-base
+        inputs.self.modules.homeManager.opencode
+        inputs.self.modules.homeManager.nixcord
+        inputs.self.modules.homeManager.spicetify
+        inputs.self.modules.homeManager.jellyfin-mpv-shim
+        inputs.self.modules.homeManager.nextcloud-client
+      ];
+    };
+}
diff --git a/modules/users/schererleander/nixos.nix b/modules/users/schererleander/nixos.nix
index 0a34e7b..6e75485 100644
--- a/modules/users/schererleander/nixos.nix
+++ b/modules/users/schererleander/nixos.nix
@@ -8,7 +8,7 @@
         useGlobalPkgs = true;
         useUserPackages = true;
         extraSpecialArgs = { inherit inputs; };
-        users.schererleander = inputs.self.modules.homeManager.schererleander;
+        users.schererleander = inputs.self.modules.homeManager.schererleander-linux;
       };
     };
 }