electria/nixowos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: add and use option nixowos.allowAddingPackages

Browse source
This commit is contained in:
Elec3137 2026-03-23 21:17:09 -07:00
commit b91af8f6f7
5 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
default.nix
View file

@ -1,4 +1,5 @@
{ {
lib,
... ...
}: }:
@ -7,4 +8,8 @@
./defaults ./defaults
./nvidia.nix ./nvidia.nix
]; ];
options.nixowos = {
allowAddingPackages = lib.mkEnableOption "adding to `environment.systemPackages`";
};
} }

4
defaults/nix.nix
View file

@ -25,7 +25,9 @@ in
# source: https://nix.dev/manual/nix/2.26/command-ref/new-cli/nix3-store-optimise # source: https://nix.dev/manual/nix/2.26/command-ref/new-cli/nix3-store-optimise
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
environment.systemPackages = with pkgs; [ environment.systemPackages =
with pkgs;
lib.mkIf config.nixowos.allowAddingPackages [
nixd nixd
nixfmt nixfmt
]; ];

4
defaults/plasma.nix
View file

@ -26,7 +26,9 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages =
with pkgs;
lib.mkIf config.nixowos.allowAddingPackages [
kdePackages.plasma-keyboard kdePackages.plasma-keyboard
kdePackages.qtvirtualkeyboard kdePackages.qtvirtualkeyboard
wl-clipboard wl-clipboard

2
defaults/shell.nix
View file

@ -61,7 +61,7 @@ in
nixos-rebuild = /* sh */ "nixos-rebuild --ask-sudo-password"; nixos-rebuild = /* sh */ "nixos-rebuild --ask-sudo-password";
}; };
environment.systemPackages = cfg.extraPackages; environment.systemPackages = lib.mkIf config.nixowos.allowAddingPackages cfg.extraPackages;
# enter dev env on cd # enter dev env on cd
programs.direnv = lib.mkDefault { programs.direnv = lib.mkDefault {

2
defaults/system.nix
View file

@ -23,7 +23,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = cfg.extraPackages; environment.systemPackages = lib.mkIf config.nixowos.allowAddingPackages cfg.extraPackages;
boot.loader.grub = lib.mkDefault { boot.loader.grub = lib.mkDefault {
# modern installation # modern installation