diff --git a/base.nix b/base.nix index bcda2d7..aa7b555 100644 --- a/base.nix +++ b/base.nix @@ -51,7 +51,7 @@ #nix.optimize.automatic = true; # periodic optimization nix.gc.automatic = true; nix.gc.dates = "weekly"; - nix.gc.options = "--delete-older-than 15d"; + nix.gc.options = lib.mkIf config.system.autoUpgrade.enable "--delete-older-than 15d"; nix.settings.min-free = 3 * 1024 * 1024 * 1024; nix.settings.max-free = 20 * 1024 * 1024 * 1024; diff --git a/flake.nix b/flake.nix index dd43003..b020669 100644 --- a/flake.nix +++ b/flake.nix @@ -353,9 +353,11 @@ in { # TODO: pvv pbsds = mkHome "pbsds" "/home/pbsds" inputs-edge [ ./users/pbsds/home ]; + pbsds-2405 = mkHome "pbsds" "/home/pbsds" inputs-2405 [ ./users/pbsds/home ]; pbsds-2311 = mkHome "pbsds" "/home/pbsds" inputs-2311 [ ./users/pbsds/home ]; pbsds-2305 = mkHome "pbsds" "/home/pbsds" inputs-2305 [ ./users/pbsds/home ]; pbsds-gnome = mkHome "pbsds" "/home/pbsds" inputs-edge [ ./users/pbsds/home/gnome.nix ]; + pbsds-gnome-2405 = mkHome "pbsds" "/home/pbsds" inputs-2405 [ ./users/pbsds/home/gnome.nix ]; pbsds-gnome-2311 = mkHome "pbsds" "/home/pbsds" inputs-2311 [ ./users/pbsds/home/gnome.nix ]; pbsds-gnome-2305 = mkHome "pbsds" "/home/pbsds" inputs-2305 [ ./users/pbsds/home/gnome.nix ]; }); diff --git a/users/pbsds/home/profiles/git.nix b/users/pbsds/home/profiles/git.nix index a55c46c..75b3796 100644 --- a/users/pbsds/home/profiles/git.nix +++ b/users/pbsds/home/profiles/git.nix @@ -2,12 +2,12 @@ { home.packages = with pkgs; [ #git - #gh + gh hub colordiff ]; - programs.gh.enable = true; + #programs.gh.enable = true; # adds read-only config to .config #programs.git.gitui.enable = true; programs.git.enable = true; @@ -22,7 +22,7 @@ # https://jvns.ca/blog/2024/02/16/popular-git-config-options/ programs.git.extraConfig.rerere.enabled = true; - programs.git.extraConfig.help.autocorrect = "prompt"; + #programs.git.extraConfig.help.autocorrect = "prompt"; programs.git.extraConfig.transfer.fsckobjects = true; programs.git.extraConfig.fetch.fsckobjects = true; programs.git.extraConfig.receive.fsckObjects = true; @@ -32,7 +32,7 @@ programs.git.extraConfig.fetch.prunetags = true; programs.git.extraConfig.log.date = "iso"; - + programs.git.iniContent.init.defaultBranch = "main"; programs.git.ignores = [ ".remote.toml" "result" @@ -45,7 +45,6 @@ "*.pyc" #".envrc" ]; - programs.git.iniContent.init.defaultBranch = "main"; home.shellAliases = { # git gud diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index 4288a8d..4285403 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -44,7 +44,7 @@ #programs.zoxide.enable = true; #programs.zoxide.options = [ "--cmd cd --cmd dc" ]; - programs.carapace.enable = true; + programs.carapace.enable = true; # completions # i can't type home.shellAliases.sl = "eza"; @@ -69,6 +69,8 @@ home.shellAliases.watch = "watch -c "; # parse colors home.shellAliases.xargs = "xargs "; + home.shellAliases.vimv = "edir"; + # Be conservative with files # --preserver-root is for GNU versions, preventing changing perms on / home.shellAliases.chown = "chown --preserve-root"; @@ -84,7 +86,7 @@ rsync bind.dnsutils # dig dogdns # dog - vimv + edir # better vimv curl wget