diff --git a/flake.lock b/flake.lock index f1021cc..de705f8 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -23,14 +23,20 @@ }, "catppuccin": { "inputs": { - "nixpkgs": "nixpkgs_2" + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager_2", + "home-manager-stable": "home-manager-stable", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" }, "locked": { - "lastModified": 1742254251, - "narHash": "sha256-3wGCx5UR86pgurSYB//LsBMKAsw6qpiOpnzgShPQKkM=", + "lastModified": 1736069220, + "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", "owner": "catppuccin", "repo": "nix", - "rev": "4cb9c621072312fb45c6e86b57e5fabd97f1b95d", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", "type": "github" }, "original": { @@ -39,13 +45,41 @@ "type": "github" } }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "crane": { "locked": { - "lastModified": 1741148495, - "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -83,11 +117,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1736711425, + "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", "type": "github" }, "original": { @@ -119,14 +153,14 @@ "emacs-overlay": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1742462736, - "narHash": "sha256-txzExPg8ZWIfrX653J3GWiJmB3s6yKuApaKkVfskdW4=", + "lastModified": 1742203058, + "narHash": "sha256-YMy01dURXhxyjx2W+Dv83b2RRnNq28K4t4+kvrRxFto=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d8b5b1643d15bca3308b687918461f5f370f8c6d", + "rev": "7a9a25389a6ad9402f9aa5087ccb36f8383045a8", "type": "github" }, "original": { @@ -170,11 +204,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -191,11 +225,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -226,6 +260,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -245,11 +297,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -282,11 +334,11 @@ ] }, "locked": { - "lastModified": 1742300892, - "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ea26a82dda75bee6783baca6894040c8e6599728", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -359,7 +411,50 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nix-on-droid", @@ -387,11 +482,11 @@ ] }, "locked": { - "lastModified": 1742447757, - "narHash": "sha256-Q0KXcHQmum8L6IzGhhkVhjFMKY6BvYa/rhmLP26Ws8o=", + "lastModified": 1736781604, + "narHash": "sha256-nIjcN89nxaI5ZnwU/1gzc3rBVQ/te5sHraYeG4cyJX4=", "owner": "nix-community", "repo": "home-manager", - "rev": "94605dcadefeaff6b35c8931c9f38e4f4dc7ad0a", + "rev": "9616d81f98032d1ee9bec68ab4b6a8c833add88c", "type": "github" }, "original": { @@ -423,11 +518,11 @@ }, "impermanence": { "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1736688610, + "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", "type": "github" }, "original": { @@ -436,6 +531,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -448,11 +571,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741442524, - "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", + "lastModified": 1734994463, + "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", + "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", "type": "github" }, "original": { @@ -464,11 +587,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742411066, - "narHash": "sha256-8vXOKPQFRzTjapsRnTJ1nuFjUfC+AGI2ybdK5cAEHZ8=", + "lastModified": 1736680332, + "narHash": "sha256-gwidOezQ6FT5q4GHcpD6y2EwKcrtzjAoxaN/9bTGqQw=", "ref": "refs/heads/main", - "rev": "2491b7cc2128ee440d24768c4521c38b1859fc28", - "revCount": 17705, + "rev": "38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2", + "revCount": 16610, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -479,7 +602,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -489,11 +612,11 @@ ] }, "locked": { - "lastModified": 1741894565, - "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=", + "lastModified": 1733522213, + "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", "ref": "refs/heads/main", - "rev": "a6da43f8193d9e329bba1795c42590c27966082e", - "revCount": 136, + "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", + "revCount": 124, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -505,11 +628,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1741101701, - "narHash": "sha256-Kup8HWWC2AR1j2c9pAjXQXLYmuhyv8sRRfX0o03sNQg=", + "lastModified": 1736638789, + "narHash": "sha256-pkpOkSUNrSf5DePUtYYFt4wGODhY28RlQ4SIJ1e+15M=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "8956d72cf8fa9110dcc5fcbc537adee45a8014f5", + "rev": "72a0601f36a1b424e8b72f17ff53509b990ee060", "type": "github" }, "original": { @@ -546,7 +669,7 @@ }, "nix-on-droid": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": "nixpkgs_5", "nixpkgs-docs": "nixpkgs-docs", @@ -569,11 +692,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1742376361, - "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -632,26 +755,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", - "type": "github" + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { @@ -661,13 +781,45 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable_2": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742136038, + "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -695,11 +847,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -726,17 +878,17 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1736701207, + "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" } }, @@ -792,6 +944,29 @@ "type": "gitlab" } }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -802,14 +977,15 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -889,11 +1065,11 @@ ] }, "locked": { - "lastModified": 1741228283, - "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -985,6 +1161,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -992,11 +1183,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { @@ -1007,7 +1198,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_7" }, "locked": { diff --git a/flake.nix b/flake.nix index 4b6946e..847a775 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { flakeParts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6"; # FIXME update (check if screen sharing works!) nixosHardware.url = "github:NixOS/nixos-hardware"; homeManager = { url = "github:nix-community/home-manager"; diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index a36b0de..9987cbf 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -548,13 +548,6 @@ (eglot-ensure)))) :mode "\\.ts\\'") -(use-package rust-mode - :init - (setq rust-mode-treesitter-derive t) - :hook ((rust-mode . (lambda () - (require 'eglot) - (eglot-ensure))))) - (use-package haskell-ts-mode :hook ((haskell--ts-mode . eglot-ensure)) :mode "\\.hs\\'" @@ -661,8 +654,7 @@ (eat-eshell-mode) (eat-eshell-visual-command-mode) :custom ((eshell-prefer-lisp-functions t) - (eshell-history-size 10000) - (eshell-banner-message "")) + (eshell-history-size 10000)) :config (defun ccr/start-eshell () ;; Used from outside Emacs by emacsclient --eval (eshell 'N) @@ -689,10 +681,8 @@ ccr/eshell-aliases) :bind (("C-c o e" . project-eshell) - (:map eshell-mode-map - ("C-r" . eshell-atuin-history) - ("C-" . corfu-send) - ))) ;; i.e. just C-r in semi-char-mode + :map eshell-mode-map + ("C-r" . eshell-atuin-history))) ;; i.e. just C-r in semi-char-mode (use-package eshell-command-not-found :custom ((eshell-command-not-found-command "command-not-found")) diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix index 9100a3e..6e0de55 100644 --- a/hmModules/firefox/default.nix +++ b/hmModules/firefox/default.nix @@ -63,7 +63,7 @@ in }; profiles.default = { search.force = true; - search.default = "google"; + search.default = "Google"; search.engines = { "Searx" = { urls = [ @@ -79,6 +79,7 @@ in ]; }; }; + bookmarks = [ ]; extensions = [ ]; userChrome = builtins.readFile ./userchrome.css; }; diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl index a7baef7..09dacf3 100644 --- a/hmModules/niri/config.kdl +++ b/hmModules/niri/config.kdl @@ -223,16 +223,16 @@ layout { // bottom 64 } - shadow { - on - } + // shadow { + // on + // } } layer-rule { match namespace="^rofi$" - shadow { - on - } + // shadow { + // on + // } } // Add lines like this to spawn processes at startup. diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index f63cbf0..17ac2bb 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -70,53 +70,35 @@ }; }; - programs.bash = { + programs.fish = { enable = true; - initExtra = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) '' - export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) - ''; + plugins = [ + # { + # name = "fifc"; + # src = pkgs.fishPlugins.fifc.src; + # } + { + name = "z"; + src = pkgs.fishPlugins.z.src; + } + ]; + shellInit = + '' + # fish_vi_key_bindings + fish_default_key_bindings + '' + + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) '' + export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) + ''; shellAliases = { "cat" = "bat"; }; }; - programs.zoxide.enable = true; - programs.thefuck.enable = true; - programs.oh-my-posh = { - enable = true; - useTheme = "catppuccin_mocha"; - }; - - programs.zellij.enableBashIntegration = false; - - # programs.fish = { - # enable = true; - # plugins = [ - # # { - # # name = "fifc"; - # # src = pkgs.fishPlugins.fifc.src; - # # } - # { - # name = "z"; - # src = pkgs.fishPlugins.z.src; - # } - # ]; - # shellInit = - # '' - # # fish_vi_key_bindings - # fish_default_key_bindings - # '' - # + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) '' - # export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) - # ''; - # shellAliases = { - # "cat" = "bat"; - # }; - # }; - home.packages = with pkgs; [ + thefuck dig.dnsutils lsof comma diff --git a/hmModules/xdg/default.nix b/hmModules/xdg/default.nix index a1c5fe4..bdcfdeb 100644 --- a/hmModules/xdg/default.nix +++ b/hmModules/xdg/default.nix @@ -28,29 +28,6 @@ ]; }; }; - portal = { - enable = true; - configPackages = with pkgs; [ - # xdg-desktop-portal-wlr - # xdg-desktop-portal-gtk - # xdg-desktop-portal-hyprland - xdg-desktop-portal-gnome - # xdg-desktop-portal - # kdePackages.xdg-desktop-portal-kde - # libsForQt5.xdg-desktop-portal-kde - gnome-keyring - ]; - extraPortals = with pkgs; [ - # xdg-desktop-portal-wlr - # xdg-desktop-portal-gtk - # xdg-desktop-portal-hyprland - xdg-desktop-portal-gnome - # xdg-desktop-portal - # kdePackages.xdg-desktop-portal-kde - gnome-keyring - ]; - }; - }; home.packages = [ pkgs.xdg-utils ]; } diff --git a/hmModules/zellij/default.nix b/hmModules/zellij/default.nix index b2a7bd3..9e75788 100644 --- a/hmModules/zellij/default.nix +++ b/hmModules/zellij/default.nix @@ -99,6 +99,7 @@ in { programs.zellij = { enable = true; + enableFishIntegration = false; settings = { default_layout = "${layout}"; pane_frames = false; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 03fbb85..a63fd60 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -77,7 +77,7 @@ "tor-browser" "kicad" "monero" - # "zulip" + "zulip" "teams" "obs-studio" "calibre" diff --git a/modules/arr/default.nix b/modules/arr/default.nix index 5f269c4..465eed8 100644 --- a/modules/arr/default.nix +++ b/modules/arr/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ pkgs, lib, ... }: { services.radarr = { enable = true; @@ -6,6 +6,9 @@ services.sonarr = { enable = true; + package = + (builtins.getFlake "github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5") + .legacyPackages.${pkgs.stdenv.system}.sonarr; }; services.prowlarr = { diff --git a/modules/ccr/default.nix b/modules/ccr/default.nix index 5f25ab4..31c7859 100644 --- a/modules/ccr/default.nix +++ b/modules/ccr/default.nix @@ -28,7 +28,7 @@ in shell = lib.mkOption { type = lib.types.package; - default = pkgs.bash; + default = pkgs.fish; }; modules = lib.mkOption { diff --git a/modules/xdg/default.nix b/modules/xdg/default.nix index 7dd59d5..04c145e 100644 --- a/modules/xdg/default.nix +++ b/modules/xdg/default.nix @@ -1,51 +1,29 @@ { pkgs, ... }: { xdg = { - autostart.enable = true; - menus.enable = true; - mime.enable = true; - icons.enable = true; portal = { enable = true; configPackages = with pkgs; [ - # xdg-desktop-portal-wlr - # xdg-desktop-portal-gtk - # xdg-desktop-portal-hyprland + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland xdg-desktop-portal-gnome - # xdg-desktop-portal - # kdePackages.xdg-desktop-portal-kde - # libsForQt5.xdg-desktop-portal-kde + xdg-desktop-portal + kdePackages.xdg-desktop-portal-kde + libsForQt5.xdg-desktop-portal-kde gnome-keyring ]; extraPortals = with pkgs; [ - # xdg-desktop-portal-wlr - # xdg-desktop-portal-gtk - # xdg-desktop-portal-hyprland + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland xdg-desktop-portal-gnome - # xdg-desktop-portal - # kdePackages.xdg-desktop-portal-kde + xdg-desktop-portal + kdePackages.xdg-desktop-portal-kde gnome-keyring ]; xdgOpenUsePortal = true; wlr.enable = true; }; - - }; - security.rtkit.enable = true; - - security.polkit.enable = true; - services.gnome.gnome-keyring.enable = true; - systemd.user.services.niri-flake-polkit = { - description = "PolicyKit Authentication Agent provided by niri-flake"; - wantedBy = [ "niri.service" ]; - after = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; }; } diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 9b366a2..f726e67 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -182,7 +182,6 @@ let markdown-mode haskell-mode terraform-mode - rust-mode diredfl org-modern math-preview