From adeb1a50caae546d4787b4fef7eaff22908b380d Mon Sep 17 00:00:00 2001 From: Bun Date: Thu, 13 Mar 2025 22:08:19 -0400 Subject: [PATCH] Add the doas shim for compatibility with like, a lot --- modules/home/settings/aliases/default.nix | 3 +-- modules/system/settings/security/privilege/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix index f580f4ce..a769d56e 100644 --- a/modules/home/settings/aliases/default.nix +++ b/modules/home/settings/aliases/default.nix @@ -2,8 +2,7 @@ { home.shellAliases = { # NixOS - nhs = "doas nh os switch -R /etc/nixos"; - nhu = "flakedate && nhs"; + nhs = "nh os switch /etc/nixos"; nixclean = "nix store gc; nix store optimise"; nixpurge = "doas nix-collect-garbage --delete-old"; diff --git a/modules/system/settings/security/privilege/default.nix b/modules/system/settings/security/privilege/default.nix index b40d8eab..a7f34eb9 100644 --- a/modules/system/settings/security/privilege/default.nix +++ b/modules/system/settings/security/privilege/default.nix @@ -1,11 +1,11 @@ -{ ... }: +{ pkgs, ... }: { security = { sudo.enable = false; doas = { enable = true; extraRules = [ - { # Give wheel root access + { # Specify a timeout period and keep environment variables groups = [ "wheel" ]; keepEnv = true; persist = true; @@ -13,4 +13,5 @@ ]; }; }; + environment.systemPackages = with pkgs; [ doas-sudo-shim ]; }