diff --git a/justfile b/justfile
index 1aa8b6a..d15b366 100644
--- a/justfile
+++ b/justfile
@@ -4,11 +4,11 @@ format_home:
     nixfmt ~/.config/home-manager
 
 format_system:
-    run0 nixfmt /etc/nixos
+    doas nixfmt /etc/nixos
 
 system_update:
-    run0 nix flake update /etc/nixos
-    run0 nixos-rebuild boot --impure
+    doas nix flake update /etc/nixos
+    doas nixos-rebuild boot --impure
 
 home_update:
     nix flake update ~/.config/home-manager
diff --git a/nix/etcnixos/common.nix b/nix/etcnixos/common.nix
index 6adfc3c..030e787 100644
--- a/nix/etcnixos/common.nix
+++ b/nix/etcnixos/common.nix
@@ -89,8 +89,19 @@
   # Set your time zone.
   time.timeZone = "America/New_York";
 
-  #lets use run0 instead!
-  security.sudo.enable = false;
+  security = {
+    #lets use doas and not sudo!
+    doas.enable = true;
+    sudo.enable = false;
+    # Configure doas
+    doas.extraRules = [
+      {
+        users = [ "${username}" ];
+        keepEnv = true;
+        persist = true;
+      }
+    ];
+  };
 
   age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];