From 0456dac1e2dadfe05e9df1453dfd03090e46d001 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 17 Jul 2024 14:31:45 -0400 Subject: [PATCH] Optional dev pkgs:wq --- flake.nix | 4 ++++ .../home-manager/{common.nix => default.nix} | 24 +++++++++++-------- modules/main.nix | 4 +++- 3 files changed, 21 insertions(+), 11 deletions(-) rename modules/home-manager/{common.nix => default.nix} (91%) diff --git a/flake.nix b/flake.nix index 5225660..990ec9c 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ home-manager = { enable = true; version = homeManagerVersion; + enableDevelopmentKit = true; }; desktop = { enable = true; @@ -85,6 +86,7 @@ hostName = "asosnovsky-mac"; home-manager = { enable = true; + enableDevelopmentKit = true; version = homeManagerVersion; }; configuration = @@ -100,6 +102,7 @@ hostName = "hl-bigbox1"; home-manager = { enable = true; + enableDevelopmentKit = false; version = homeManagerVersion; }; enableNetworkDrives = true; @@ -125,6 +128,7 @@ home-manager = { enable = true; version = homeManagerVersion; + enableDevelopmentKit = false; }; os = { enable = true; diff --git a/modules/home-manager/common.nix b/modules/home-manager/default.nix similarity index 91% rename from modules/home-manager/common.nix rename to modules/home-manager/default.nix index 3647d31..2f25a31 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/default.nix @@ -1,4 +1,8 @@ -{ hostName, homeManagerVersion, user }: +{ hostName +, homeManagerVersion +, user +, enableDevelopmentKit ? false +}: { pkgs, ... }: let gitconfigs = @@ -30,17 +34,17 @@ in packages = with pkgs; [ jq nixfmt-classic - kubectl - terraform - rye devenv - micromamba - neofetch ipfetch nixd - devbox + ] ++ (if enableDevelopmentKit then [ + rye uv - ]; + devbox + micromamba + terraform + kubectl + ] else [ ]); }; programs = { bat.enable = true; @@ -78,10 +82,10 @@ in zsh = { enable = true; autosuggestion.enable = true; - initExtra = '' + initExtra = (if enableDevelopmentKit then '' export MAMBA_ROOT_PREFIX="$HOME/.local/micromamba" source <(micromamba shell hook --root-prefix=$MAMBA_ROOT_PREFIX) - ''; + '' else ""); }; zsh.oh-my-zsh = { enable = true; diff --git a/modules/main.nix b/modules/main.nix index 1c55f92..18c6f32 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -14,6 +14,7 @@ # Home Manager , home-manager ? { enable = false; + enableDevelopmentKit = false; } , ... }: @@ -43,9 +44,10 @@ hardware = os.hardware; }) ] else [ ]) ++ (if home-manager.enable then [ - (import ./home-manager/common.nix { + (import ./home-manager { user = user; homeManagerVersion = home-manager.version; + enableDevelopmentKit = home-manager.enableDevelopmentKit; hostName = hostName; }) ] else [ ]) ++ (if enableNetworkDrives then [