From 6c0467c5497b88e79cca52891655219fec9680a5 Mon Sep 17 00:00:00 2001 From: Leander Scherer Date: Sun, 8 Mar 2026 15:53:16 +0100 Subject: feat(user): seperate home manager module to be system specific --- modules/users/schererleander/configuration.nix | 29 -------------------------- modules/users/schererleander/darwin.nix | 2 +- modules/users/schererleander/flake-parts.nix | 4 ++-- modules/users/schererleander/hm-base.nix | 22 +++++++++++++++++++ modules/users/schererleander/hm-darwin.nix | 9 ++++++++ modules/users/schererleander/hm-linux.nix | 14 +++++++++++++ modules/users/schererleander/nixos.nix | 2 +- 7 files changed, 49 insertions(+), 33 deletions(-) delete mode 100644 modules/users/schererleander/configuration.nix create mode 100644 modules/users/schererleander/hm-base.nix create mode 100644 modules/users/schererleander/hm-darwin.nix create mode 100644 modules/users/schererleander/hm-linux.nix (limited to 'modules/users') diff --git a/modules/users/schererleander/configuration.nix b/modules/users/schererleander/configuration.nix deleted file mode 100644 index c10e4ea..0000000 --- a/modules/users/schererleander/configuration.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - flake.modules.homeManager.schererleander = - { inputs, pkgs, ... }: - { - imports = with inputs.self.modules.homeManager; [ - gpg - git - zsh - opencode - neovim - zed - nixcord - spicetify - jellyfin-mpv-shim - nextcloud-client - ]; - - home = { - username = "schererleander"; - stateVersion = "26.05"; - packages = with pkgs; [ - firefox - obsidian - tor-browser - gohufont - ]; - }; - }; -} 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/hm-base.nix b/modules/users/schererleander/hm-base.nix new file mode 100644 index 0000000..3cda211 --- /dev/null +++ b/modules/users/schererleander/hm-base.nix @@ -0,0 +1,22 @@ +{ + flake.modules.homeManager.schererleander-base = + { inputs, pkgs, ... }: + { + imports = with inputs.self.modules.homeManager; [ + gpg + git + zsh + neovim + zed + ]; + + home = { + username = "schererleander"; + stateVersion = "26.05"; + packages = with pkgs; [ + firefox + obsidian + ]; + }; + }; +} 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; }; }; } -- cgit v1.3.1