flake.lock

@@ -573,15 +573,16 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1728154788,
-        "narHash": "sha256-x7w/gBydlh5hljMuwXb/FgNNvSPc8p2SrnmVxARXddM=",
-        "owner": "Gerg-L",
+        "lastModified": 1727439651,
+        "narHash": "sha256-cMfDBWlWjCy+B6W68xJg5CIC4zghOi6KG1QXnflT6uY=",
+        "owner": "yannham",
         "repo": "nix",
-        "rev": "83bb6f24352d54d42225286580cb69ab27fd3c99",
+        "rev": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
         "type": "github"
       },
       "original": {
-        "owner": "Gerg-L",
+        "owner": "yannham",
+        "ref": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
         "repo": "nix",
         "type": "github"
       }

flake.nix

@@ -26,8 +26,9 @@
       #repo = "nix";
       #ref = "08deebddf26be28e5367983fdece18c484bbe410";
 
-      owner = "Gerg-L";
+      owner = "yannham";
       repo = "nix";
+      ref = "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697";
       inputs.nixpkgs.follows = "stable";
     };
     nixos-generators = {

modules/nix.nix

@@ -26,7 +26,11 @@
     #
     # Use nix directly from master
     #
-    package = nix.packages.default;
+    package = nix.packages.default.overrideAttrs (old: {
+      meta = old.meta // {
+        mainProgram = "nix";
+      };
+    });
     #
     # Other nix settings
     #

modules/shell.nix

@@ -2,7 +2,6 @@
   fetch-rs,
   pkgs,
   config,
-  lib,
 }:
 {
   systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ];
@@ -19,9 +18,8 @@
       MANPAGER = "page -t man";
     };
     shellAliases = {
-      #make run0 use aliases
-      run0 = "run0 --background='' ";
-      s = "run0";
+      #make sudo use aliases
+      sudo = "sudo ";
       #paste link trick
       pastebin = "curl -F 'clbin=<-' https://clbin.com";
       termbin = "nc termbin.com 9999";
@@ -44,11 +42,14 @@
     };
     interactiveShellInit = "fetch-rs";
   };
-
-  #begone sudo
-  security = {
-    sudo.enable = lib.mkForce false;
-    wrappers.su.setuid = lib.mkForce false;
+  security.sudo = {
+    enable = true;
+    execWheelOnly = true;
+    extraConfig = ''
+      Defaults timestamp_timeout=1
+      Defaults env_keep += "EDITOR VISUAL PAGER SYSTEMD_PAGERSECURE MANPAGER"
+      Defaults lecture = never
+    '';
   };
 
   #zsh stuff
@@ -114,7 +115,7 @@
         format = ''
           $cmd_duration$git_metrics$git_state$git_branch
           $status$directory$character'';
-        right_format = "$nix_shell\${custom.direnv} $time";
+        right_format = "$sudo$nix_shell\${custom.direnv} $time";
         continuation_prompt = "▶▶ ";
         character = {
           success_symbol = "[\\$](#9ece6a bold)";
@@ -138,6 +139,10 @@
           format = "[$symbol$branch(:$remote_branch)]($style)";
           style = "bold red";
         };
+        sudo = {
+          format = "[ ](#7aa2f7)";
+          disabled = false;
+        };
         cmd_duration = {
           min_time = 5000;
           style = "bold #9ece6a";