diff options
author | Simon Parri <simonparri@ganzeria.com> | 2025-06-02 16:32:31 -0500 |
---|---|---|
committer | Simon Parri <simonparri@ganzeria.com> | 2025-06-02 17:03:57 -0500 |
commit | 29a18f5a8fb6915fc1dccc5ddd26356f19b17dfa (patch) | |
tree | 05b978c1c2b0d9ac1123f2a2f39b4cee39ddf01d /modules | |
parent | 55c399261c007a7d36e8d93d8f34667803d5e9bf (diff) | |
download | nixos-config-29a18f5a8fb6915fc1dccc5ddd26356f19b17dfa.tar.gz nixos-config-29a18f5a8fb6915fc1dccc5ddd26356f19b17dfa.zip |
Add "main" module and refactor hosts to use it
Diffstat (limited to 'modules')
-rw-r--r-- | modules/default.nix | 1 | ||||
-rw-r--r-- | modules/main.nix | 23 | ||||
-rw-r--r-- | modules/pc.nix | 2 | ||||
-rw-r--r-- | modules/sets.nix | 3 |
4 files changed, 26 insertions, 3 deletions
diff --git a/modules/default.nix b/modules/default.nix index d6fb0b7..fe4bac6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,6 +7,7 @@ ./locales.nix ./envfs.nix ./pc.nix + ./main.nix ./sets.nix ./syslog.nix ./hosts.nix diff --git a/modules/main.nix b/modules/main.nix new file mode 100644 index 0000000..b5f6f74 --- /dev/null +++ b/modules/main.nix @@ -0,0 +1,23 @@ +{ lib, config, ... }: + +let cfg = config.this.main; +in +{ + options = { + this.main.enable = lib.mkEnableOption "Main-PC setup"; + }; + + config = lib.mkIf cfg.enable { + this.pc.enable = true; + this.gui.enable = true; + + this.overlays.emacs.enable = true; + + fonts.fontconfig.defaultFonts = { + serif = []; + sansSerif = []; + monospace = []; + emoji = []; + }; + }; +} diff --git a/modules/pc.nix b/modules/pc.nix index 51e7385..c211343 100644 --- a/modules/pc.nix +++ b/modules/pc.nix @@ -24,8 +24,6 @@ in pruneBindMounts = true; }; - this.overlays.emacs.enable = !cfg.minimal; - this.locales.dictionaries.enable = !cfg.minimal; }; } diff --git a/modules/sets.nix b/modules/sets.nix index 549af1a..6fead0c 100644 --- a/modules/sets.nix +++ b/modules/sets.nix @@ -157,7 +157,8 @@ in pkgs.noto-fonts-emoji ++ lib.optional (builtins.elem "jp" config.this.locales.all) pkgs.noto-fonts-cjk-sans - ++ [ + ++ + lib.optionals (!config.this.main.enable) [ pkgs.dejavu_fonts pkgs.unifont ]); |