From 29a18f5a8fb6915fc1dccc5ddd26356f19b17dfa Mon Sep 17 00:00:00 2001 From: Simon Parri Date: Mon, 2 Jun 2025 16:32:31 -0500 Subject: Add "main" module and refactor hosts to use it --- hosts/ades/common.nix | 1 - hosts/ades/users.nix | 4 ---- hosts/muspell/default.nix | 2 -- hosts/thyme/default.nix | 10 +--------- 4 files changed, 1 insertion(+), 16 deletions(-) (limited to 'hosts') 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; -- cgit v1.2.3