diff options
| -rw-r--r-- | hosts/ades/common.nix | 1 | ||||
| -rw-r--r-- | hosts/ades/users.nix | 4 | ||||
| -rw-r--r-- | hosts/muspell/default.nix | 2 | ||||
| -rw-r--r-- | hosts/thyme/default.nix | 10 | ||||
| -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 | ||||
| -rw-r--r-- | users/default.nix | 4 |
9 files changed, 30 insertions, 20 deletions
diff --git a/hosts/ades/common.nix b/hosts/ades/common.nix index eea7f96..8e1a1a1 100644 --- a/hosts/ades/common.nix +++ b/hosts/ades/common.nix @@ -10,7 +10,6 @@ in ]; this.pc.enable = true; - this.overlays.emacs.enable = lib.mkForce false; this.gui.enable = true; this.locales.default = "us"; diff --git a/hosts/ades/users.nix b/hosts/ades/users.nix index 9da8982..f7f1cfc 100644 --- a/hosts/ades/users.nix +++ b/hosts/ades/users.nix @@ -4,8 +4,4 @@ this.users.enabled = [ "simon" ]; - - users.users.simon = { - shell = lib.mkForce pkgs.bash; - }; } diff --git a/hosts/muspell/default.nix b/hosts/muspell/default.nix index 97d4b64..420d0c0 100644 --- a/hosts/muspell/default.nix +++ b/hosts/muspell/default.nix @@ -14,10 +14,8 @@ in time.timeZone = "America/Chicago"; this.pc.enable = true; - this.overlays.emacs.enable = lib.mkForce false; this.users.enabled = ["simon"]; - users.users.simon.shell = lib.mkForce pkgs.bash; this.sets = { cli.tools.full = true; diff --git a/hosts/thyme/default.nix b/hosts/thyme/default.nix index c3e7678..3d2b203 100644 --- a/hosts/thyme/default.nix +++ b/hosts/thyme/default.nix @@ -6,9 +6,8 @@ ./packages.nix ]; - this.pc.enable = true; + this.main.enable = true; this.laptop.enable = true; - this.gui.enable = true; networking.domain = "alef.zoar.cx"; @@ -24,13 +23,6 @@ services.printing.enable = true; - fonts.fontconfig.defaultFonts = { - serif = []; - sansSerif = []; - monospace = []; - emoji = []; - }; - this.hosts = { lan.home = true; mine = true; 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 ]); diff --git a/users/default.nix b/users/default.nix index 10fe77b..a6a4705 100644 --- a/users/default.nix +++ b/users/default.nix @@ -23,7 +23,9 @@ in group = "simon"; isNormalUser = true; uid = 1000; - shell = pkgs.zsh; + shell = + lib.mkIf config.this.main.enable + pkgs.zsh; homeMode = "755"; extraGroups = [ "users" |