Compare commits

...

2 commits

Author SHA1 Message Date
bb1f115635
replace sudo with run0 2024-10-05 15:27:56 -04:00
cd55b1bf6f
update nix 2024-10-05 15:27:55 -04:00
4 changed files with 17 additions and 28 deletions

11
flake.lock generated
View file

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

View file

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

View file

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

View file

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