diff --git a/nix/flake.lock b/nix/flake.lock index 84b64c8..969aba2 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { diff --git a/nix/user/git.nix b/nix/user/git.nix index d5debf6..9b74d3f 100644 --- a/nix/user/git.nix +++ b/nix/user/git.nix @@ -11,8 +11,10 @@ br = "branch"; pl = "pull"; ps = "push"; + sw = "switch"; mno =" merge --no-ff"; - lg = "log --color --graph --pretty=format:'%cred%h%creset -%c(yellow)%d%creset %s %cgreen(%cr)%c(bold blue)<%an>%creset' --abbrev-commit"; + lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"; + cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D"; }; difftastic.enable = true; @@ -24,6 +26,7 @@ push.default = "matching"; init.defaultBranch = "main"; merge.conflicstyle = "zdiff3"; + fetch.prune = true; }; ignores = [ diff --git a/nix/user/sh.nix b/nix/user/sh.nix index 96f99f3..116d7b4 100644 --- a/nix/user/sh.nix +++ b/nix/user/sh.nix @@ -78,6 +78,7 @@ fd du-dust glow + ripgrep-all #nerdfonts ];