diff --git a/flake.lock b/flake.lock index af96329..4120576 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1754613544, - "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", + "lastModified": 1755229570, + "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", + "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { diff --git a/modules/gitTools.nix b/modules/gitTools.nix index e473323..3632be4 100644 --- a/modules/gitTools.nix +++ b/modules/gitTools.nix @@ -21,6 +21,7 @@ in { # ''; # } # ]; + home.packages = with pkgs; [ git-crypt gh @@ -29,7 +30,25 @@ in { ]; programs = { + git = { + enable = true; + extraConfig = { + init = { + defaultBranch = lib.mkDefault "main"; + }; + pager = { + diff = lib.mkDefault "riff"; + show = lib.mkDefault "riff"; + log = lib.mkDefault "riff"; + }; + interactive = { + diffFilter = lib.mkDefault "riff --color=on"; + }; + }; + }; + git-cliff.enable = true; + gitui = { enable = true; keyConfig = lib.mkDefault '' @@ -67,22 +86,7 @@ in { ''; }; - git = { - enable = true; - extraConfig = { - init = { - defaultBranch = lib.mkDefault "main"; - }; - pager = { - diff = lib.mkDefault "riff"; - show = lib.mkDefault "riff"; - log = lib.mkDefault "riff"; - }; - interactive = { - diffFilter = lib.mkDefault "riff --color=on"; - }; - }; - }; + git-worktree-switcher.enable = true; }; }; }