about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xmachines/adax/configuration.nix9
-rwxr-xr-xmachines/base.nix1
-rw-r--r--modules/doas.nix10
3 files changed, 11 insertions, 9 deletions
diff --git a/machines/adax/configuration.nix b/machines/adax/configuration.nix
index 5372e8e..388fa60 100755
--- a/machines/adax/configuration.nix
+++ b/machines/adax/configuration.nix
@@ -14,15 +14,6 @@
   environment.systemPackages = with pkgs; [
   ];
 
-  security.sudo.enable = false;
-  security.doas = {
-    enable = true;
-    wheelNeedsPassword = false;
-  };
-  environment.shellAliases = {
-    sudo = "doas";
-  };
-
   # https://sgt.hootr.club/molten-matter/nix-distributed-builds/
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   services.openssh.enable = true;
diff --git a/machines/base.nix b/machines/base.nix
index 209a9ac..b706452 100755
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -6,6 +6,7 @@
   imports = [
     ../modules/nur.nix
     ../users/pn.nix
+    ../modules/doas.nix
     ../modules/internet.nix
   ];
 
diff --git a/modules/doas.nix b/modules/doas.nix
new file mode 100644
index 0000000..27535b0
--- /dev/null
+++ b/modules/doas.nix
@@ -0,0 +1,10 @@
+{
+  security.sudo.enable = false;
+  security.doas = {
+    enable = true;
+    wheelNeedsPassword = false;
+  };
+  environment.shellAliases = {
+    sudo = "doas";
+  };
+}