diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 65d8c8bc..11b89056 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -20,7 +20,7 @@ runs: using: "composite" steps: - name: Install Nix - uses: DeterminateSystems/nix-installer-action@main + uses: DeterminateSystems/nix-installer-action@v20 with: source-url: "https://install.lix.systems/lix/lix-installer-${{ inputs.nix_system }}" extra-conf: | diff --git a/flake.lock b/flake.lock index 2f10d18d..6ffe9742 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "nixpkgs": [ "tilde-secrets", "tilde", @@ -12,7 +12,7 @@ "tilde", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1726069220, @@ -468,7 +468,7 @@ }, "devshell_2": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_11", "nixpkgs": [ "tilde-secrets", "tilde", @@ -494,7 +494,7 @@ }, "devshell_3": { "inputs": { - "flake-utils": "flake-utils_23", + "flake-utils": "flake-utils_21", "nixpkgs": [ "tilde-secrets", "tilde", @@ -520,6 +520,27 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1761729218, + "narHash": "sha256-TzxCjY5CfqpRUEl8670vL0zMu6xjL5jaotwXr612+eY=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "287821df7a311478722ad9f29f00b82b54568508", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -577,11 +598,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -817,11 +838,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -831,31 +852,6 @@ } }, "flake-parts_10": { - "inputs": { - "nixpkgs-lib": [ - "tilde-secrets", - "tilde", - "tilde-secrets", - "tilde", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_11": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_6" }, @@ -873,7 +869,7 @@ "type": "github" } }, - "flake-parts_12": { + "flake-parts_11": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_7" }, @@ -891,7 +887,7 @@ "type": "github" } }, - "flake-parts_13": { + "flake-parts_12": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_8" }, @@ -909,7 +905,7 @@ "type": "github" } }, - "flake-parts_14": { + "flake-parts_13": { "inputs": { "nixpkgs-lib": [ "tilde-secrets", @@ -936,7 +932,7 @@ "type": "github" } }, - "flake-parts_15": { + "flake-parts_14": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_9" }, @@ -954,7 +950,7 @@ "type": "github" } }, - "flake-parts_16": { + "flake-parts_15": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_10" }, @@ -972,7 +968,7 @@ "type": "github" } }, - "flake-parts_17": { + "flake-parts_16": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_11" }, @@ -991,27 +987,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -1029,7 +1004,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -1047,7 +1022,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "tilde-secrets", @@ -1070,7 +1045,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -1088,7 +1063,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "tilde-secrets", @@ -1113,7 +1088,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "tilde-secrets", @@ -1139,7 +1114,7 @@ "type": "github" } }, - "flake-parts_9": { + "flake-parts_8": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_5" }, @@ -1157,6 +1132,31 @@ "type": "github" } }, + "flake-parts_9": { + "inputs": { + "nixpkgs-lib": [ + "tilde-secrets", + "tilde", + "tilde-secrets", + "tilde", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-root": { "locked": { "lastModified": 1723604017, @@ -1251,38 +1251,8 @@ } }, "flake-utils_10": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { "inputs": { - "systems": "systems_7" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -1298,9 +1268,9 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_11": { "inputs": { - "systems": "systems_8" + "systems": "systems_5" }, "locked": { "lastModified": 1701680307, @@ -1316,9 +1286,9 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_12": { "inputs": { - "systems": "systems_9" + "systems": "systems_6" }, "locked": { "lastModified": 1689068808, @@ -1334,9 +1304,9 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_13": { "inputs": { - "systems": "systems_10" + "systems": "systems_7" }, "locked": { "lastModified": 1701680307, @@ -1352,9 +1322,9 @@ "type": "github" } }, - "flake-utils_16": { + "flake-utils_14": { "inputs": { - "systems": "systems_11" + "systems": "systems_8" }, "locked": { "lastModified": 1701680307, @@ -1370,7 +1340,7 @@ "type": "github" } }, - "flake-utils_17": { + "flake-utils_15": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -1385,7 +1355,7 @@ "type": "github" } }, - "flake-utils_18": { + "flake-utils_16": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -1400,7 +1370,7 @@ "type": "github" } }, - "flake-utils_19": { + "flake-utils_17": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -1415,16 +1385,13 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, + "flake-utils_18": { "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -1433,7 +1400,7 @@ "type": "github" } }, - "flake-utils_20": { + "flake-utils_19": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -1448,13 +1415,16 @@ "type": "github" } }, - "flake-utils_21": { + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1463,9 +1433,9 @@ "type": "github" } }, - "flake-utils_22": { + "flake-utils_20": { "inputs": { - "systems": "systems_12" + "systems": "systems_9" }, "locked": { "lastModified": 1701680307, @@ -1481,9 +1451,9 @@ "type": "github" } }, - "flake-utils_23": { + "flake-utils_21": { "inputs": { - "systems": "systems_13" + "systems": "systems_10" }, "locked": { "lastModified": 1701680307, @@ -1499,9 +1469,9 @@ "type": "github" } }, - "flake-utils_24": { + "flake-utils_22": { "inputs": { - "systems": "systems_14" + "systems": "systems_11" }, "locked": { "lastModified": 1685518550, @@ -1517,9 +1487,9 @@ "type": "github" } }, - "flake-utils_25": { + "flake-utils_23": { "inputs": { - "systems": "systems_15" + "systems": "systems_12" }, "locked": { "lastModified": 1701680307, @@ -1535,9 +1505,9 @@ "type": "github" } }, - "flake-utils_26": { + "flake-utils_24": { "inputs": { - "systems": "systems_16" + "systems": "systems_13" }, "locked": { "lastModified": 1685518550, @@ -1553,9 +1523,9 @@ "type": "github" } }, - "flake-utils_27": { + "flake-utils_25": { "inputs": { - "systems": "systems_17" + "systems": "systems_14" }, "locked": { "lastModified": 1701680307, @@ -1573,14 +1543,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -1590,15 +1560,12 @@ } }, "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -1608,15 +1575,12 @@ } }, "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -1627,11 +1591,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -2053,11 +2017,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -2220,34 +2184,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.8", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "tilde-secrets", @@ -2314,27 +2250,6 @@ "mise": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753964512, - "narHash": "sha256-fihm9LF2K/lKfsOI6IF+FhE1b+nw4wkHvGcDRqWoRr4=", - "owner": "jdx", - "repo": "mise", - "rev": "637c9c997bf6de39a4a70230af8d71d9fd7b1d46", - "type": "github" - }, - "original": { - "owner": "jdx", - "repo": "mise", - "type": "github" - } - }, - "mise_2": { - "inputs": { - "flake-utils": "flake-utils_3", "nixpkgs": [ "tilde-secrets", "tilde", @@ -2394,11 +2309,11 @@ ] }, "locked": { - "lastModified": 1749744770, - "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", + "lastModified": 1759509947, + "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", + "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", "type": "github" }, "original": { @@ -2670,7 +2585,7 @@ "devenv", "flake-compat" ], - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_7", "libgit2": "libgit2", "nixpkgs": "nixpkgs_4", "nixpkgs-23-11": "nixpkgs-23-11", @@ -2788,7 +2703,7 @@ }, "nixago": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_5", "nixago-exts": "nixago-exts", "nixpkgs": [ "tilde-secrets", @@ -2814,7 +2729,7 @@ }, "nixago-exts": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_6", "nixago": "nixago_2", "nixpkgs": [ "tilde-secrets", @@ -2841,7 +2756,7 @@ }, "nixago-exts_2": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_8", "nixago": "nixago_3", "nixpkgs": [ "tilde-secrets", @@ -2870,7 +2785,7 @@ }, "nixago-exts_3": { "inputs": { - "flake-utils": "flake-utils_18", + "flake-utils": "flake-utils_16", "nixago": "nixago_5", "nixpkgs": [ "tilde-secrets", @@ -2899,7 +2814,7 @@ }, "nixago-exts_4": { "inputs": { - "flake-utils": "flake-utils_20", + "flake-utils": "flake-utils_18", "nixago": "nixago_6", "nixpkgs": [ "tilde-secrets", @@ -2930,7 +2845,7 @@ }, "nixago_2": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_7", "nixago-exts": "nixago-exts_2", "nixpkgs": [ "tilde-secrets", @@ -2959,7 +2874,7 @@ }, "nixago_3": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_9", "nixpkgs": [ "tilde-secrets", "tilde", @@ -2988,7 +2903,7 @@ }, "nixago_4": { "inputs": { - "flake-utils": "flake-utils_17", + "flake-utils": "flake-utils_15", "nixago-exts": "nixago-exts_3", "nixpkgs": [ "tilde-secrets", @@ -3016,7 +2931,7 @@ }, "nixago_5": { "inputs": { - "flake-utils": "flake-utils_19", + "flake-utils": "flake-utils_17", "nixago-exts": "nixago-exts_4", "nixpkgs": [ "tilde-secrets", @@ -3047,7 +2962,7 @@ }, "nixago_6": { "inputs": { - "flake-utils": "flake-utils_21", + "flake-utils": "flake-utils_19", "nixpkgs": [ "tilde-secrets", "tilde", @@ -3078,11 +2993,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753890752, - "narHash": "sha256-jfErtMwq1/G9zu5DMmuTmNZ2i6PHL1/sbpGYnAkTSY8=", + "lastModified": 1761430225, + "narHash": "sha256-rwI/YwAAByROAXkGbQNsxgUl/UM5eG5N6XIUzBKOIOw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b9ee79241b0318c348c64de9ae0f899be03dba46", + "rev": "08478b816182dc3cc208210b996294411690111d", "type": "github" }, "original": { @@ -3110,11 +3025,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -3296,11 +3211,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1757339658, - "narHash": "sha256-Qq7ZS1kd+i230JalWBpT/g2iJ7X0Q8EIxqlIsNIWlj8=", + "lastModified": 1761708678, + "narHash": "sha256-eOxAQyKJwVF+00fZLDZcSlQXC344oUsstGich7oxWQ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5fe2346e04cd5caf125872bcd7d0c34b7689c99e", + "rev": "eb06ec9ff76df473a142c05c782f0e7c1262e31a", "type": "github" }, "original": { @@ -3406,6 +3321,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1724316499, "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", @@ -3421,7 +3352,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -3437,7 +3368,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1704874635, "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", @@ -3453,7 +3384,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_5": { "locked": { "lastModified": 1704874635, "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", @@ -3469,7 +3400,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_6": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -3485,7 +3416,7 @@ "type": "github" } }, - "nixpkgs-stable_6": { + "nixpkgs-stable_7": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -3631,36 +3562,13 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1753878247, - "narHash": "sha256-nxwVcC0ptpXenOWAyXTkYysbWAJPBIu2Mgp4XiFOfm4=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "1729fe160872c9e53bd6977d92f53ef131606d4e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nixvim_2": { - "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "nixpkgs": [ "tilde-secrets", "tilde", "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch_2" + "nuschtosSearch": "nuschtosSearch" }, "locked": { "lastModified": 1745746098, @@ -3676,11 +3584,11 @@ "type": "github" } }, - "nixvim_3": { + "nixvim_2": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_7", - "flake-parts": "flake-parts_10", + "flake-parts": "flake-parts_9", "git-hooks": "git-hooks", "home-manager": "home-manager_4", "nix-darwin": "nix-darwin_4", @@ -3691,7 +3599,7 @@ "tilde", "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch_3", + "nuschtosSearch": "nuschtosSearch_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -3708,9 +3616,9 @@ "type": "github" } }, - "nixvim_4": { + "nixvim_3": { "inputs": { - "flake-parts": "flake-parts_14", + "flake-parts": "flake-parts_13", "home-manager": "home-manager_6", "nix-darwin": "nix-darwin_6", "nixpkgs": [ @@ -3738,9 +3646,9 @@ "type": "github" } }, - "nixvim_5": { + "nixvim_4": { "inputs": { - "flake-utils": "flake-utils_25", + "flake-utils": "flake-utils_23", "nixpkgs": [ "tilde-secrets", "tilde", @@ -3772,29 +3680,6 @@ "inputs": { "flake-utils": "flake-utils_2", "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753450833, - "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", - "owner": "NuschtOS", - "repo": "search", - "rev": "40987cc1a24feba378438d691f87c52819f7bd75", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nuschtosSearch_2": { - "inputs": { - "flake-utils": "flake-utils_4", - "ixx": "ixx_2", "nixpkgs": [ "tilde-secrets", "tilde", @@ -3816,9 +3701,9 @@ "type": "github" } }, - "nuschtosSearch_3": { + "nuschtosSearch_2": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_10", "nixpkgs": [ "tilde-secrets", "tilde", @@ -3844,7 +3729,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "tilde-secrets", @@ -3875,7 +3760,7 @@ }, "poetry2nix_2": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_12", "nix-github-actions": "nix-github-actions_2", "nixpkgs": [ "tilde-secrets", @@ -3906,7 +3791,7 @@ }, "pragmatapro": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] @@ -3927,7 +3812,7 @@ }, "pragmatapro_2": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "nixpkgs": [ "tilde-secrets", "tilde", @@ -3950,7 +3835,7 @@ }, "pragmatapro_3": { "inputs": { - "flake-parts": "flake-parts_11", + "flake-parts": "flake-parts_10", "nixpkgs": [ "tilde-secrets", "tilde", @@ -3975,7 +3860,7 @@ }, "pragmatapro_4": { "inputs": { - "flake-parts": "flake-parts_15", + "flake-parts": "flake-parts_14", "nixpkgs": [ "tilde-secrets", "tilde", @@ -4002,7 +3887,7 @@ }, "pragmatapro_5": { "inputs": { - "flake-utils": "flake-utils_27", + "flake-utils": "flake-utils_25", "nixpkgs": [ "tilde-secrets", "tilde", @@ -4039,7 +3924,7 @@ "devenv", "nix" ], - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "gitignore": [ "tilde-secrets", "tilde", @@ -4100,7 +3985,7 @@ "devenv", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1725513492, @@ -4119,7 +4004,7 @@ "pre-commit-hooks_3": { "inputs": { "flake-compat": "flake-compat_10", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_13", "gitignore": "gitignore_3", "nixpkgs": [ "tilde-secrets", @@ -4132,7 +4017,7 @@ "cachix", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1708018599, @@ -4160,7 +4045,7 @@ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_14", "gitignore": "gitignore_4", "nixpkgs": [ "tilde-secrets", @@ -4172,7 +4057,7 @@ "devenv", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { "lastModified": 1708018599, @@ -4191,7 +4076,7 @@ "pre-commit-hooks_5": { "inputs": { "flake-compat": "flake-compat_13", - "flake-utils": "flake-utils_22", + "flake-utils": "flake-utils_20", "gitignore": "gitignore_5", "nixpkgs": [ "tilde-secrets", @@ -4242,7 +4127,7 @@ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_24", + "flake-utils": "flake-utils_22", "gitignore": "gitignore_6", "nixpkgs": [ "tilde-secrets", @@ -4256,7 +4141,7 @@ "devenv", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_6" }, "locked": { "lastModified": 1688056373, @@ -4275,7 +4160,7 @@ "pre-commit-hooks_7": { "inputs": { "flake-compat": "flake-compat_15", - "flake-utils": "flake-utils_26", + "flake-utils": "flake-utils_24", "gitignore": "gitignore_7", "nixpkgs": [ "tilde-secrets", @@ -4289,7 +4174,7 @@ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_6" + "nixpkgs-stable": "nixpkgs-stable_7" }, "locked": { "lastModified": 1703426812, @@ -4310,7 +4195,7 @@ "crane": "crane_2", "devshell": "devshell_2", "fenix": "fenix", - "flake-parts": "flake-parts_12", + "flake-parts": "flake-parts_11", "nixpkgs": [ "tilde-secrets", "tilde", @@ -4338,7 +4223,7 @@ "crane": "crane_3", "devshell": "devshell_3", "fenix": "fenix_2", - "flake-parts": "flake-parts_16", + "flake-parts": "flake-parts_15", "nixpkgs": [ "tilde-secrets", "tilde", @@ -4365,16 +4250,15 @@ }, "root": { "inputs": { + "emacs-overlay": "emacs-overlay", "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-root": "flake-root", "haumea": "haumea", "home-manager": "home-manager", - "mise": "mise", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", - "nixvim": "nixvim", "pragmatapro": "pragmatapro", "tilde-secrets": "tilde-secrets", "treefmt": "treefmt_5" @@ -4504,51 +4388,6 @@ "type": "github" } }, - "systems_15": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_16": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_17": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -4672,14 +4511,14 @@ "tilde": { "inputs": { "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "flake-root": "flake-root_2", "haumea": "haumea_2", "home-manager": "home-manager_2", - "mise": "mise_2", + "mise": "mise", "nix-darwin": "nix-darwin_2", "nixpkgs": "nixpkgs_2", - "nixvim": "nixvim_2", + "nixvim": "nixvim", "pragmatapro": "pragmatapro_2", "tilde-secrets": "tilde-secrets_2", "treefmt": "treefmt_4" @@ -4929,14 +4768,14 @@ "attic": "attic", "devenv": "devenv", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_9", + "flake-parts": "flake-parts_8", "flake-root": "flake-root_3", "haumea": "haumea_3", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin_3", "nixago": "nixago", "nixpkgs": "nixpkgs_6", - "nixvim": "nixvim_3", + "nixvim": "nixvim_2", "pragmatapro": "pragmatapro_3", "rippkgs": "rippkgs", "tilde-secrets": "tilde-secrets_3", @@ -4959,14 +4798,14 @@ "tilde_3": { "inputs": { "devenv": "devenv_4", - "flake-parts": "flake-parts_13", + "flake-parts": "flake-parts_12", "flake-root": "flake-root_4", "haumea": "haumea_4", "home-manager": "home-manager_5", "nix-darwin": "nix-darwin_5", "nixago": "nixago_4", "nixpkgs": "nixpkgs_8", - "nixvim": "nixvim_4", + "nixvim": "nixvim_3", "pragmatapro": "pragmatapro_4", "rippkgs": "rippkgs_2", "tilde-secrets": "tilde-secrets_4", @@ -4989,13 +4828,13 @@ "tilde_4": { "inputs": { "devenv": "devenv_6", - "flake-parts": "flake-parts_17", + "flake-parts": "flake-parts_16", "flake-root": "flake-root_5", "haumea": "haumea_5", "home-manager": "home-manager_7", "nix-darwin": "nix-darwin_7", "nixpkgs": "nixpkgs_9", - "nixvim": "nixvim_5", + "nixvim": "nixvim_4", "pragmatapro": "pragmatapro_5", "treefmt": "treefmt" }, @@ -5145,11 +4984,11 @@ ] }, "locked": { - "lastModified": 1753772294, - "narHash": "sha256-8rkd13WfClfZUBIYpX5dvG3O9V9w3K9FPQ9rY14VtBE=", + "lastModified": 1761311587, + "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6b9214fffbcf3f1e608efa15044431651635ca83", + "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 58c61bcb..867603aa 100644 --- a/flake.nix +++ b/flake.nix @@ -43,15 +43,12 @@ tilde-secrets.url = "git+ssh://git@github.com/ethnt/tilde-secrets"; # tilde-secrets.url = "git+file:///Users/et/Workspace/personal/tilde-secrets"; + emacs-overlay.url = "github:nix-community/emacs-overlay"; + emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; + pragmatapro.url = "git+ssh://git@github.com/ethnt/pragmatapro"; pragmatapro.inputs.nixpkgs.follows = "nixpkgs"; - nixvim.url = "github:nix-community/nixvim"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; - - mise.url = "github:jdx/mise"; - mise.inputs.nixpkgs.follows = "nixpkgs"; - flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; }; @@ -90,6 +87,7 @@ overlays = with inputs; [ self.overlays.default pragmatapro.overlays.default + emacs-overlay.overlays.default ]; config.allowUnfree = true; diff --git a/lib/src/hm.nix b/lib/src/hm.nix index f2a7d83b..d759a685 100644 --- a/lib/src/hm.nix +++ b/lib/src/hm.nix @@ -5,8 +5,7 @@ let l = inputs.nixpkgs.lib // builtins; - sharedModules = (l.attrValues flake.homeModules) - ++ [ inputs.nixvim.homeManagerModules.nixvim ]; + sharedModules = l.attrValues flake.homeModules; extraSpecialArgs = { inherit flake inputs secrets; diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix index f9f80e8d..59a1d2dd 100644 --- a/modules/overlays/default.nix +++ b/modules/overlays/default.nix @@ -8,6 +8,9 @@ config.allowUnfree = true; }; - in { inherit (nixpkgs-master) claude-code; }; + in { + inherit (nixpkgs-master) claude-code; + nixpkgs-master-darwin-linux-builder = nixpkgs-master.darwin.linux-builder; + }; }; } diff --git a/modules/profiles/home/emacs.nix b/modules/profiles/home/emacs.nix new file mode 100644 index 00000000..cf98d73a --- /dev/null +++ b/modules/profiles/home/emacs.nix @@ -0,0 +1,40 @@ +{ pkgs, ... }: +let + configuredEmacs = pkgs.emacs.override { + withNativeCompilation = true; + withTreeSitter = true; + }; + patchedEmacs = configuredEmacs.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + (pkgs.fetchpatch { + url = + "https://github.com/d12frosted/homebrew-emacs-plus/raw/refs/heads/master/patches/emacs-30/system-appearance.patch"; + sha256 = "3QLq91AQ6E921/W9nfDjdOUWR8YVsqBAT/W9c1woqAw="; + }) + (pkgs.fetchpatch { + url = + "https://github.com/d12frosted/homebrew-emacs-plus/raw/refs/heads/master/patches/emacs-30/round-undecorated-frame.patch"; + sha256 = "uYIxNTyfbprx5mCqMNFVrBcLeo+8e21qmBE3lpcnd+4="; + }) + (pkgs.fetchpatch { + url = + "https://github.com/d12frosted/homebrew-emacs-plus/raw/refs/heads/master/patches/emacs-28/fix-window-role.patch"; + sha256 = "+z/KfsBm1lvZTZNiMbxzXQGRTjkCFO4QPlEK35upjsE="; + }) + ]; + }); +in { + programs.emacs = { + enable = true; + package = patchedEmacs; + }; + + home.packages = with pkgs; [ + emacs-all-the-icons-fonts + coreutils + fd + fontconfig + shellcheck + clang + ]; +} diff --git a/modules/profiles/home/helix.nix b/modules/profiles/home/helix.nix index 41254759..04e4b94c 100644 --- a/modules/profiles/home/helix.nix +++ b/modules/profiles/home/helix.nix @@ -1 +1,6 @@ -{ programs.helix.enable = true; } +{ + programs.helix = { + enable = true; + settings = { theme = "nord"; }; + }; +} diff --git a/modules/profiles/home/mise.nix b/modules/profiles/home/mise.nix index a4d491f3..0ce96c41 100644 --- a/modules/profiles/home/mise.nix +++ b/modules/profiles/home/mise.nix @@ -1,8 +1,8 @@ -{ pkgs, inputs, ... }: { +{ pkgs, ... }: { programs.mise = { enable = true; enableFishIntegration = true; - package = inputs.mise.packages.${pkgs.system}.default; + package = pkgs.mise; settings = { asdf_compat = true; legacy_version_file = true; diff --git a/modules/profiles/home/neovim.nix b/modules/profiles/home/neovim.nix deleted file mode 100644 index 6434d982..00000000 --- a/modules/profiles/home/neovim.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, pkgs, ... }: { - programs.nixvim = { - enable = true; - - extraConfigVim = '' - set number - set sts=2 - set ts=2 - set sw=2 - set expandtab - set mouse=nv - - " Ctrl + p to open file picker - map :GFiles - - " Yank to system clipboard - vnoremap y "+y - - set ignorecase - set smartcase - set incsearch - ''; - - plugins = { - commentary.enable = true; - lightline.enable = true; - nix.enable = true; - vim-surround.enable = true; - }; - - extraPlugins = with pkgs.vimPlugins; [ fzf-vim ]; - }; - - home.sessionVariables.EDITOR = pkgs.lib.getExe config.programs.helix.package; -} diff --git a/modules/profiles/home/nodejs.nix b/modules/profiles/home/nodejs.nix index ef2fca6c..d02344a9 100644 --- a/modules/profiles/home/nodejs.nix +++ b/modules/profiles/home/nodejs.nix @@ -1,3 +1 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ corepack nodePackages_latest.nodejs ]; -} +{ pkgs, ... }: { home.packages = with pkgs; [ corepack nodejs_24 ]; } diff --git a/modules/profiles/system/builders/darwin-linux.nix b/modules/profiles/system/builders/darwin-linux.nix index ac876abc..b4a703a1 100644 --- a/modules/profiles/system/builders/darwin-linux.nix +++ b/modules/profiles/system/builders/darwin-linux.nix @@ -1 +1,6 @@ -{ nix.linux-builder.enable = true; } +{ pkgs, ... }: { + nix.linux-builder = { + enable = true; + package = pkgs.nixpkgs-master-darwin-linux-builder; + }; +} diff --git a/modules/profiles/system/darwin/brew.nix b/modules/profiles/system/darwin/brew.nix index e60b4e5d..f1fee4b7 100644 --- a/modules/profiles/system/darwin/brew.nix +++ b/modules/profiles/system/darwin/brew.nix @@ -13,6 +13,7 @@ "arc" "cleanshot" "dash" + "docker-desktop" "elgato-stream-deck" "ghostty" "fantastical" diff --git a/modules/suites/home.nix b/modules/suites/home.nix index a4bb3965..c4cd56bb 100644 --- a/modules/suites/home.nix +++ b/modules/suites/home.nix @@ -8,6 +8,7 @@ with profiles; autojump bat direnv + emacs fish fzf ghostty @@ -23,12 +24,11 @@ with profiles; zellij ]; - development = [ git.common gh gh-dash vscode neovim ]; + development = [ git.common gh gh-dash vscode ]; identity = [ gnupg.default ]; work = [ git.large-repos mise ]; - minimal = - [ autojump bat fish fzf git.common gh navi neovim starship tools.common ]; + minimal = [ autojump bat fish fzf git.common gh navi starship tools.common ]; }