From 60ccf1a5fcfbcc410680e846fea1450c83bc6c40 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Sun, 30 Jun 2024 02:11:01 -0700 Subject: [PATCH] moving env stuff to dedicated config --- hosts/snowhawk/configuration.nix | 8 -------- modules/default.nix | 2 ++ modules/env.nix | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 modules/env.nix diff --git a/hosts/snowhawk/configuration.nix b/hosts/snowhawk/configuration.nix index ea217cd..288eb40 100644 --- a/hosts/snowhawk/configuration.nix +++ b/hosts/snowhawk/configuration.nix @@ -32,11 +32,6 @@ services.envfs.enable = true; - nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; - auto-optimise-store = true; - }; - programs.nix-ld.enable = true; # programs.nix-ld.libraries = with pkgs; [ # @@ -97,9 +92,6 @@ # backupFileExtension = "backup"; }; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # programs.hyprland.enable = true; # environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/modules/default.nix b/modules/default.nix index b850c6c..9a5512c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,8 +5,10 @@ ./dwm.nix ./i18n.nix ./audio.nix + ./env.nix ]; snowhawk.i18n.enable = lib.mkDefault true; snowhawk.audio.enable = lib.mkDefault true; + snowhawk.env.enable = lib.mkDefault true; } diff --git a/modules/env.nix b/modules/env.nix new file mode 100644 index 0000000..18f85ec --- /dev/null +++ b/modules/env.nix @@ -0,0 +1,19 @@ +{ lib, config, ... }: + +let + cfg = config.snowhawk.env; +in +{ + options.snowhawk.env = { + enable = lib.mkEnableOption "env"; + }; + + config = lib.mkIf cfg.enable { + nix.settings = { + experimental-features = [ "nix-command" "flakes" ]; + auto-optimise-store = true; + }; + + nixpkgs.config.allowUnfree = true; + }; +}