1 files changed, 58 insertions, 19 deletions
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 864f877..e11ceb7 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -26,7 +26,7 @@
       # You should not change this value, even if you update Home Manager. If you do
       # want to update the value, then make sure to first check the Home Manager
       # release notes.
-      stateVersion = "23.11"; # Please read the comment before changing.
+      stateVersion = "23.05"; # Please read the comment before changing.
 
       # The home.packages option allows you to install Nix packages into your
       # environment.
@@ -36,7 +36,10 @@
         # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
         # # fonts?
         # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-        pass
+        (pass.withExtensions (ext: with ext; [ pass-audit pass-otp pass-update]))
+        passExtensions.pass-audit
+        passExtensions.pass-otp
+        passExtensions.pass-update
         btop # better top
         starship
         eza # better ls
@@ -88,26 +91,62 @@
     };
 
     programs = {
-        ssh.matchBlocks = {
-          serverAliveCountMax = 6;
-          serverAliveInterval = 30;
-          port  = 2200;
-          "git.wormcar.gay" = {
-            user = "devinf";
-            host = "git.wormcar.gay";
-            port = 2200;
-          };
+      ssh.matchBlocks = {
+        serverAliveCountMax = 6;
+        serverAliveInterval = 30;
+        port  = 2200;
+        "git.wormcar.gay" = {
+          user = "devinf";
+          host = "git.wormcar.gay";
+          port = 2200;
         };
-        git = {
-          enable = true;
-          userName = "Devin Finlinson";
-          userEmail = "devin.finlinson@pm.me";
-          includes = [{path = "~/.gitconfig.local";}];
-          extraConfig = {
-            core = {editor = "hx";};
-            pull = {rebase = false;};
+      };
+
+      git = {
+        enable = true;
+        userName = "Devin Finlinson";
+        userEmail = "devin.finlinson@pm.me";
+        includes = [{path = "~/.gitconfig.local";}];
+        extraConfig = {
+          core = {
+            editor = "hx";
+            excludesfile = "~/.gitignore";
+          };
+          column = { ui = "auto"; };
+          branch = { sort = "-committerdate"; };
+          tag = { sort = "version:refname"; };
+          init = { defaultBranch = "trunk"; };
+          diff = {
+            algorithm = "histogram";
+            colorMoved = "plain";
+            mnemonicPrefix = "true";
+            renames = "true";
+          };
+          push = {
+            default = "simple";
+            autoSetupRemote = "true";
+            folowTags = "true";
+          };
+          fetch = {
+            prune = true;
+            pruneTags = true;
+            all = true;
+          };
+          pull = {rebase = false;};
+          merge = { conflictstyle = "zdiff3"; };
+          help = { autocorret = "prompt"; };
+          commit = { verbose = true; };
+          rerere = {
+            enabled = true;
+            autoupdate = true;
+          };
+          rebase = {
+            autoSquash = true;
+            autoStash = true;
+            updateRefs = true;
           };
         };
+      };
 
       # Let Home Manager install and manage itself.
       # home-manager.enable = true;