Update flake and fix breaking changes

This commit is contained in:
2025-10-14 10:29:28 +08:00
parent df1ae75e01
commit c1e172a194
3 changed files with 39 additions and 31 deletions

42
flake.lock generated
View File

@@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1754433428, "lastModified": 1760836749,
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758287904, "lastModified": 1760701190,
"narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -87,11 +87,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759362264, "lastModified": 1760948891,
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759853171, "lastModified": 1761584077,
"narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -242,11 +242,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1759733170, "lastModified": 1761373498,
"narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8913c168d1c56dc49a7718685968f38752171c3b", "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -266,11 +266,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1759878636, "lastModified": 1761601333,
"narHash": "sha256-yKMf+iG5KmQkMamtT8wWNFwyjSiluHyH683OcpJh/kQ=", "narHash": "sha256-ZCHa784eMt2RCJBPlbvc40wDBh8uMLuda97OeSpl6Yo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c074710027ce3047382326d1fcc1a4e174cccfcc", "rev": "416de183067b939899813ca1a612ba26a28c9ab6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -289,11 +289,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758662783, "lastModified": 1760652422,
"narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -41,6 +41,10 @@ in
jf = "jj git fetch"; jf = "jj git fetch";
jp = "jj git push"; jp = "jj git push";
}; };
programs.delta = {
enable = true;
enableGitIntegration = true;
};
programs.git = { programs.git = {
ignores = [ ignores = [
".DS_Store" ".DS_Store"
@@ -49,20 +53,25 @@ in
"**/.claude/settings.local.json" "**/.claude/settings.local.json"
]; ];
enable = true; enable = true;
userEmail = email;
userName = name;
delta.enable = true;
lfs.enable = true; lfs.enable = true;
extraConfig = lib.mkMerge [ settings = lib.mkMerge [
{ {
init.defaultBranch = "main"; init.defaultBranch = "main";
user = {
email = email;
name = name;
};
pull.rebase = true; pull = {
pull.autostash = true; rebase = true;
autostash = true;
};
rebase.autostash = true; rebase = {
rebase.autosquash = true; autostash = true;
autosquash = true;
};
push.autoSetupRemote = true; push.autoSetupRemote = true;

View File

@@ -21,7 +21,6 @@ in
default = false; default = false;
description = "Enable performance options"; description = "Enable performance options";
type = lib.types.bool; type = lib.types.bool;
}; };
}; };
@@ -264,7 +263,7 @@ in
treesitter-context.enable = true; treesitter-context.enable = true;
treesitter-textobjects = { treesitter-textobjects = {
enable = true; enable = true;
move = { settings.move = {
enable = true; enable = true;
gotoNextStart = { gotoNextStart = {
"]m" = { "]m" = {