From 3c758d53462fe522ee0b05086f9770fc41ddc4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20D=C3=B6nszelmann?= Date: Sun, 9 Feb 2025 13:34:47 +0100 Subject: [PATCH] lix/cachix --- flake.lock | 1518 ++++++++++++++---------------------- flake.nix | 30 +- hosts/kili/home.nix | 5 +- programs/fish/default.nix | 4 + programs/git/default.nix | 2 +- programs/kitty/default.nix | 96 +-- programs/nvim/default.nix | 39 +- programs/nvim/plugins.nix | 78 +- 8 files changed, 732 insertions(+), 1040 deletions(-) diff --git a/flake.lock b/flake.lock index 859c596..845d9df 100644 --- a/flake.lock +++ b/flake.lock @@ -1,203 +1,165 @@ { "nodes": { - "cachix": { + "agenix": { "inputs": { - "devenv": [ - "noteslsp", - "crate2nix" - ], - "flake-compat": [ - "noteslsp", - "crate2nix" - ], - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": [ - "noteslsp", - "crate2nix" - ] - }, - "locked": { - "lastModified": 1709700175, - "narHash": "sha256-A0/6ZjLmT9qdYzKHmevnEIC7G+GiZ4UCr8v0poRPzds=", - "owner": "cachix", - "repo": "cachix", - "rev": "be97b37989f11b724197b5f4c7ffd78f12c8c4bf", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": [ - "noteslsp", - "crate2nix", - "crate2nix_stable" - ], - "flake-compat": [ - "noteslsp", - "crate2nix", - "crate2nix_stable" - ], - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks": [ - "noteslsp", - "crate2nix", - "crate2nix_stable" - ] - }, - "locked": { - "lastModified": 1716549461, - "narHash": "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4=", - "owner": "cachix", - "repo": "cachix", - "rev": "e2bb269fb8c0828d5d4d2d7b8d09ea85abcacbd4", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "cachix_3": { - "inputs": { - "devenv": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable" - ], - "flake-compat": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable" - ], - "nixpkgs": "nixpkgs_5", - "pre-commit-hooks": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable" - ] - }, - "locked": { - "lastModified": 1716549461, - "narHash": "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4=", - "owner": "cachix", - "repo": "cachix", - "rev": "e2bb269fb8c0828d5d4d2d7b8d09ea85abcacbd4", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "crate2nix": { - "inputs": { - "cachix": "cachix", - "crate2nix_stable": "crate2nix_stable", - "devshell": "devshell_4", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_4", - "nix-test-runner": "nix-test-runner_3", + "darwin": "darwin", + "home-manager": "home-manager_4", "nixpkgs": [ - "noteslsp", + "p1n3appl3", + "ragenix", "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_3" + "systems": "systems_7" }, "locked": { - "lastModified": 1734429562, - "narHash": "sha256-V2XNs3Ir8WXNHdocfzkR/fu0FzkZ9uTDJkVecxJrGmQ=", - "owner": "nix-community", - "repo": "crate2nix", - "rev": "8537c2d7cb623679aaeff62c4c4c43a91566ab09", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "owner": "ryantm", + "repo": "agenix", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "crate2nix", + "owner": "ryantm", + "repo": "agenix", "type": "github" } }, - "crate2nix_stable": { + "agenix_2": { "inputs": { - "cachix": "cachix_2", - "crate2nix_stable": "crate2nix_stable_2", - "devshell": "devshell_3", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_3", - "nix-test-runner": "nix-test-runner_2", - "nixpkgs": "nixpkgs_7", - "pre-commit-hooks": "pre-commit-hooks_2" + "darwin": [ + "rahul-config", + "darwin" + ], + "home-manager": [ + "rahul-config", + "home-manager" + ], + "nixpkgs": [ + "rahul-config", + "nixpkgs" + ], + "systems": [ + "rahul-config", + "flake-utils", + "systems" + ] }, "locked": { - "lastModified": 1719760004, - "narHash": "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE=", - "owner": "nix-community", - "repo": "crate2nix", - "rev": "1dee214bb20855fa3e1e7bb98d28922ddaff8c57", + "lastModified": 1720546205, + "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "owner": "ryantm", + "repo": "agenix", + "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "0.14.1", - "repo": "crate2nix", + "owner": "ryantm", + "repo": "agenix", "type": "github" } }, - "crate2nix_stable_2": { + "catppuccin": { "inputs": { - "cachix": "cachix_3", - "crate2nix_stable": "crate2nix_stable_3", - "devshell": "devshell_2", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", - "nix-test-runner": "nix-test-runner", - "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks" + "nixpkgs": [ + "p1n3appl3", + "nixpkgs" + ] }, "locked": { - "lastModified": 1712821484, - "narHash": "sha256-rGT3CW64cJS9nlnWPFWSc1iEa3dNZecVVuPVGzcsHe8=", - "owner": "nix-community", - "repo": "crate2nix", - "rev": "42883afcad3823fa5811e967fb7bff54bc3c9d6d", + "lastModified": 1737579274, + "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", + "owner": "catppuccin", + "repo": "nix", + "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "0.14.0", - "repo": "crate2nix", + "owner": "catppuccin", + "repo": "nix", "type": "github" } }, - "crate2nix_stable_3": { - "inputs": { - "flake-utils": "flake-utils_6" - }, + "crane": { "locked": { - "lastModified": 1702842982, - "narHash": "sha256-A9AowkHIjsy1a4LuiPiVP88FMxyCWK41flZEZOUuwQM=", - "owner": "nix-community", - "repo": "crate2nix", - "rev": "75ac2973affa6b9b4f661a7b592cba6e4f51d426", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "0.12.0", - "repo": "crate2nix", + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "rahul-config", + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708794349, + "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "p1n3appl3", + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "darwin_2": { + "inputs": { + "nixpkgs": [ + "rahul-config", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722082646, + "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", "type": "github" } }, @@ -209,83 +171,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { - "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", - "owner": "numtide", - "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_3": { - "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", - "owner": "numtide", - "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_4": { - "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": [ - "noteslsp", - "crate2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", - "owner": "numtide", - "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -314,71 +204,13 @@ } }, "flake-compat": { - "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_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_4": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_5": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -393,80 +225,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "noteslsp", - "crate2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -493,60 +256,6 @@ "type": "github" } }, - "flake-utils_10": { - "inputs": { - "systems": "systems_10" - }, - "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" - } - }, - "flake-utils_11": { - "inputs": { - "systems": "systems_11" - }, - "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" - } - }, - "flake-utils_12": { - "inputs": { - "systems": "systems_12" - }, - "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" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_2" @@ -570,11 +279,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -621,14 +330,14 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_8" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -638,51 +347,15 @@ } }, "flake-utils_7": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { "inputs": { "systems": "systems_9" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -691,31 +364,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": [ - "nixpkgs" - ], - "nixpkgs-unstable": [ - "nixpkgs" - ], - "zig": "zig" - }, - "locked": { - "lastModified": 1735271978, - "narHash": "sha256-y6Ony5eq4F4E76Y2ZhALSEzBZ4GbGRVQIEScPieCDGI=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "a8e5eef11cc67f87f445626f9ca2993373774bf8", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -726,18 +374,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -768,78 +412,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable", - "pre-commit-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" - } - }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "pre-commit-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" - } - }, - "gitignore_4": { - "inputs": { - "nixpkgs": [ - "noteslsp", - "crate2nix", - "pre-commit-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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -847,15 +419,16 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -868,11 +441,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -881,6 +454,88 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "p1n3appl3", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738789832, + "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { + "inputs": { + "nixpkgs": [ + "p1n3appl3", + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_5": { + "inputs": { + "nixpkgs": [ + "rahul-config", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722203588, + "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "792757f643cedc13f02098d8ed506d82e19ec1da", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, + "impermanence": { + "locked": { + "lastModified": 1675359654, + "narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=", + "owner": "nix-community", + "repo": "impermanence", + "rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "impermanence", + "rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -911,18 +566,18 @@ }, "jujutsu": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733881065, - "narHash": "sha256-RBr3jfh8dtDKeYLmJYZvNj2U2jiA1AY1jx4GbQDNOU0=", + "lastModified": 1739043245, + "narHash": "sha256-WmlACEj2OB7XpBYEyvUZiEcSoCXLtRVqJ2UYLBtICGw=", "owner": "martinvonz", "repo": "jj", - "rev": "e1936a2e8bc22218e3a5729fed89b8cc5c5cbb83", + "rev": "07c63ed182bb1cbd9b52fe8e4f41638bdb5aafb6", "type": "github" }, "original": { @@ -955,11 +610,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -968,51 +623,102 @@ "type": "github" } }, - "nix-test-runner": { - "flake": false, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "p1n3appl3", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1588761593, - "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=", - "owner": "stoeffel", - "repo": "nix-test-runner", - "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2", + "lastModified": 1738466368, + "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52", "type": "github" }, "original": { - "owner": "stoeffel", - "repo": "nix-test-runner", + "owner": "Mic92", + "repo": "nix-index-database", "type": "github" } }, - "nix-test-runner_2": { - "flake": false, + "nix-index-database_2": { + "inputs": { + "nixpkgs": [ + "rahul-config", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1588761593, - "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=", - "owner": "stoeffel", - "repo": "nix-test-runner", - "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2", + "lastModified": 1722136042, + "narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "c0ca47e8523b578464014961059999d8eddd4aae", "type": "github" }, "original": { - "owner": "stoeffel", - "repo": "nix-test-runner", + "owner": "Mic92", + "ref": "main", + "repo": "nix-index-database", "type": "github" } }, - "nix-test-runner_3": { - "flake": false, + "nixgl": { + "inputs": { + "flake-utils": [ + "p1n3appl3", + "flake-utils" + ], + "nixpkgs": [ + "p1n3appl3", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1588761593, - "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=", - "owner": "stoeffel", - "repo": "nix-test-runner", - "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2", + "lastModified": 1713543440, + "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", + "owner": "guibou", + "repo": "nixGL", + "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", "type": "github" }, "original": { - "owner": "stoeffel", - "repo": "nix-test-runner", + "owner": "guibou", + "repo": "nixGL", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixos-hardware_2": { + "locked": { + "lastModified": 1662587984, + "narHash": "sha256-fcfx8hEeAfQLzIQFy94/qADIHAhvDxk8t/QNJPXosy8=", + "owner": "rrbutani", + "repo": "nixos-hardware", + "rev": "0ac5732b0e4c8ca8287c3451f272c3c4b1bea8b0", + "type": "github" + }, + "original": { + "owner": "rrbutani", + "ref": "master", + "repo": "nixos-hardware", "type": "github" } }, @@ -1032,7 +738,71 @@ "type": "github" } }, - "nixpkgs_10": { + "nixpkgs-stable": { + "locked": { + "lastModified": 1738702386, + "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1739101192, + "narHash": "sha256-KFt/4jHEm2sMe2febmnTYrq91G7IV4sVlXVNiPiU8k4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a35866ed8d4e6512c64918324ba3af38219b67a9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1710377395, "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", @@ -1046,132 +816,10 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", - "path": "/nix/store/4p0avw1s3vf27hspgqsrqs37gxk4i83i-source", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", - "path": "/nix/store/4p0avw1s3vf27hspgqsrqs37gxk4i83i-source", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -1183,11 +831,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733847310, - "narHash": "sha256-VHzWuZYK/m5OFXzAczrjnI7vH6knj0sfLnziRVDqgFE=", + "lastModified": 1738966895, + "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", "owner": "nix-community", "repo": "nixvim", - "rev": "b752606681ded3f69e99ed568c7075b3578dce48", + "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", "type": "github" }, "original": { @@ -1196,30 +844,9 @@ "type": "github" } }, - "noteslsp": { - "inputs": { - "crate2nix": "crate2nix", - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1735730799, - "narHash": "sha256-J4lMtpvImga9iud/c4yNpc7fd9Vo2N+4Uxp0B7nZ9cU=", - "ref": "refs/heads/main", - "rev": "5956888aa5c899f107e89aa349d26a005a267a62", - "revCount": 54, - "type": "git", - "url": "ssh://git@github.com/jdonszelmann/notes" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/jdonszelmann/notes" - } - }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1227,11 +854,11 @@ ] }, "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -1240,112 +867,142 @@ "type": "github" } }, - "pre-commit-hooks": { + "obs-gamepad": { "inputs": { - "flake-compat": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable", - "flake-compat" - ], - "gitignore": "gitignore_2", "nixpkgs": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable", + "p1n3appl3", "nixpkgs" ], - "nixpkgs-stable": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "crate2nix_stable", - "nixpkgs" - ] + "utils": "utils" }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "lastModified": 1731441000, + "narHash": "sha256-P0u/UAS1OqKJfzbWMf1vDHKcld0LE2kEU04ENvCCk6k=", + "owner": "p1n3appl3", + "repo": "obs-gamepad", + "rev": "fe326f233c03cfb7f55938b3ad4baf61f1d9869e", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "p1n3appl3", + "repo": "obs-gamepad", "type": "github" } }, - "pre-commit-hooks_2": { + "p1n3appl3": { "inputs": { - "flake-compat": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "flake-compat" + "catppuccin": "catppuccin", + "flake-utils": "flake-utils_5", + "home-manager": "home-manager_3", + "nix-index-database": "nix-index-database", + "nixgl": "nixgl", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable", + "obs-gamepad": "obs-gamepad", + "ragenix": "ragenix", + "rahul-config": [ + "rahul-config" ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "nixpkgs" - ], - "nixpkgs-stable": [ - "noteslsp", - "crate2nix", - "crate2nix_stable", - "nixpkgs" - ] + "slippi": "slippi", + "zed": "zed" }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "lastModified": 1738892328, + "narHash": "sha256-XQp+iIdyq1Jp266Ij2QhwXtdryRG6Z72gp3utHLlwTg=", + "owner": "p1n3appl3", + "repo": "config", + "rev": "affc2d239f470b35ee15393d1d44ccfd06730d87", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "p1n3appl3", + "repo": "config", "type": "github" } }, - "pre-commit-hooks_3": { + "ragenix": { "inputs": { - "flake-compat": [ - "noteslsp", - "crate2nix", - "flake-compat" + "agenix": "agenix", + "crane": "crane", + "flake-utils": [ + "p1n3appl3", + "flake-utils" ], - "flake-utils": "flake-utils_10", - "gitignore": "gitignore_4", "nixpkgs": [ - "noteslsp", - "crate2nix", + "p1n3appl3", "nixpkgs" ], - "nixpkgs-stable": [ - "noteslsp", - "crate2nix", - "nixpkgs" - ] + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1712055707, - "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", + "lastModified": 1726755133, + "narHash": "sha256-03XIEjHeZEjHXctsXYUB+ZLQmM0WuhR6qWQjwekFk/M=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "687ee92114bce9c4724376cf6b21235abe880bfa", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "ragenix_2": { + "inputs": { + "agenix": [ + "rahul-config", + "agenix" + ], + "crane": "crane_2", + "flake-utils": [ + "rahul-config", + "flake-utils" + ], + "nixpkgs": [ + "rahul-config", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1718869541, + "narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "rahul-config": { + "inputs": { + "agenix": "agenix_2", + "darwin": "darwin_2", + "flake-utils": "flake-utils_6", + "home-manager": "home-manager_5", + "impermanence": "impermanence", + "nix-index-database": "nix-index-database_2", + "nixos-hardware": "nixos-hardware_2", + "nixpkgs": "nixpkgs_4", + "ragenix": "ragenix_2" + }, + "locked": { + "lastModified": 1739102974, + "narHash": "sha256-0ab3H7ODqB4CaZxRaWPRn9SA2Fq1NPTxQJ/fd12deuM=", + "owner": "jdonszelmann", + "repo": "nix-config", + "rev": "b43d53141becd33181672a7a355c4b195a9aeff1", + "type": "github" + }, + "original": { + "owner": "jdonszelmann", + "repo": "nix-config", "type": "github" } }, @@ -1353,13 +1010,13 @@ "inputs": { "dumpasm": "dumpasm", "flake-utils": "flake-utils_2", - "ghostty": "ghostty", "home-manager": "home-manager", "jujutsu": "jujutsu", "kitty-search": "kitty-search", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", - "noteslsp": "noteslsp", + "p1n3appl3": "p1n3appl3", + "rahul-config": "rahul-config", "t": "t" } }, @@ -1371,11 +1028,11 @@ ] }, "locked": { - "lastModified": 1732242723, - "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=", + "lastModified": 1737685583, + "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a", + "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a", "type": "github" }, "original": { @@ -1386,14 +1043,18 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": [ + "p1n3appl3", + "ragenix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1735698720, - "narHash": "sha256-+skLL6mq/T7s6J5YmSp89ivQOHBPQ40GEU2n8yqp6bs=", + "lastModified": 1725675754, + "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a00807363a8a6cae6c3fa84ff494bf9d96333674", + "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", "type": "github" }, "original": { @@ -1402,6 +1063,61 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "rahul-config", + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "rahul-config", + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708740535, + "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "slippi": { + "inputs": { + "git-hooks": [ + "p1n3appl3" + ], + "home-manager": [ + "p1n3appl3", + "home-manager" + ], + "nixpkgs": [ + "p1n3appl3", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738254766, + "narHash": "sha256-HgwiOEieKj9F7JIPR5X9YoDBb2eOwainKZqAJM/3OWU=", + "owner": "lytedev", + "repo": "slippi-nix", + "rev": "3b06734c76497732e4d347f376c085a4e5d7d17d", + "type": "github" + }, + "original": { + "owner": "lytedev", + "repo": "slippi-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1417,51 +1133,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_12": { - "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, @@ -1584,8 +1255,8 @@ }, "t": { "inputs": { - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1710410762, @@ -1609,11 +1280,11 @@ ] }, "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { @@ -1622,28 +1293,37 @@ "type": "github" } }, - "zig": { + "utils": { "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] + "systems": "systems_6" }, "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { - "owner": "mitchellh", - "repo": "zig-overlay", + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "zed": { + "flake": false, + "locked": { + "lastModified": 1738824383, + "narHash": "sha256-9HoLYYnYr0sd8KKc7gQSUUmkzomtoZA+bv1tU2zuEVc=", + "owner": "zed-industries", + "repo": "zed", + "rev": "10792ee0ad3b58c24f9977c903d2b8a84dfbdd15", + "type": "github" + }, + "original": { + "owner": "zed-industries", + "repo": "zed", "type": "github" } } diff --git a/flake.nix b/flake.nix index 7b5519d..6ee05fb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,9 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -25,15 +25,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - ghostty = { - url = "github:ghostty-org/ghostty"; - - inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.nixpkgs-unstable.follows = "nixpkgs"; + p1n3appl3 = { + url = "github:p1n3appl3/config"; + inputs.rahul-config.follows = "rahul-config"; }; - - # sorry, secret... for now - noteslsp.url = "git+ssh://git@github.com/jdonszelmann/notes"; + rahul-config.url = "github:jdonszelmann/nix-config"; }; outputs = @@ -45,8 +41,6 @@ t, dumpasm, jujutsu, - ghostty, - noteslsp, ... }@inputs: let @@ -63,9 +57,8 @@ t = t.packages.${system}.default; inherit (dumpasm.packages.${system}) dumpasm; inherit (jujutsu.packages.${system}) jujutsu; - inherit (ghostty.packages.${system}) ghostty; - inherit (noteslsp.packages.${system}) noteslsp; }; + p1n3appl3 = inputs.p1n3appl3.packages.${system}; }) ]; }; @@ -94,7 +87,7 @@ (pkgs.writeShellScriptBin "apply-home" '' export NIX_BUILD_CORES=$(($(nproc) * 2)) - nix run .#home-manager -j $NIX_BUILD_CORES --cores $NIX_BUILD_CORES -- switch --flake .#$@ --max-jobs $NIX_BUILD_CORES + nix run .#home-manager -- switch --flake .#$@ -j $(nproc) --cores $(nproc) '') (pkgs.writeShellScriptBin "apply" '' @@ -120,4 +113,11 @@ inherit home-manager; inherit (home-manager) packages; }; + + nixConfig = { + extra-substituters = [ "https://jana.cachix.org" ]; + extra-trusted-public-keys = [ + "jana.cachix.org-1:LN0lzHx7QH1RBoDn3+psi4HOEAXW3EqRa/u0ncQ1XBE=" + ]; + }; } diff --git a/hosts/kili/home.nix b/hosts/kili/home.nix index 3649f7d..4797345 100644 --- a/hosts/kili/home.nix +++ b/hosts/kili/home.nix @@ -4,7 +4,10 @@ stateVersion = "24.05"; username = "jana"; homeDirectory = "/home/jana"; - packages = with pkgs; [ config.programs.neovim.package ]; + + packages = with pkgs; [ + p1n3appl3.tab + ]; }; imports = [ diff --git a/programs/fish/default.nix b/programs/fish/default.nix index 62f7bf1..3ba6e8d 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -193,6 +193,10 @@ in fish_add_path "$HOME/.local/bin" fish_add_path "$HOME/Documents/scripts" fish_add_path "$HOME/.nix-profile/bin" + + function fish_greeting + ${pkgs.blahaj}/bin/blahaj -s + end ''; }; }; diff --git a/programs/git/default.nix b/programs/git/default.nix index 14b8642..a62c642 100644 --- a/programs/git/default.nix +++ b/programs/git/default.nix @@ -3,7 +3,7 @@ _: { enable = true; userEmail = "jana@donsz.nl"; userName = "Jana Dönszelmann"; - signing.key = "/home/jonathan/.ssh/id_ed25519.pub"; + signing.key = "/home/jana/.ssh/id_ed25519.pub"; signing.signByDefault = true; delta.enable = true; diff --git a/programs/kitty/default.nix b/programs/kitty/default.nix index 83562e8..cfbb39c 100644 --- a/programs/kitty/default.nix +++ b/programs/kitty/default.nix @@ -1,51 +1,53 @@ { pkgs, inputs, ... }: { - programs.kitty = { - enable = true; - font = { - name = "Jetbrains Mono"; - size = 13.0; - package = pkgs.jetbrains-mono; - }; - - settings = { - scrollback_lines = 20000; - allow_hyperlinks = true; - - repaint_delay = 10; - input_delay = 3; - - enable_audio_bell = false; - update_check_interval = 0; - - initial_window_width = "95c"; - initial_window_height = "30c"; - remember_window_size = "no"; - - draw_minimal_borders = false; - hide_window_decorations = true; - - shell = "${pkgs.tmux}/bin/tmux"; - clipboard_control = "write-clipboard write-primary read-clipboard read-primary"; - - foreground = "#fcfcfc"; - background = "#232627"; - linux_display_server = "auto"; - }; - - keybindings = { - "ctrl+f" = "launch --location=hsplit --allow-remote-control kitty +kitten ${inputs.kitty-search}/search.py @active-kitty-window-id"; - "ctrl+alt+r" = "load_config_file"; - "ctrl+shift+r" = "no_op"; - "super+`" = "no_op"; - "ctrl+EQUAL" = "change_font_size all +2.0"; - "ctrl+minus" = "change_font_size all -2.0"; - "ctrl+0" = "change_font_size all 0"; - # "ctrl+/" = "send_text all "; - }; - - extraConfig = '' - mouse_map left click ungrabbed no-op - ''; + programs.kitty = { + enable = true; + font = { + name = "Jetbrains Mono"; + size = 13.0; + package = pkgs.jetbrains-mono; }; + + settings = { + scrollback_lines = 20000; + allow_hyperlinks = true; + + repaint_delay = 10; + input_delay = 3; + + enable_audio_bell = false; + update_check_interval = 0; + + initial_window_width = "95c"; + initial_window_height = "30c"; + remember_window_size = "no"; + + draw_minimal_borders = false; + hide_window_decorations = true; + + shell = "${pkgs.tmux}/bin/tmux"; + clipboard_control = "write-clipboard write-primary read-clipboard read-primary"; + + foreground = "#fcfcfc"; + background = "#232627"; + linux_display_server = "auto"; + }; + + keybindings = { + "ctrl+f" = + "launch --location=hsplit --allow-remote-control kitty +kitten ${inputs.kitty-search}/search.py @active-kitty-window-id"; + "ctrl+alt+r" = "load_config_file"; + "ctrl+shift+r" = "no_op"; + "super+`" = "no_op"; + "ctrl+EQUAL" = "change_font_size all +2.0"; + "ctrl+minus" = "change_font_size all -2.0"; + "ctrl+0" = "change_font_size all 0"; + # "ctrl+/" = "send_text all "; + "super+~" = "no_op"; + }; + + extraConfig = '' + mouse_map left click ungrabbed no-op + ''; + }; } diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix index 5d5e543..6ab0753 100644 --- a/programs/nvim/default.nix +++ b/programs/nvim/default.nix @@ -130,26 +130,27 @@ in require("render-markdown").setup { latex_converter = '${pkgs.python312Packages.pylatexenc}/bin/latex2text', } - - local lspconfig = require 'lspconfig' - local configs = require 'lspconfig.configs' - if not configs.foo_lsp then - configs.noteslsp = { - default_config = { - -- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'}, - cmd = {'./noteslsp/target/debug/noteslsp'}, - filetypes = {'markdown'}, - root_dir = function(fname) - return lspconfig.util.find_git_ancestor(fname) - end, - settings = {} - , - }, - } - end - - lspconfig.noteslsp.setup{} '' + + # local lspconfig = require 'lspconfig' + # local configs = require 'lspconfig.configs' + # if not configs.foo_lsp then + # configs.noteslsp = { + # default_config = { + # -- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'}, + # cmd = {'./noteslsp/target/debug/noteslsp'}, + # filetypes = {'markdown'}, + # root_dir = function(fname) + # return lspconfig.util.find_git_ancestor(fname) + # end, + # settings = {} + # , + # }, + # } + # end + # + # lspconfig.noteslsp.setup{} + # '' + (builtins.readFile ./config.lua); }; diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix index 42df7bb..3c9a533 100644 --- a/programs/nvim/plugins.nix +++ b/programs/nvim/plugins.nix @@ -163,7 +163,7 @@ in lsp-format.enable = true; fugitive.enable = false; lspkind.enable = true; - crates-nvim.enable = true; + crates.enable = true; fidget.enable = true; cmp.enable = true; nvim-autopairs.enable = true; @@ -257,36 +257,36 @@ in }; }; - # git-conflict = { - # enable = true; - # settings = { - # default_mappings = { - # both = "cb"; - # none = "c0"; - # ours = "co"; - # prev = "]x"; - # next = "[x"; - # theirs = "ct"; - # }; - # disable_diagnostics = false; - # highlights = { - # current = "DiffText"; - # incoming = "DiffAdd"; - # }; - # list_opener = "conflicts"; - # }; - # }; - # gitsigns = { - # enable = true; - # - # settings = { - # current_line_blame = true; - # current_line_blame_opts = { - # virt_text = true; - # virt_text_pos = "eol"; - # }; - # }; - # }; + git-conflict = { + enable = true; + settings = { + default_mappings = { + both = "cb"; + none = "c0"; + ours = "co"; + prev = "]x"; + next = "[x"; + theirs = "ct"; + }; + disable_diagnostics = false; + highlights = { + current = "DiffText"; + incoming = "DiffAdd"; + }; + list_opener = "conflicts"; + }; + }; + gitsigns = { + enable = true; + + settings = { + current_line_blame = true; + current_line_blame_opts = { + virt_text = true; + virt_text_pos = "eol"; + }; + }; + }; lspsaga = { enable = true; @@ -322,10 +322,10 @@ in rust-analyzer = { inlayHints = { lifetimeElisionHints.enable = "always"; - expressionAdjustmentHints = { - enable = "always"; - mode = "prefer_postfix"; - }; + # expressionAdjustmentHints = { + # enable = "always"; + # mode = "prefer_postfix"; + # }; discriminantHints.enable = "always"; }; # check = { @@ -567,9 +567,11 @@ in floaterm = { enable = true; - opener = "edit"; - width = 0.8; - height = 0.8; + settings = { + opener = "edit"; + width = 0.8; + height = 0.8; + }; }; telescope = { enable = true;