From bb3a520b43c9b495149344dfe31c53cbcc79e23a Mon Sep 17 00:00:00 2001 From: Laurent Gueret Date: Sun, 4 Oct 2026 19:14:13 +0200 Subject: [PATCH] Ajout de devenv en common --- flake.nix | 8 +++++--- modules/home/common/devenv.nix | 22 ---------------------- modules/system/common/devenv.nix | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 25 deletions(-) delete mode 100644 modules/home/common/devenv.nix create mode 100644 modules/system/common/devenv.nix diff --git a/flake.nix b/flake.nix index 3447d30..f9412f1 100755 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,7 @@ (import-tree ./overlays/nixos) (import-tree ./hosts/common) + (import-tree ./modules/system/common) (import-tree ./modules/system/nixos) (import-tree ./hosts/nixos/system) ] @@ -89,11 +90,12 @@ homebrew-cask = homebrew-cask; }; modules = [ - nix-homebrew.darwinModules.nix-homebrew - (import-tree ./modules/system/darwin) - (import-tree ./hosts/common) (import-tree ./hosts/darwin/system) + + nix-homebrew.darwinModules.nix-homebrew + (import-tree ./modules/system/common) + (import-tree ./modules/system/darwin) ] ++ [ (import-tree ./overlays/darwin) diff --git a/modules/home/common/devenv.nix b/modules/home/common/devenv.nix deleted file mode 100644 index 2f80fed..0000000 --- a/modules/home/common/devenv.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: -with lib; -let - cfg = config.home.shell.devenv; -in -{ - options.home.shell.devenv = { - enable = mkEnableOption "Git options"; - }; - config = mkIf cfg.enable { - - home.packages = with pkgs; [ - devenv - ]; - - }; -} diff --git a/modules/system/common/devenv.nix b/modules/system/common/devenv.nix new file mode 100644 index 0000000..51b9cda --- /dev/null +++ b/modules/system/common/devenv.nix @@ -0,0 +1,22 @@ +{ + lib, + pkgs, + config, + ... +}: +with lib; +let + cfg = config.os.shell.devenv; +in +{ + options.os.shell.devenv = { + enable = mkEnableOption "Devenv options"; + }; + config = mkIf cfg.enable { + + environment.systemPackages = [ + pkgs.devenv + ]; + + }; +}