diff --git a/flake.lock b/flake.lock index dce49def..68edb2aa 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1750974272, - "narHash": "sha256-VaeQzSzekMvP+/OhwNZP4kzs4paWk5+20N0MFLTn+cs=", + "lastModified": 1751740947, + "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "dd921421391e75793d0cc674dc15eca16b46a089", + "rev": "dfc1db15a08c4cd234288f66e1199c653495301f", "type": "github" }, "original": { @@ -674,6 +674,22 @@ } }, "flake-compat_7": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1641205782, @@ -689,7 +705,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_9": { "flake": false, "locked": { "lastModified": 1641205782, @@ -794,11 +810,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -848,7 +864,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1731533236, @@ -865,12 +881,15 @@ } }, "flake-utils_11": { + "inputs": { + "systems": "systems_16" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -895,8 +914,23 @@ } }, "flake-utils_13": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1710146030, @@ -912,9 +946,9 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_15": { "inputs": { - "systems": "systems_17" + "systems": "systems_18" }, "locked": { "lastModified": 1731533236, @@ -930,9 +964,9 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_16": { "inputs": { - "systems": "systems_18" + "systems": "systems_19" }, "locked": { "lastModified": 1726560853, @@ -948,9 +982,9 @@ "type": "github" } }, - "flake-utils_16": { + "flake-utils_17": { "inputs": { - "systems": "systems_19" + "systems": "systems_20" }, "locked": { "lastModified": 1731533236, @@ -1119,11 +1153,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1751413371, - "narHash": "sha256-yY7K58oczWzTfKlP6K2cICioAzG4WCkppO9pZuXQWoM=", + "lastModified": 1752161206, + "narHash": "sha256-rKkTBXjlHjDrBpzTVO5F1uiMoseiq0PRVU7dohigf/s=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "776d25b0652068e5eeb802670a7adfbbcadf8e8b", + "rev": "cc646ecf46268686a2d7268ef20826a26f2952f9", "type": "github" }, "original": { @@ -1215,11 +1249,11 @@ ] }, "locked": { - "lastModified": 1751429452, - "narHash": "sha256-4s5vRtaqdNhVBnbOWOzBNKrRa0ShQTLoEPjJp3joeNI=", + "lastModified": 1752093218, + "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", "owner": "nix-community", "repo": "home-manager", - "rev": "df12269039dcf752600b1bcc176bacf2786ec384", + "rev": "206ed3c71418b52e176f16f58805c96e84555320", "type": "github" }, "original": { @@ -1294,11 +1328,11 @@ ] }, "locked": { - "lastModified": 1750621377, - "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", + "lastModified": 1751808145, + "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", + "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f", "type": "github" }, "original": { @@ -1354,11 +1388,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1751404714, - "narHash": "sha256-VcaGnoW8p7PrtSCHBMJbiuSQoYGq6tTx5VhvDAdojgc=", + "lastModified": 1752149340, + "narHash": "sha256-DJc2ROpttbP6FHcXwWpmK7EB2cpVsP/LmXjEr8RWcO8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "90c8609cbb5ae7b488d7b14b4dfb3ec9585ed2b7", + "rev": "b5433bb75324a95dd27eb5492141565466c2cdd6", "type": "github" }, "original": { @@ -1555,11 +1589,11 @@ ] }, "locked": { - "lastModified": 1751061882, - "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=", + "lastModified": 1751888065, + "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4", + "rev": "a8229739cf36d159001cfc203871917b83fdf917", "type": "github" }, "original": { @@ -1605,11 +1639,11 @@ ] }, "locked": { - "lastModified": 1750371869, - "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", + "lastModified": 1751881472, + "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", + "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120", "type": "github" }, "original": { @@ -1653,11 +1687,11 @@ ] }, "locked": { - "lastModified": 1751363177, - "narHash": "sha256-zKpJCs78/Y9ZpB5W+R695k2shuqRRlVYKVxZpCopHcU=", + "lastModified": 1751987880, + "narHash": "sha256-GnogB5imHEb4EvRKrX+1x64ZIc0zzJR2MHeheEmWceI=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "6d4170d3a63dd51369b6e332000447377f802c0f", + "rev": "b980d74a9a73126c86d7708c658b53063912a17b", "type": "github" }, "original": { @@ -1817,11 +1851,11 @@ "neorg": { "flake": false, "locked": { - "lastModified": 1751384214, - "narHash": "sha256-fICgSU8ag3cF0STtDge66I+bKGfH7acOCvkfMPRPrN8=", + "lastModified": 1751646203, + "narHash": "sha256-uQSrXTngyRSWRyPN7v7uVQOHw+8rLm8+KXxls4nT2K4=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "f603736d3ec73eff31558b3951cd6bdb8ffcfb19", + "rev": "790b0444c0c654131a722817dc893332e06c72b9", "type": "github" }, "original": { @@ -1976,11 +2010,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1751170039, - "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "9c932ae632d6b5150515e5749b198c175d8565db", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -1989,6 +2023,26 @@ "type": "github" } }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1751854764, + "narHash": "sha256-StA6nw3eYixvv1KKPKKD+L1nCxz65Gyx4zg5Es7V8tQ=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "d4a00866abd69011e70ac3a5976db9008601fd09", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nix-systems": { "locked": { "lastModified": 1689347949, @@ -2034,14 +2088,14 @@ "inputs": { "argononed": "argononed", "nixos-images": "nixos-images", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1749156319, - "narHash": "sha256-Eilhss+fV1Fp88Sua5LwPnxGJ2A1/3TEDI1cMQja/+w=", + "lastModified": 1751645438, + "narHash": "sha256-PH/EEaWI33UWcahMLYxG2aL7K2qSNJsyckITYrNPr2E=", "owner": "nvmd", "repo": "nixos-raspberrypi", - "rev": "dc5ff85af8a5c1e0913bfdc15e419ae430fd0df2", + "rev": "157cf84d037896411b2d2b3fde3d03a8967d8aed", "type": "github" }, "original": { @@ -2087,11 +2141,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1751458781, - "narHash": "sha256-XQGSJ6pGimbTLb89b6ztw+rUyjdxcBIKsVZqPqyffRQ=", + "lastModified": 1752164706, + "narHash": "sha256-eXyNWZbL5jEPbqqQ5xiIupx9yBU+HyjwF9iYAVD/cSU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1740cdb0be88245ae58cefc7277b6f04cfd4b38", + "rev": "86bd0597131e8393c69faa37f459f6e609058c2c", "type": "github" }, "original": { @@ -2117,6 +2171,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1748189127, @@ -2148,11 +2218,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -2164,27 +2234,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1748882666, - "narHash": "sha256-z2uanxifOXGEqdiprquIGZu0XaRYih3FHXDQwLc1xis=", - "owner": "nvmd", - "repo": "nixpkgs", - "rev": "d2e9e5abf6308b83487d26e383799f7520dc5cdf", - "type": "github" - }, - "original": { - "owner": "nvmd", - "ref": "modules-with-keys-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -2194,18 +2248,34 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", + "lastModified": 1751644338, + "narHash": "sha256-dXN4Ig8grBd7Hd5zk9bSmajZlcGbJbqLNI0LCus9+A0=", + "owner": "nvmd", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "rev": "df3e3357bdc6ec1c098f5baedbec86320f26d84c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nvmd", + "ref": "modules-with-keys-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -2228,16 +2298,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", - "owner": "nixos", + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -2249,14 +2319,14 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_14" + "systems": "systems_15" }, "locked": { - "lastModified": 1751144320, - "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", + "lastModified": 1752158208, + "narHash": "sha256-XbXYLUtaB/wHvZYefvaDPbo4eYj27kbtowHfww9bqLw=", "owner": "nix-community", "repo": "nixvim", - "rev": "ceb52aece5d571b37096945c2815604195a04eb4", + "rev": "b728cf43d97814df43f5d9bd9dafac9072ccd9e8", "type": "github" }, "original": { @@ -2267,7 +2337,7 @@ }, "nno": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "neorg": "neorg", "neorg-telescope": "neorg-telescope", "nixpkgs": [ @@ -2277,11 +2347,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1751419666, - "narHash": "sha256-IhWvss5FWwLsUrWj7DQSJGChAKwiE1AynxLYtZRNBrE=", + "lastModified": 1751978351, + "narHash": "sha256-C4LRfkvTHu8a12VLUUnNqQ8Lj48sKcmrGGqiqbNifMQ=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "37e130cb60fa194b1a038b3a2c27cf916b247723", + "rev": "9207d77f0ee2a91b48a9f84f65a291d56589837e", "type": "github" }, "original": { @@ -2292,9 +2362,9 @@ }, "norg": { "inputs": { - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_7" + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1672582520, @@ -2313,9 +2383,9 @@ }, "norg-meta": { "inputs": { - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_8" + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_13", + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1713028366, @@ -2334,15 +2404,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_9", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1751458636, - "narHash": "sha256-hOl//m2j6DZPyoAe87qkZk4kD5dhfHw2odeZAFEBYmA=", + "lastModified": 1752161467, + "narHash": "sha256-UiQWoS1OUw+5RRRkjWE/W6Vwsx26Pq4GTcJKPZ1TOw8=", "owner": "nix-community", "repo": "nur", - "rev": "14864119daae84bbfdb639e1463b1b61580ce60c", + "rev": "8c091c06ed45e45d921c42aa7e8360932bb7c774", "type": "github" }, "original": { @@ -2353,7 +2422,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -2376,7 +2445,7 @@ }, "onepassword-shell-plugins": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "nixpkgs": [ "nixpkgs" ] @@ -2519,8 +2588,9 @@ "neogit": "neogit", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", + "nix-minecraft": "nix-minecraft", "nixos-rpi": "nixos-rpi", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", @@ -2702,11 +2772,11 @@ ] }, "locked": { - "lastModified": 1751423951, - "narHash": "sha256-AowKhJGplXRkAngSvb+32598DTiI6LOzhAnzgvbCtYM=", + "lastModified": 1752115281, + "narHash": "sha256-3i0sUli3sWCglfpj+yS1gtA+4m2ao2UMIxa4IfifUUU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1684ed5b15859b655caf41b467d046e29a994d04", + "rev": "e5b68250e585c60d1679803045575fb71801d822", "type": "github" }, "original": { @@ -2764,11 +2834,11 @@ ] }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "type": "github" }, "original": { @@ -2957,6 +3027,21 @@ "type": "github" } }, + "systems_20": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -3066,7 +3151,7 @@ "inputs": { "advisory-db": "advisory-db_5", "crane": "crane_6", - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "nix-github-actions": "nix-github-actions_4", "nixpkgs": [ "nixpkgs" @@ -3122,11 +3207,11 @@ "tree-sitter-nu": { "flake": false, "locked": { - "lastModified": 1751118535, - "narHash": "sha256-pmW4F3Gif5VRosA+4CVzbF0ZrZioRujyiEJyWq6+dwg=", + "lastModified": 1751974851, + "narHash": "sha256-5LcREDBKFGiFSuziEYQ9RKnHkwR/qKijmW5dSrrxGhA=", "owner": "nushell", "repo": "tree-sitter-nu", - "rev": "d62bb4a0c78e9476a6dd0081761444f6870252ed", + "rev": "6810930d133af12aed8fe4557935b635934ab61a", "type": "github" }, "original": { @@ -3151,27 +3236,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "typr": { "flake": false, "locked": { @@ -3250,11 +3314,11 @@ ] }, "locked": { - "lastModified": 1750372504, - "narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=", + "lastModified": 1751300244, + "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92", + "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", "type": "github" }, "original": { @@ -3271,11 +3335,11 @@ ] }, "locked": { - "lastModified": 1751440815, - "narHash": "sha256-cBEcG90ahVVPMKEHiyn13KT7cxpcEwSOqrLhgz5/M9k=", + "lastModified": 1752164817, + "narHash": "sha256-LJFIx27IOUowLsJn5wci9mHZ4CesJsiAivQWDjnZPCc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a37c444f51b3e7df8ea3333c57a4154c6b09dc39", + "rev": "9193992c4c2c4349b4280ec2b49648cae208fe63", "type": "github" }, "original": { @@ -3288,7 +3352,7 @@ "inputs": { "advisory-db": "advisory-db_6", "crane": "crane_7", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_16", "nix-github-actions": "nix-github-actions_5", "nixpkgs": [ "nixpkgs" @@ -3340,7 +3404,7 @@ "zjstatus": { "inputs": { "crane": "crane_8", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_17", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index e835ef4b..dece3d0e 100644 --- a/flake.nix +++ b/flake.nix @@ -178,6 +178,7 @@ # url = "path:/home/servius/Projects/command-runner"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-minecraft.url = "github:Infinidoge/nix-minecraft"; # alvr = { # url = "path:/home/servius/Projects/ALVR"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/linux/gui.nix b/home/linux/gui.nix index b6714bf5..a3c8287b 100644 --- a/home/linux/gui.nix +++ b/home/linux/gui.nix @@ -21,8 +21,6 @@ }; home.packages = with pkgs; lib.optionals pkgs.stdenv.isLinux [ - mullvad-closest - mullvad-vpn nautilus totem ffmpegthumbnailer @@ -33,7 +31,14 @@ spotify steam-run wl-clipboard - zed-editor - prismlauncher + (prismlauncher.override { + additionalPrograms = [ffmpeg zenity]; + jdks = [ + graalvm-ce + zulu8 + zulu17 + zulu + ]; + }) ]; } diff --git a/nixos/default.nix b/nixos/default.nix index 799eeefd..09cbcba1 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -26,6 +26,7 @@ # inputs.command-runner.nixosModules.command-runner inputs.lanzaboote.nixosModules.lanzaboote inputs.musnix.nixosModules.musnix + inputs.nix-minecraft.nixosModules.minecraft-servers { nixpkgs.config.allowUnfree = true; home-manager = { diff --git a/nixos/mirai/services/default.nix b/nixos/mirai/services/default.nix index 1b2b84e5..1003767b 100644 --- a/nixos/mirai/services/default.nix +++ b/nixos/mirai/services/default.nix @@ -2,26 +2,27 @@ imports = [ ./atuin.nix ./authelia.nix - ./llama.nix - ./minecraft.nix - ./tailscale.nix - ./zerotier.nix ./caddy.nix ./fail2ban.nix ./gitea.nix ./homepage.nix + ./llama.nix + ./minecraft.nix ./nextcloud.nix + ./tailscale.nix + ./zerotier.nix - # ./navidrome.nix # ./home-assistant.nix # ./jellyfin.nix - # ./polaris.nix - # ./syncthing.nix - # ./vscode.nix # ./ldap.nix # ./llama.nix + # ./navidrome.nix # ./nextcloud.nix + # ./paperless.nix + # ./polaris.nix # ./seafile.nix + # ./syncthing.nix + # ./vscode.nix ]; services = { nix-serve = { diff --git a/nixos/mirai/services/homepage.nix b/nixos/mirai/services/homepage.nix index 0af7e3ef..b9eee522 100644 --- a/nixos/mirai/services/homepage.nix +++ b/nixos/mirai/services/homepage.nix @@ -43,6 +43,12 @@ href = "https://deluge.tsuba.darksailor.dev"; }; } + { + "Prowlarr" = { + description = "Prowlarr"; + href = "https://prowlarr.tsuba.darksailor.dev"; + }; + } { "Jackett" = { description = "Jackett"; diff --git a/nixos/mirai/services/jellyfin.nix b/nixos/mirai/services/jellyfin.nix index 5e09ad34..68f69aed 100644 --- a/nixos/mirai/services/jellyfin.nix +++ b/nixos/mirai/services/jellyfin.nix @@ -2,7 +2,7 @@ services = { jellyfin = { enable = false; - openFirewall = true; + openFirewall = false; }; caddy = { virtualHosts."media.darksailor.dev".extraConfig = '' diff --git a/nixos/mirai/services/minecraft.nix b/nixos/mirai/services/minecraft.nix index 72dc3b7b..25c2c6f7 100644 --- a/nixos/mirai/services/minecraft.nix +++ b/nixos/mirai/services/minecraft.nix @@ -1,16 +1,23 @@ -{pkgs, ...}: { - services = { +{ + pkgs, + inputs, + ... +}: { + # imports = [inputs.nix-minecraft.nixosModules.minecraft-servers]; + services = let + whitelist = { + "AbhinavSE" = "8b6c052e-69b3-4bee-b9dc-12eb94653c9e"; + "Serveus" = "79882fb6-d594-4073-a3d0-70a01d0abb67"; + "__Shun__" = "1c7a300f-98e4-402c-8741-432f3494bb25"; + "shashikant" = "20891e82-203c-4d04-9868-79a5879ecfc3"; + }; + in { minecraft-server = { + inherit whitelist; enable = true; openFirewall = true; eula = true; declarative = true; - whitelist = { - "AbhinavSE" = "8b6c052e-69b3-4bee-b9dc-12eb94653c9e"; - "Serveus" = "79882fb6-d594-4073-a3d0-70a01d0abb67"; - "__Shun__" = "1c7a300f-98e4-402c-8741-432f3494bb25"; - "shashikant" = "20891e82-203c-4d04-9868-79a5879ecfc3"; - }; serverProperties = { motd = "Servius's Minecraft Server"; level-seed = "4504535438041489910"; @@ -27,5 +34,23 @@ jre_headless = getJavaVersion 21; }; }; + # minecraft-servers = { + # enable = true; + # eula = true; + # openFirewall = true; + # servers.fabric = { + # inherit whitelist; + # enable = true; + # jvmOpts = "-Xmx4G -Xms4G"; + # package = pkgs.fabricServers.fabric-1_21_7; + # serverProperties = { + # motd = "Servius's Fabric Minecraft Server"; + # server-port = 25567; + # level-seed = "4504535438041489910"; + # view-distance = 24; + # white-list = true; + # }; + # }; + # }; }; } diff --git a/nixos/mirai/services/paperless.nix b/nixos/mirai/services/paperless.nix new file mode 100644 index 00000000..9ed6ff7d --- /dev/null +++ b/nixos/mirai/services/paperless.nix @@ -0,0 +1,29 @@ +{ + pkgs, + config, + ... +}: { + sops = { + secrets."paperless/adminpass".owner = config.users.users.paperless.name; + }; + services = { + paperless = { + enable = true; + passwordFile = config.sops.secrets."paperless/adminpass".path; + environmentFile = pkgs.writeText "paperless.env" '' + PAPERLESS_ENABLE_HTTP_REMOTE_USER=true + PAPERLESS_URL=https://paperless.darksailor.dev + PAPERLESS_SECRET_KEY=${config.sops.placeholder."paperless/secret_key"} + ''; + }; + caddy = { + virtualHosts."paperless.darksailor.dev".extraConfig = '' + forward_auth localhost:5555 { + uri /api/authz/forward-auth + copy_headers Remote-User Remote-Groups Remote-Email Remote-Name + } + reverse_proxy localhost:28981 + ''; + }; + }; +} diff --git a/overlays.nix b/overlays.nix index d9275c56..7c00238b 100644 --- a/overlays.nix +++ b/overlays.nix @@ -277,6 +277,7 @@ in [ inputs.nno.overlays.default inputs.nur.overlays.default inputs.rust-overlay.overlays.default + inputs.nix-minecraft.overlay jellyfin libfprint misc-applications diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 7b063b8a..30fb0be2 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,5 +1,8 @@ nextcloud: adminpass: ENC[AES256_GCM,data:v9WXJ3Ig5NcWd+02P8VnaNkMy2yfEQ==,iv:LfS0avmRZfjdqjNE69h7L90ePzzdmtP57X+0U1vAMvs=,tag:Dq90tfGAUyqzTW3oM96IRg==,type:str] +paperless: + adminpass: ENC[AES256_GCM,data:SkW+uh8/WlpJOgEF5GIIt5UygLU=,iv:KaKAmqJxSs822be6FsthJZ3dactgOckwrXLNa3dx350=,tag:40kSGe1O5d6killRdZiSYQ==,type:str] + secret_key: ENC[AES256_GCM,data:9OkJ/WRLHCQXA0a/FqMieoUX5Lk=,iv:br2OSWU6uQ4/JAEvYeRlA1buhF2PGyPCdGYx0OwROek=,tag:cgnmTTWgkga6E0krWXFIdw==,type:str] llama: user: ENC[AES256_GCM,data:qWbhnc/XLotWzqbEa6ekuMe5kD/GwC9SW8omXvgWqCG1BPPCOI3DtlS4YqKxsIhYmw8MQw+4DPnaWHqjrbIsVSrQ79M=,iv:VeqkKb1N9NSKfuilG6dzYdha8cO4JqJ+YUzmkjrPU+0=,tag:SYwR1oU6VWzNoCBPsMg0uQ==,type:str] api_key: ENC[AES256_GCM,data:wib+xbb25sTY2K9pacc1mU5eVSyQRurHiCMZyDVSqCAmG4yjkzEykvBevpThNbTZlsk6GZuK4hH0SYJM,iv:GTU6CQ83chXHAuuL0bFMf4L+UWqlcVfXnEE0/SxLzj4=,tag:0LkOSQsuuQd6TK3KHE95TA==,type:str] @@ -41,7 +44,7 @@ sops: VGZKdHpVeFRpQUxtSEkyaEhLMlBJcGsKLb0DvPNZosPBUuiX6qz1s5IO5INQh8CK ZtXTVClwMSmaUYhdSB2gKFrKVZHXTJZ4oAL5t/BpC0pOHyr+o96T3Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-14T22:00:41Z" - mac: ENC[AES256_GCM,data:7cmfdx3YhzZTTEUSadF7NRlSS0zkcElIWwCM1IhOAWbvk0pj9MQqBgu+82efLgA6vUMOExDf3VY1dUM48oNW7Nq/8LRfR6iePVx2GRyewL/z9ZxM25+N0prht555Kg219/AUyBjabD9PYO/3fN68Ald5BMWma/qFX7msPKrnUiA=,iv:+2hAAyLX6O+HiAetlO4L18U3w4D7c2Nc5jzBhiTOtcQ=,tag:hvxIEjEVK5+IDzmCLPgT+Q==,type:str] + lastmodified: "2025-07-09T07:01:27Z" + mac: ENC[AES256_GCM,data:1owtam5J+NvAZovXp1XyvbpouibOAYWyMAhwZ7mHQYOM9lYbJFqYm1L6Wwh0NzHUOvY3FlARzp9XlRRg5Wbq1RwL+LJFFozdgoqUi6/7v0gIM9N7hSFlJO6AH/zNIkke9AyI+pqcMfJad01H2GjClirW0tu99nUSkyIZOqote04=,iv:BJfGJiEX+l81JhrPQbj1ykqO5a4qtRSN+/btAiSCGho=,tag:AtlV2p1JB5qSgYcnT2LNzQ==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/steamdeck/default.nix b/steamdeck/default.nix index 8fad6fbc..c149d58e 100644 --- a/steamdeck/default.nix +++ b/steamdeck/default.nix @@ -1,6 +1,7 @@ { pkgs, config, + home-manager, ... }: { imports = [ @@ -19,5 +20,8 @@ (nixvim.makeNixvim (import ../neovim)) ]; stateVersion = "24.11"; + activation.tailscale-service = home-manager.dag.entryAfter ["writeBoundary"] '' + ${builtins.replaceStrings (builtins.readFile ./tailscaled.service)} + ''; }; } diff --git a/steamdeck/tailscaled.service b/steamdeck/tailscaled.service index e8b1518e..6f531fe3 100644 --- a/steamdeck/tailscaled.service +++ b/steamdeck/tailscaled.service @@ -5,9 +5,9 @@ Wants=network-pre.target After=network-pre.target NetworkManager.service systemd-resolved.service [Service] -ExecStartPre=/nix/store/6qcxjfd0s079l634ivg9bi65zry3iada-tailscale-1.82.5/bin/tailscaled --cleanup -ExecStart=/nix/store/6qcxjfd0s079l634ivg9bi65zry3iada-tailscale-1.82.5/bin/tailscaled --state=/var/lib/tailscale/tailscaled.state --socket=/run/tailscale/tailscaled.sock --port=41641 -ExecStopPost=/nix/store/6qcxjfd0s079l634ivg9bi65zry3iada-tailscale-1.82.5/bin/tailscaled --cleanup +ExecStartPre=/usr/bin/tailscaled --cleanup +ExecStart=/usr/bin/tailscaled --state=/var/lib/tailscale/tailscaled.state --socket=/run/tailscale/tailscaled.sock --port=41641 +ExecStopPost=/usr/bin/tailscaled --cleanup Restart=on-failure