From 0559d212fe248be80a9dd8aa56447c45b7486b5e Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Fri, 16 Jan 2026 14:06:42 -0600 Subject: [PATCH] Add user-specific configurations for Emacs and Stylix across multiple hosts Updated the configuration files for miniserver, server, and workstation to include user-specific settings for Emacs and Stylix. This change enhances user management consistency and aligns with the recent refactor for multi-user support in the configuration. --- config/derek.nix | 8 ++++++++ config/stylix.nix | 2 +- hosts/miniserver/toggles.nix | 9 ++++++++- hosts/server/toggles.nix | 10 ++++++++-- hosts/workstation/toggles.nix | 10 ++++++++-- modules/dev/emacs.nix | 2 +- 6 files changed, 34 insertions(+), 7 deletions(-) diff --git a/config/derek.nix b/config/derek.nix index 9a93f01..19b0389 100644 --- a/config/derek.nix +++ b/config/derek.nix @@ -27,6 +27,14 @@ in tools = enableForDerek; multimedia = enableForDerek; }; + stylix = { + enable = true; + users = "bearded_dragonn"; + }; + emacs = { + enable = true; + users = "bearded_dragonn"; + }; }; sops.secrets = lib.mkIf config.my.secureHost { derek-password.neededForUsers = true; diff --git a/config/stylix.nix b/config/stylix.nix index a69118a..f98ce75 100644 --- a/config/stylix.nix +++ b/config/stylix.nix @@ -44,7 +44,7 @@ in inherit (cfg) enable; autoEnable = cfg.enable; iconTheme = { - inherit (cfg) enable; + enable = true; package = scheme.iconPackage; light = "Papirus-Light"; dark = "Papirus-Dark"; diff --git a/hosts/miniserver/toggles.nix b/hosts/miniserver/toggles.nix index 3ffdaf0..262d25a 100644 --- a/hosts/miniserver/toggles.nix +++ b/hosts/miniserver/toggles.nix @@ -8,7 +8,14 @@ let ; in { - emacs.enable = true; + emacs = { + enable = true; + users = "jawz"; + }; + stylix = { + enable = true; + users = "jawz"; + }; enableProxy = true; websites.portfolio.enableProxy = true; apps = enableList mkEnabledWithUsers [ diff --git a/hosts/server/toggles.nix b/hosts/server/toggles.nix index d170612..c59f1c4 100644 --- a/hosts/server/toggles.nix +++ b/hosts/server/toggles.nix @@ -5,8 +5,14 @@ let in { mainServer = "server"; - emacs.enable = true; - stylix.enable = true; + emacs = { + enable = true; + users = "jawz"; + }; + stylix = { + enable = true; + users = "jawz"; + }; enableProxy = true; enableContainers = true; apps.dictionaries.enable = true; diff --git a/hosts/workstation/toggles.nix b/hosts/workstation/toggles.nix index 4653086..6a5a291 100644 --- a/hosts/workstation/toggles.nix +++ b/hosts/workstation/toggles.nix @@ -3,8 +3,14 @@ let inherit (inputs.self.lib) mkEnabled mkEnabledWithUsers enableList; in { - stylix.enable = true; - emacs.enable = true; + stylix = { + enable = true; + users = "jawz"; + }; + emacs = { + enable = true; + users = "jawz"; + }; enableContainers = true; servers.drpp.enable = true; apps = diff --git a/modules/dev/emacs.nix b/modules/dev/emacs.nix index 4e60c9a..9c0c67c 100644 --- a/modules/dev/emacs.nix +++ b/modules/dev/emacs.nix @@ -61,7 +61,7 @@ defaultEditor = true; package = pkgs.emacsWithDoom { doomDir = ../../dotfiles/doom; - doomLocalDir = "/home/jawz/.local/share/nix-doom"; + doomLocalDir = "/home/${inputs.self.lib.getFirstUser config.my.emacs.users}/.local/share/nix-doom"; tangleArgs = "--all config.org"; extraPackages = epkgs: