From a292195d20341973664982765abd307b26285486 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 18 Jul 2024 09:41:05 -0400 Subject: [PATCH] using mergeset --- flake.nix | 9 +++----- modules/desktop/default.nix | 1 + modules/home-manager/default.nix | 38 ++++++++++++++------------------ modules/main.nix | 25 ++++++--------------- modules/os/default.nix | 1 + 5 files changed, 28 insertions(+), 46 deletions(-) diff --git a/flake.nix b/flake.nix index 8d4fd2e..21db2a1 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ enableSSH = false; hardware = { enable = true; }; containerRuntime = "docker"; + enablePrometheusExporters = true; }; configuration = { ... }: { imports = [ @@ -111,9 +112,8 @@ enable = true; firewall = { enable = false; }; enableFonts = true; - enableNetworking = true; - enableSSH = true; hardware = { enable = true; }; + enablePrometheusExporters = true; }; configuration = (import ./hosts/hl-bigbox1.nix { user = user; }); }; @@ -135,10 +135,7 @@ os = { enable = true; firewall = { enable = false; }; - enableFonts = true; - enableNetworking = true; - enableSSH = true; - hardware = { enable = false; }; + enablePrometheusExporters = true; }; configuration = (import ./hosts/hl-minipc1.nix { user = user; }); }; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index d803262..97b1e31 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -4,6 +4,7 @@ , enableKDE ? false , enableHypr ? false , enableWine ? false +, ... }: { pkgs, ... }: { imports = [ ./wayland.nix ] ++ (if enableX11 then [ ./x11.nix ] else [ ]) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 2f25a31..c38ca47 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,8 +1,4 @@ -{ hostName -, homeManagerVersion -, user -, enableDevelopmentKit ? false -}: +{ hostName, version, user, enableDevelopmentKit ? false, ... }: { pkgs, ... }: let gitconfigs = @@ -11,7 +7,7 @@ let in { home-manager.users.root = { - home.stateVersion = homeManagerVersion; + home.stateVersion = version; programs.git = { enable = true; userName = "root"; @@ -26,25 +22,22 @@ in home-manager.users.${user.name} = { home = { sessionVariables = { MAMBA_ROOT_PREFIX = "$HOME/.local/micromamba"; }; - stateVersion = homeManagerVersion; + stateVersion = version; shellAliases = { cat = "bat"; conda = "micromamba"; }; - packages = with pkgs; [ - jq - nixfmt-classic - devenv - ipfetch - nixd - ] ++ (if enableDevelopmentKit then [ - rye - uv - devbox - micromamba - terraform - kubectl - ] else [ ]); + packages = with pkgs; + [ jq nixfmt-classic devenv ipfetch nixd ] + ++ (if enableDevelopmentKit then [ + rye + uv + devbox + micromamba + terraform + kubectl + ] else + [ ]); }; programs = { bat.enable = true; @@ -85,7 +78,8 @@ in initExtra = (if enableDevelopmentKit then '' export MAMBA_ROOT_PREFIX="$HOME/.local/micromamba" source <(micromamba shell hook --root-prefix=$MAMBA_ROOT_PREFIX) - '' else ""); + '' else + ""); }; zsh.oh-my-zsh = { enable = true; diff --git a/modules/main.nix b/modules/main.nix index 825c60f..bcd3863 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -26,33 +26,22 @@ systemStateVersion = systemStateVersion; }) ] ++ (if desktop.enable then - [ - (import ./desktop { - user = user; - enableKDE = desktop.enableKDE; - enableHypr = desktop.enableHypr; - enableX11 = desktop.enableX11; - enableWine = desktop.enableWine; - }) - ] + [ (import ./desktop ({ user = user; } // desktop)) ] else [ ]) ++ (if os.enable then [ - (import ./os - { - user = user; - hostName = hostName; - } // os) + (import ./os ({ + user = user; + hostName = hostName; + } // os)) ] else [ ]) ++ (if home-manager.enable then [ - (import ./home-manager { + (import ./home-manager ({ user = user; - homeManagerVersion = home-manager.version; - enableDevelopmentKit = home-manager.enableDevelopmentKit; hostName = hostName; - }) + } // home-manager)) ] else [ ]) diff --git a/modules/os/default.nix b/modules/os/default.nix index f4a4b94..242b186 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -7,6 +7,7 @@ , containerRuntime ? null , hardware ? { enable = false; } , enablePrometheusExporters ? false +, ... }: { pkgs, ... }: { imports = [