diff --git a/build-nixos.sh b/build-nixos.sh index c7269d2..c221af2 100755 --- a/build-nixos.sh +++ b/build-nixos.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e mkdir -p .locks rm -f .locks/.built_via_skg diff --git a/flake.nix b/flake.nix index 7fa6972..1f708a9 100644 --- a/flake.nix +++ b/flake.nix @@ -68,11 +68,7 @@ localNixCaches = localNixCaches; enableNetworkDrives = true; enableHomelabServices = true; - home-manager = { - enable = true; - version = homeManagerVersion; - enableDevelopmentKit = false; - }; + homeManagerVersion = homeManagerVersion; os = { enable = true; firewall = { enable = false; }; @@ -125,16 +121,14 @@ # MacBooks Setups # ------------- darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule { - user = sumoUser; + user = sumoUser // { + enableDevelopmentKit = true; + }; systemStateVersion = 4; localNixCaches = localNixCaches; system = "x86_64-darwin"; hostName = "asosnovsky-mac"; - home-manager = { - enable = true; - enableDevelopmentKit = true; - version = homeManagerVersion; - }; + homeManagerVersion = homeManagerVersion; configuration = (import ./hosts/asosnovsky-mac.nix { user = sumoUser; }); }; @@ -145,16 +139,14 @@ # ------------- fwbook = lib.makeNixOsModule { system = "x86_64-linux"; - user = user; + user = user // { + enableDevelopmentKit = true; + }; systemStateVersion = "23.11"; hostName = "fwbook"; localNixCaches = localNixCaches; localDockerRegistries = localDockerRegistries; - home-manager = { - enable = true; - version = homeManagerVersion; - enableDevelopmentKit = true; - }; + homeManagerVersion = homeManagerVersion; desktop = { enable = true; user = user; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix deleted file mode 100644 index b6a01fe..0000000 --- a/modules/home-manager/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ hostName, version, user, enableDevelopmentKit ? false, ... }: -{ pkgs, ... }: -{ - home-manager.users.root = { - home.stateVersion = version; - programs.git = { - enable = true; - userName = "root"; - }; - programs.zsh = { - enable = true; - autosuggestion.enable = true; - }; - programs.zsh.oh-my-zsh.enable = true; - }; - -} diff --git a/modules/home-manager/macos.nix b/modules/home-manager/macos.nix deleted file mode 100644 index a1c5969..0000000 --- a/modules/home-manager/macos.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ user }: -{ ... }: { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.${user.name} = { - home = { - sessionVariables = { "DOCKER_DEFAULT_PLATFORM" = "linux/amd64"; }; - }; - }; -} diff --git a/modules/main.nix b/modules/main.nix index 5c40773..cfe2363 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -1,4 +1,5 @@ { user +, homeManagerVersion , systemStateVersion , hostName , system @@ -12,11 +13,6 @@ , os ? { enable = false; } - # Home Manager -, home-manager ? { - enable = false; - enableDevelopmentKit = false; - } , localNixCaches ? { keys = [ ]; urls = [ ]; } , ... }: @@ -38,14 +34,6 @@ hostName = hostName; } // os)) ] - else - [ ]) ++ (if home-manager.enable then - [ - (import ./home-manager ({ - user = user; - hostName = hostName; - } // home-manager)) - ] else [ ]) ++ (if enableNetworkDrives then [ (import ./network-drives.nix) ] else [ ]) @@ -53,4 +41,5 @@ ++ (if enableHomelabServices then [ (import ./hl-hardware) ] else [ ]) ; skyg.user = user; + skyg.home-manager.version = home-manager.version; } diff --git a/modules/skyg/default.nix b/modules/skyg/default.nix index 2015697..58ec467 100644 --- a/modules/skyg/default.nix +++ b/modules/skyg/default.nix @@ -3,5 +3,6 @@ imports = [ ./core.nix ./user.nix + ./macos.nix ]; } diff --git a/modules/skyg/macos.nix b/modules/skyg/macos.nix new file mode 100644 index 0000000..0f863ae --- /dev/null +++ b/modules/skyg/macos.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + skygUser = config.skyg.user; +in +{ + options = { + skyg.skyg.user.macos = { + enableOverride = mkEnableOption ""; + }; + }; + + config = mkIf skygUser.macos.enableOverride { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.${skygUser.name} = { + home = { + sessionVariables = { "DOCKER_DEFAULT_PLATFORM" = "linux/amd64"; }; + }; + }; + }; +} diff --git a/modules/skyg/user.nix b/modules/skyg/user.nix index 8d75c69..6fff6c0 100644 --- a/modules/skyg/user.nix +++ b/modules/skyg/user.nix @@ -1,9 +1,9 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; let - cfg = config.skyg.core; + cfg = config.skyg; gitconfigs = (builtins.filterSource (path: type: type != "directory") ./gitconfigs); gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs); @@ -11,6 +11,9 @@ let in { options = { + skyg.home-manager.version = mkOption { + type = types.str; + }; skyg.user = { name = mkOption { type = types.str; @@ -22,7 +25,7 @@ in type = types.str; }; extraGitConfigs = mkOption { - type = types.listOf (types.attrsOf { + type = types.listOf (types.submodule { path = mkOption { type = types.str; }; @@ -37,10 +40,22 @@ in }; config = { + home-manager.users.root = { + home.stateVersion = cfg.home-manager.version; + programs.git = { + enable = true; + userName = "root"; + }; + programs.zsh = { + enable = true; + autosuggestion.enable = true; + }; + programs.zsh.oh-my-zsh.enable = true; + }; home-manager.users.${cfg.user.name} = { home = { sessionVariables = { }; - stateVersion = version; + stateVersion = cfg.home-manager.version; shellAliases = { cat = "bat"; }; @@ -83,10 +98,7 @@ in }; includes = (builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles) - ++ (if builtins.hasAttr "extraGitConfigs" user then - cfg.user.extraGitConfigs - else - [ ]); + ++ cfg.user.extraGitConfigs; }; zsh = { enable = true;