diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index fc790f5..43f1252 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -6,6 +6,7 @@ let in { imports = [ ./fwbook.hardware-configuration.nix ]; + skyg.user.enabled = true; services.fwupd.enable = true; services.fwupd.package = (import (builtins.fetchTarball { diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 27d730e..3c14849 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,6 +1,7 @@ { user }: { pkgs, lib, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; + skyg.user.enabled = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; @@ -69,6 +70,6 @@ steam-tui steam-run steamPackages.steamcmd - ollama - ]; + ollama + ]; } diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 695bd4a..bbc3787 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -1,6 +1,7 @@ { user }: { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; + skyg.user.enabled = true; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 9ee8186..30be545 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -1,6 +1,8 @@ { user }: { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; + skyg.user.enabled = true; + # Nix Stores services.nix-serve = { enable = true; diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index d47b33b..0a17591 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -1,6 +1,7 @@ { user }: { pkgs, lib, config, ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; + skyg.user.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 5d7926d..43275ef 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-terra1.hardware-configuration.nix ]; + skyg.user.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 6728394..7aaf6d4 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -1,15 +1,9 @@ -{ stateVersion -, enableDevelopmentKit -, name -, fullName -, email -, extraGitConfigs ? [ ] -}: +{ stateVersion }: let gitconfigs = (builtins.filterSource (path: type: type != "directory") ./gitconfigs); gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs); - commonGitConfigs = { + makeCommonGitConfigs = { extraGitConfigs }: { delta = { enable = true; }; extraConfig = { color = { ui = "auto"; }; @@ -68,34 +62,40 @@ in git = { enable = true; userName = "root"; - } // commonGitConfigs; + } // (makeCommonGitConfigs { extraGitConfigs = [ ]; }); } // (commonProgramsConfig { pkgs = pkgs; }); }; - makeCommonUser = { pkgs, ... }: { - home = { - stateVersion = stateVersion; - shellAliases = { - cat = "bat"; + makeCommonUser = + { enableDevelopmentKit + , fullName + , email + , extraGitConfigs ? [ ] + , ... + }: { pkgs, ... }: { + home = { + stateVersion = stateVersion; + shellAliases = { + cat = "bat"; + }; + packages = with pkgs; + [ jq nixpkgs-fmt ipfetch nixd ] + ++ (if enableDevelopmentKit then [ + rye + devenv + uv + devbox + terraform + kubectl + ] else + [ ]); }; - packages = with pkgs; - [ jq nixpkgs-fmt ipfetch nixd ] - ++ (if enableDevelopmentKit then [ - rye - devenv - uv - devbox - terraform - kubectl - ] else - [ ]); + programs = { + git = { + enable = true; + userName = fullName; + userEmail = email; + } // (makeCommonGitConfigs { extraGitConfigs = extraGitConfigs; }); + } // (commonProgramsConfig { pkgs = pkgs; }); }; - programs = { - git = { - enable = true; - userName = fullName; - userEmail = email; - } // commonGitConfigs; - } // (commonProgramsConfig { pkgs = pkgs; }); - }; } diff --git a/modules/skyg/core.nix b/modules/skyg/core.nix index 5c85ba6..812bfba 100644 --- a/modules/skyg/core.nix +++ b/modules/skyg/core.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/modules/skyg/user.nix b/modules/skyg/user.nix index 62549c0..897e982 100644 --- a/modules/skyg/user.nix +++ b/modules/skyg/user.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.skyg; - hm = (import ../home-manager.nix cfg.user); in { options = { @@ -12,6 +11,7 @@ in type = types.str; }; skyg.user = { + enabled = mkEnableOption ""; name = mkOption { type = types.str; }; @@ -36,9 +36,16 @@ in }; }; - config = { - programs.zsh.enable = true; - home-manager.users.root = hm.makeRootUser { pkgs = pkgs; }; - home-manager.users.${cfg.user.name} = hm.makeCommonUser { pkgs = pkgs; }; - }; + config = + let + hm = (import ../home-manager.nix { + stateVersion = cfg.home-manager.version; + }); + in + mkIf cfg.user.enabled + { + programs.zsh.enable = true; + home-manager.users.root = hm.makeRootUser { pkgs = pkgs; }; + home-manager.users.${cfg.user.name} = (hm.makeCommonUser cfg.user) { pkgs = pkgs; }; + }; }