diff --git a/flake.lock b/flake.lock index b1fe86f..953f2cb 100644 --- a/flake.lock +++ b/flake.lock @@ -151,38 +151,6 @@ } }, "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -205,11 +173,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -258,50 +226,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "small-nvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "small-nvim", - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -462,35 +386,6 @@ "type": "github" } }, - "git-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_6", - "gitignore": "gitignore_2", - "nixpkgs": [ - "small-nvim", - "neovim-nightly-overlay", - "nixpkgs" - ], - "nixpkgs-stable": [ - "small-nvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -514,29 +409,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "small-nvim", - "neovim-nightly-overlay", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -556,11 +428,11 @@ }, "hardware": { "locked": { - "lastModified": 1730161780, - "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", + "lastModified": 1730797322, + "narHash": "sha256-cH9emjYIbDYTde/CKOmU97rh7sKuyfedzPcTz4OTJkE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", + "rev": "1b0b927860d7eb367ee6a3123ddeb7a8e24bd836", "type": "github" }, "original": { @@ -589,29 +461,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": [ - "small-nvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -619,11 +468,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -714,11 +563,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1730296510, - "narHash": "sha256-ZiQPP6LE+SLKbS0UYNeDax08whSXlhZeniDzzLQGVEw=", + "lastModified": 1730499294, + "narHash": "sha256-RxV89z3TwhQT0Wue42aSPh3O7hXGbAFYHHNSnW9h6P8=", "owner": "astro", "repo": "microvm.nix", - "rev": "6ff444ef6cfd5d2effb6c4f50da2ca6f20f2677f", + "rev": "93122446d6001f9789d05e565f73bebfa3f53b50", "type": "github" }, "original": { @@ -727,48 +576,6 @@ "type": "github" } }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_4", - "git-hooks": "git-hooks_2", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": [ - "small-nvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722618800, - "narHash": "sha256-RP57a/NFk4uDnDWgTiDdJ+HteT8hTnkKz2dxd+kqL3M=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "0dfaa8c68db4cd0e7c0f500242f24932b3abdb85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1722556329, - "narHash": "sha256-biqiNshPEE3pndvrDQ2LqSe4YWi0PhHsAfhXGdoV+ic=", - "owner": "neovim", - "repo": "neovim", - "rev": "b782a37cf58b5ae5e47fd15fb2a5096639c64a23", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -800,11 +607,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1730598103, - "narHash": "sha256-o8Lb4oN8MjEUVhoFUT7vEJqSBLs0qhd9YhJzaTkJ9JY=", + "lastModified": 1730770711, + "narHash": "sha256-UHm56cW/04efHY4NgboGFOXliGQCqRRY+l1HM7c8/Ms=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "43f595b011c0f7f11807ace038abfde05c73d86b", + "rev": "0c25376479d11073346ed22de8571805543ede71", "type": "github" }, "original": { @@ -820,11 +627,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1730604744, + "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "type": "github" }, "original": { @@ -842,11 +649,11 @@ ] }, "locked": { - "lastModified": 1730252995, - "narHash": "sha256-/kFpSLC8kxSdL3rO4n38M9Fql+zovnw60X4Gpq7HnWo=", + "lastModified": 1730771180, + "narHash": "sha256-VSPWndy0ChZobMOS283g1KItO+jLfzTLNaFSN+Lixlw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "238dc7efbe88c5ae226f849b73cd809f3ffbd001", + "rev": "77da8f3bed69932db301f372119ed71c439193b7", "type": "github" }, "original": { @@ -864,11 +671,11 @@ ] }, "locked": { - "lastModified": 1730120924, - "narHash": "sha256-I6hwd+YlgefioLfmsM04MxzbEAES1N328/T+VqhcWnQ=", + "lastModified": 1730453870, + "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "b124084667fb4c912fda68fdd9d05f59e18b6ef7", + "rev": "adb6bc4b661a43328752b4575be4968a4990c033", "type": "github" }, "original": { @@ -880,11 +687,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -969,11 +776,11 @@ }, "nur": { "locked": { - "lastModified": 1730329096, - "narHash": "sha256-81OdXiIuBLqpXcwhHwJshn+eK/Ph5aYTUmLO8W3XwSo=", + "lastModified": 1730818022, + "narHash": "sha256-65XWIVBMViT6fsyEKDdIXOE98UB1rq0PHIpFKH2bZGg=", "owner": "nix-community", "repo": "NUR", - "rev": "5146513799002e9b3ecd50dd111d1f1fce61247d", + "rev": "d239d9e41525121dde6ff1a29cfad42f9681ac4c", "type": "github" }, "original": { @@ -1036,11 +843,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1730794096, - "narHash": "sha256-YZcA3XE0juPDMfEYDra8wpFlk3dNlk3tLHtD62CMBEY=", + "lastModified": 1730803590, + "narHash": "sha256-tonhq6oZealRJTG4GkNgH/1JgfaXA1pfdl3mMrGH4/o=", "owner": "xunuwu", "repo": "nvim-nix", - "rev": "b74cbd01b090707fe839bb4bbae50239f68dd52d", + "rev": "94c4aa56022ee2a27d473549347eba18aa518f1b", "type": "github" }, "original": { @@ -1064,7 +871,6 @@ "nur": "nur", "nvfetcher": "nvfetcher", "nvim-nix": "nvim-nix", - "small-nvim": "small-nvim", "sobercookie": "sobercookie", "sops-nix": "sops-nix", "stylix": "stylix", @@ -1072,26 +878,6 @@ "vpn-confinement": "vpn-confinement" } }, - "small-nvim": { - "inputs": { - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1729288975, - "narHash": "sha256-3knRNR2DPlgyM5fvs0rzaX8mznceoVYh+WbIgP5fbmc=", - "path": "/nix/store/q3ajji7ipf9zyy92mzmqc0s4xzdf5vp4-source", - "rev": "062d9c3125ea18d03e87f2dc8403ede52ddb70ce", - "type": "path" - }, - "original": { - "id": "small-nvim", - "type": "indirect" - } - }, "sobercookie": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -1120,11 +906,11 @@ ] }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1730746162, + "narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "59d6988329626132eaf107761643f55eb979eef1", "type": "github" }, "original": { @@ -1155,12 +941,12 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_6", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_3", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1269,21 +1055,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1388,11 +1159,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1730219667, - "narHash": "sha256-maoMwZlsbWiawf3kT3Y7dzMPhwktF3Cp1vrI700Icuw=", + "lastModified": 1730751859, + "narHash": "sha256-WW1AALxJC6geuxWClh12/jb3bqzeW8Vn6LtXDBMPyuk=", "owner": "Open-Wine-Components", "repo": "umu-launcher", - "rev": "10a406962c27a5a7cf05eab4ae19072cfaa4f165", + "rev": "0b98dee77729c296e2044fc748c6dcaa168363c7", "type": "github" }, "original": { @@ -1402,24 +1173,6 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "vpn-confinement": { "locked": { "lastModified": 1729977304, diff --git a/flake.nix b/flake.nix index 31e35ad..9b68c58 100644 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,6 @@ ## deduplication flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - small-nvim.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs";