From 0c27c47323c64dfdc28334702eb3079d6beae355 Mon Sep 17 00:00:00 2001 From: MasterEnderman Date: Wed, 12 Aug 2026 00:07:48 +0200 Subject: [PATCH] move programming stuff to /home/dev/ and refactor references Signed-off-by: MasterEnderman --- home/apps/vscodium.nix | 2 +- home/console/yazi.nix | 2 +- home/{console => dev}/cargo.nix | 6 +++--- home/dev/default.nix | 11 +++++++++++ home/{console => dev}/java.nix | 0 home/{console => dev}/nix-flake.nix | 10 +++++----- home/{console => dev}/uv.nix | 2 +- 7 files changed, 22 insertions(+), 11 deletions(-) rename home/{console => dev}/cargo.nix (81%) create mode 100644 home/dev/default.nix rename home/{console => dev}/java.nix (100%) rename home/{console => dev}/nix-flake.nix (89%) rename home/{console => dev}/uv.nix (95%) diff --git a/home/apps/vscodium.nix b/home/apps/vscodium.nix index ed47f85..571e4b6 100644 --- a/home/apps/vscodium.nix +++ b/home/apps/vscodium.nix @@ -19,7 +19,7 @@ hotkey-overlay.title = "Open VSCodium"; }; "Mod+Shift+Ctrl+C" = { - action.spawn-sh = "codium ${config.modules.terminal.flakeManagement.repoPath}/"; + action.spawn-sh = "codium ${config.modules.dev.flakeManagement.repoPath}/"; hotkey-overlay.title = "Open NixOS Config"; }; }; diff --git a/home/console/yazi.nix b/home/console/yazi.nix index 611491c..bad11ab 100644 --- a/home/console/yazi.nix +++ b/home/console/yazi.nix @@ -89,7 +89,7 @@ in { { desc = "Go to flake repo"; on = ["g" "f"]; - run = "cd ${config.modules.terminal.flakeManagement.repoPath}"; + run = "cd ${config.modules.dev.flakeManagement.repoPath}"; } { desc = "Go to Projects"; diff --git a/home/console/cargo.nix b/home/dev/cargo.nix similarity index 81% rename from home/console/cargo.nix rename to home/dev/cargo.nix index c683b87..e484213 100644 --- a/home/console/cargo.nix +++ b/home/dev/cargo.nix @@ -7,7 +7,7 @@ }: { options.modules.terminal.cargo = { enable = lib.mkOption { - default = config.modules.terminal.enable; + default = config.modules.dev.enable; description = "Rust toolchain (cargo, rustc) and cargo configuration"; type = lib.types.bool; }; @@ -18,14 +18,14 @@ }; }; - config = lib.mkIf config.modules.terminal.cargo.enable { + config = lib.mkIf config.modules.dev.cargo.enable { home.packages = with pkgs; [ rustfmt pkg-config gcc ] - ++ lib.optional config.modules.terminal.cargo.withAnalyzer rust-analyzer; + ++ lib.optional config.modules.dev.cargo.withAnalyzer rust-analyzer; programs.cargo = { enable = true; diff --git a/home/dev/default.nix b/home/dev/default.nix new file mode 100644 index 0000000..99dc5f8 --- /dev/null +++ b/home/dev/default.nix @@ -0,0 +1,11 @@ +{ + config, + lib, + ... +}: { + options.modules.dev.enable = lib.mkOption { + default = config.modules.terminal.enable; + description = "Dev programs and utilities"; + type = lib.types.bool; + }; +} diff --git a/home/console/java.nix b/home/dev/java.nix similarity index 100% rename from home/console/java.nix rename to home/dev/java.nix diff --git a/home/console/nix-flake.nix b/home/dev/nix-flake.nix similarity index 89% rename from home/console/nix-flake.nix rename to home/dev/nix-flake.nix index d86de75..965d7e5 100644 --- a/home/console/nix-flake.nix +++ b/home/dev/nix-flake.nix @@ -5,9 +5,9 @@ hostName, ... }: { - options.modules.terminal.flakeManagement = { + options.modules.dev.flakeManagement = { enable = lib.mkOption { - default = config.modules.terminal.enable; + default = config.modules.dev.enable; description = "flake management helper commands (nixfm, rebuild, update)"; type = lib.types.bool; }; @@ -18,17 +18,17 @@ }; }; - config = lib.mkIf config.modules.terminal.flakeManagement.enable { + config = lib.mkIf config.modules.dev.flakeManagement.enable { home.packages = with pkgs; [statix deadnix sops alejandra flake-runner]; programs = { nh = { enable = true; - flake = config.modules.terminal.flakeManagement.repoPath; + flake = config.modules.dev.flakeManagement.repoPath; }; nushell.extraConfig = let - repo = config.modules.terminal.flakeManagement.repoPath; + repo = config.modules.dev.flakeManagement.repoPath; runnerArgs = lib.concatStringsSep " " ( [ diff --git a/home/console/uv.nix b/home/dev/uv.nix similarity index 95% rename from home/console/uv.nix rename to home/dev/uv.nix index 9f71287..98aa831 100644 --- a/home/console/uv.nix +++ b/home/dev/uv.nix @@ -6,7 +6,7 @@ }: { options.modules.terminal.uv = { enable = lib.mkOption { - default = config.modules.terminal.enable; + default = config.modules.dev.enable; description = "uv, the Python package and project manager"; type = lib.types.bool; }; -- 2.51.2