From 766ead72fbf5797efd3996fc15a111b3d03ea093 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 3 Mar 2024 16:50:02 -0500 Subject: [PATCH] decoupled home-manager --- main.nix | 16 ++++++++++------ modules/rootUser.nix | 15 +-------------- modules/user.nix | 38 +------------------------------------- 3 files changed, 12 insertions(+), 57 deletions(-) diff --git a/main.nix b/main.nix index 2402918..a9062b0 100644 --- a/main.nix +++ b/main.nix @@ -1,6 +1,7 @@ { systemStateVersion ? "23.11", homeMangerVersion ? "23.11", + enableHomeManager ? true, hostName, user, enableSSHServer ? false, @@ -12,8 +13,7 @@ let home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${homeMangerVersion}.tar.gz"; in { - imports = - [ + imports = [ /etc/nixos/hardware-configuration.nix (import ./modules/os/nix.nix { systemStateVersion = systemStateVersion; @@ -29,16 +29,20 @@ in user = user; enableSSHServer = enableSSHServer; }) - (import "${home-manager}/nixos") ./modules/os/services.nix ./modules/docker/core.nix (import ./modules/user.nix { user = user; - homeMangerVersion = homeMangerVersion; }) (import ./modules/rootUser.nix { hostName = hostName; - homeMangerVersion = homeMangerVersion; }) - ]; + ] ++ (if enableHomeManager then [ + (import "${home-manager}/nixos") + (import ./modules/home-manager-config.nix { + homeMangerVersion = homeMangerVersion; + hostName = hostName; + user = user; + }) + ] else []); } diff --git a/modules/rootUser.nix b/modules/rootUser.nix index 77b377b..b812cfc 100644 --- a/modules/rootUser.nix +++ b/modules/rootUser.nix @@ -1,18 +1,5 @@ -{ hostName, homeMangerVersion }: +{ hostName }: { pkgs, ... }: { users.users.root.shell = pkgs.zsh; - home-manager.users.root = { - home.stateVersion = homeMangerVersion; - programs.git = { - enable = true; - userName = "root"; - userEmail = "root@${hostName}"; - }; - programs.zsh = { - enable = true; - enableAutosuggestions = true; - }; - programs.zsh.oh-my-zsh.enable = true; - }; } \ No newline at end of file diff --git a/modules/user.nix b/modules/user.nix index 0a297a0..2b7ccd8 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -1,4 +1,4 @@ -{ user, homeMangerVersion }: +{ user }: { pkgs, ... }: { users.users.${user.name} = { @@ -19,40 +19,4 @@ nixd ]; }; - home-manager.users.${user.name} = { - home = { - stateVersion = homeMangerVersion; - shellAliases = { - cat = "bat"; - }; - packages = [ - (pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) - ]; - }; - programs = { - bat.enable = true; - direnv.enable = true; - lsd = { - enable = true; - enableAliases = true; - }; - git = { - enable = true; - userName = user.fullName; - userEmail = user.email; - }; - zsh = { - enable = true; - enableAutosuggestions = true; - }; - zsh.oh-my-zsh = { - enable = true; - plugins = [ - "git" - "sudo" - ]; - theme = "robbyrussell"; - }; - }; - }; }