diff --git a/flake.lock b/flake.lock index bc6e6e7..88a037f 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1732650593, - "narHash": "sha256-/fDdm6O0ljOqmN+xlZMxy9NjhFfYxOPCLhCRw11diEA=", + "lastModified": 1733625860, + "narHash": "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "55da6e2363d8298b54f3aba2d8cac8057163e2b7", + "rev": "e2d561c933cd085d68bf0b39c4f78870ad0abbc2", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1728796306, - "narHash": "sha256-X2pD05332WGbP7Ckx2Iw6HVW/Qewhno2WJwuiHIbBCk=", + "lastModified": 1733340944, + "narHash": "sha256-/4cZrvnK1m2seORcYP+pAKoziaCgFCIAOpdkYSLUcaQ=", "owner": "KZDKM", "repo": "Hyswipe", - "rev": "c26676af73d699077039e6d47593bd82d2ecbc07", + "rev": "001b5983ea372bc525c246c8280fd57176a2e0b7", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1734400729, + "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", "type": "github" }, "original": { @@ -119,11 +119,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1732947104, - "narHash": "sha256-AMVSa4H73IAp12Zwpa+2/mE9sFirxxg8gv6gDvADzQI=", + "lastModified": 1734624488, + "narHash": "sha256-swNM0LxzIcyQcyK5SE0Q13qs3MOcJR4KL2+bSv2HHpg=", "owner": "catppuccin", "repo": "nix", - "rev": "7a6e695bbf6220af2b1a6941613d9df1160a32cd", + "rev": "562a0ace199ab59413d5093e31d6745704bd0d11", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -286,9 +286,30 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1726560853, @@ -426,11 +447,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -466,11 +487,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1730743354, - "narHash": "sha256-gU4NySYyXeAzVaF5bI6BKmj2CdgiwGFnuPjXUId3Dx0=", + "lastModified": 1733056338, + "narHash": "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=", "owner": "hyprwm", "repo": "contrib", - "rev": "792f6b83dc719214e0e2a0b380c34f147b28ece2", + "rev": "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466", "type": "github" }, "original": { @@ -495,11 +516,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734364709, + "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", "type": "github" }, "original": { @@ -508,11 +529,42 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733684019, + "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -524,11 +576,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732837919, - "narHash": "sha256-yoKm2+SDxjy783zTGwSWn3LGOO3SOmW5e7CObqFTz+E=", + "lastModified": 1734573361, + "narHash": "sha256-rlHkYVDjKXABfAxdcsHnbdZa/0EWE3g/XnR/Ln96rPA=", "ref": "refs/heads/main", - "rev": "8f83d29f00bfa89d1e8fe94b4dda98fe898b6b0e", - "revCount": 5504, + "rev": "5b714f05f87831e3e930af04649f853d5efb9902", + "revCount": 5570, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -564,6 +616,60 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733940128, + "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -580,11 +686,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "type": "github" }, "original": { @@ -601,11 +707,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1732810179, - "narHash": "sha256-J39wjWN4+dxjwf8Fw5yv1aVcbkOg7oQi42zVY4ZxJMU=", + "lastModified": 1734384415, + "narHash": "sha256-As7Z39Pqoy/dUiaaT8UIPUVGViWiKmRsBUHTGkT2430=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "d26cb2f4396e4fd3477f5f12131c87c2f5002ab7", + "rev": "46d2f5a817a89405cef941d8beb4551425acf3da", "type": "github" }, "original": { @@ -614,6 +720,28 @@ "type": "github" } }, + "hyprsunset": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", + "nixpkgs": "nixpkgs_5", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731163989, + "narHash": "sha256-+M6/ZLT2g6l2JCBBQSNMp8oqXPMMUckWTNhHSXzvlXE=", + "owner": "hyprwm", + "repo": "hyprsunset", + "rev": "adaae9d2adac611151224b054f59db8cb0976779", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprsunset", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -626,11 +754,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1734384247, + "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", "type": "github" }, "original": { @@ -650,6 +778,31 @@ "systems" ] }, + "locked": { + "lastModified": 1733502241, + "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, "locked": { "lastModified": 1727300645, "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", @@ -676,11 +829,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1734384417, + "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", "type": "github" }, "original": { @@ -714,6 +867,31 @@ "type": "github" } }, + "hyprwayland-scanner_3": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -739,15 +917,15 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "umu": "umu" }, "locked": { - "lastModified": 1732758553, - "narHash": "sha256-divlhUduT0/t8D9k11Yd3Ah3xpr302vV1KXxIMb8I3M=", + "lastModified": 1734486355, + "narHash": "sha256-e9ui1RA/Bf57fiABB0ddXy4m/FoqM9yiEv6XtaoTyag=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "effe1d54e23f430d3e803f63e9e47aba33acfb63", + "rev": "3a37d41cbe8cda558c5d1a83e73fd452207cd914", "type": "github" }, "original": { @@ -758,11 +936,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", "type": "github" }, "original": { @@ -789,14 +967,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-lib_2": { @@ -827,6 +1005,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1657425264, @@ -861,11 +1055,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -877,27 +1071,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { @@ -907,7 +1085,39 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1733935885, + "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -923,7 +1133,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -942,7 +1152,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixvim": "nixvim_2" }, "locked": { @@ -967,7 +1177,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -986,12 +1196,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_10", + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1732961569, - "narHash": "sha256-d/yl5ewjzl7Ur98LJFmEky9pbyN6Zx42X5haBJ2V0Pw=", + "lastModified": 1734626672, + "narHash": "sha256-L/FC33I5l9GwaZ55zVDiKROyhAit6yl6yWqxssMl2sk=", "owner": "nix-community", "repo": "NUR", - "rev": "6fac7ca63269695e7928ff742c9b752c183e21ca", + "rev": "7bdb9e6abd154dde4004c499aa1c7707a6dbcb16", "type": "github" }, "original": { @@ -1034,11 +1249,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1734379367, + "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", "type": "github" }, "original": { @@ -1058,9 +1273,10 @@ "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpicker": "hyprpicker", + "hyprsunset": "hyprsunset", "nix-gaming": "nix-gaming", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "nur": "nur" } @@ -1158,6 +1374,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1194,6 +1425,27 @@ "type": "github" } }, + "treefmt-nix_2": { + "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" + } + }, "umu": { "inputs": { "nixpkgs": [ @@ -1203,11 +1455,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1732337089, - "narHash": "sha256-dwFza03ETqrcmVGSCdgDDKTWKRgckpQ3vXkZRCYtM9g=", + "lastModified": 1734207213, + "narHash": "sha256-5CZPAeKm24Y1BKnN8Md3HUViCMCs7AVghRC+05Bdlkk=", "ref": "refs/heads/main", - "rev": "f6a6af3191f5497d95d8f8aaa08826a45da199c4", - "revCount": 842, + "rev": "6189d0d9fd062e89a375db20aeae1d1c009e9833", + "revCount": 869, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -1247,11 +1499,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1734422917, + "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c953db9..79f8c9a 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ }; hypr-contrib.url = "github:hyprwm/contrib"; hyprpicker.url = "github:hyprwm/hyprpicker"; + hyprsunset.url = "github:hyprwm/hyprsunset"; Hyprspace = { url = "github:KZDKM/Hyprspace"; inputs.hyprland.follows = "hyprland"; # Hyprspace uses latest Hyprland. We declare this to keep them in sync. @@ -66,6 +67,13 @@ agenix.nixosModules.default ]; specialArgs = { host="yoshino"; inherit self inputs username ; }; + ichiyo = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/ichiyo) + agenix.nixosModules.default + ]; + specialArgs = { host="sakura"; inherit self inputs username ; }; }; violet = nixpkgs.lib.nixosSystem { inherit system; diff --git a/hosts/ichiyo/default.nix b/hosts/ichiyo/default.nix new file mode 100644 index 0000000..c38c5e8 --- /dev/null +++ b/hosts/ichiyo/default.nix @@ -0,0 +1,36 @@ +{ lib, inputs, pkgs, config, ... }: +{ + imports = [ + ./hardware-configuration.nix + ./../../modules/core + ]; + + powerManagement = { + enable = true; + # powertop.enable = true; + cpuFreqGovernor = lib.mkDefault "ondemand"; + }; + + liv.laptop.enable = true; + + # Bootloader stuff + boot.loader.grub.enable = lib.mkForce true; + boot.loader.grub.device = lib.mkForce "/dev/sda"; + boot.loader.grub.useOSProber = lib.mkForce true; + boot.initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; + boot.loader.grub.enableCryptodisk = lib.mkForce true; + boot.initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".keyFile = lib.mkForce "/crypto_keyfile.bin"; + + networking.hostName = "ichiyo"; + + boot = { + extraModulePackages = with config.boot.kernelPackages; + [ + acpi_call + cpupower + ] + ++ [pkgs.cpupower-gui]; + }; +} diff --git a/hosts/ichiyo/hardware-configuration.nix b/hosts/ichiyo/hardware-configuration.nix new file mode 100644 index 0000000..96cba70 --- /dev/null +++ b/hosts/ichiyo/hardware-configuration.nix @@ -0,0 +1,36 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/348a526e-113e-4b62-b54e-b0bf9ad101a2"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".device = "/dev/disk/by-uuid/729500c5-557b-45c8-ab3f-5c365db28284"; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wwp0s20u4i6.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/core/default.nix b/modules/core/default.nix index 9977a04..9ad8976 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -4,6 +4,7 @@ [(import ./bootloader.nix)] ++ [(import ./docker.nix)] ++ [(import ./hardware.nix)] + ++ [(import ./openrgb.nix)] ++ [(import ./xserver.nix)] ++ [(import ./network.nix)] ++ [(import ./pipewire.nix)] diff --git a/modules/core/hardware.nix b/modules/core/hardware.nix index 90cafcc..036f833 100644 --- a/modules/core/hardware.nix +++ b/modules/core/hardware.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { hardware = { graphics = { @@ -7,5 +7,14 @@ # driSupport32Bit = true; }; enableRedistributableFirmware = true; + opengl = { + extraPackages = with pkgs; [ + amdvlk + ]; + # For 32 bit applications as well + extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk + ]; + }; }; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 8b17913..2ec3a21 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,20 +1,44 @@ -{ ...}: { +{ pkgs, inputs, config, username, host, ...}: imports = - [(import ./git.nix)] # version control - ++ [(import ./swaync/default.nix)] # notification panel - ++ [(import ./fonts.nix)] # fonts - ++ [(import ./hyprland)] # window manager - ++ [(import ./sway)] # window manager - ++ [(import ./kitty.nix)] # terminal - ++ [(import ./mako.nix)] # notification deamon - ++ [(import ./nvim.nix)] # neovim editor - ++ [(import ./zathura.nix)] # neovim editor - ++ [(import ./packages.nix)] # other packages - ++ [(import ./scripts/scripts.nix)] # personal scripts - ++ [(import ./swaylock.nix)] # lock screen - ++ [(import ./vscodium.nix)] # vscode forck - ++ [(import ./waybar)] # status bar - ++ [(import ./wofi.nix)] # launcher - ++ [(import ./zsh.nix)] # shell - ++ [(import ./tmux.nix)]; # terminal multiplexer + if (host == "sakura") then + [(import ./git.nix)] + ++ [(import ./swaync/default.nix)] + ++ [(import ./fonts.nix)] + ++ [(import ./hyprland)] + ++ [(import ./sway)] + ++ [(import ./kitty.nix)] + ++ [(import ./mako.nix)] + ++ [(import ./nvim.nix)] + ++ [(import ./zathura.nix)] + ++ [(import ./packages.nix)] + ++ [(import ./scripts/scripts.nix)] + ++ [(import ./swaylock.nix)] + ++ [(import ./vscodium.nix)] + ++ [(import ./waybar)] + ++ [(import ./wofi.nix)] + ++ [(import ./zsh.nix)] + ++ [(import ./tmux.nix)] + else if (host == "violet") then + [(import ./git.nix)] + ++ [(import ./nvim.nix)] + ++ [(import ./packages.violet.nix)] + ++ [(import ./scripts/scripts.nix)] + ++ [(import ./zsh.nix)] + ++ [(import ./tmux.nix)] + else if (host == "yoshino") then + [(import ./git.nix)] + ++ [(import ./swaync/default.nix)] + ++ [(import ./fonts.nix)] + ++ [(import ./hyprland)] + ++ [(import ./kitty.nix)] + ++ [(import ./mako.nix)] + ++ [(import ./nvim.nix)] + ++ [(import ./zathura.nix)] + ++ [(import ./packages.yoshino.nix)] + ++ [(import ./scripts/scripts.nix)] + ++ [(import ./swaylock.nix)] + ++ [(import ./waybar)] + ++ [(import ./wofi.nix)] + ++ [(import ./zsh.nix)] + ++ [(import ./tmux.nix)]; } diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 2aed0e6..e143dcc 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -28,18 +28,18 @@ color = "black"; }; }; - cursorTheme = { - name = "Bibata-Modern-Ice"; - package = pkgs.bibata-cursors; - size = 24; - }; + # cursorTheme = { + # name = "Bibata-Modern-Ice"; + # package = pkgs.bibata-cursors; + # size = 24; + # }; }; - home.pointerCursor = { - name = "Bibata-Modern-Ice"; - package = pkgs.bibata-cursors; - size = 24; - }; + # home.pointerCursor = { + # name = "Bibata-Modern-Ice"; + # package = pkgs.bibata-cursors; + # size = 24; + # }; # gtk = { # enable = true; @@ -228,8 +228,10 @@ "$mainMod SHIFT, F, exec, firefox" "$mainMod SHIFT, W, exec, wdisplays" "$mainMod SHIFT, T, exec, thunderbird" + "$mainMod SHIFT, E, exec, element-desktop" "$mainMod SHIFT, P, exec, pavucontrol-qt" "$mainMod SHIFT, N ,exec, notes" # should be added by scripts/custom packages + "$mainMod, N,exec, swaync-client -t" # screenshot "SUPER SHIFT, S, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index e4ea538..5cbe8bf 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -11,6 +11,7 @@ glib wayland direnv + inputs.hyprsunset.packages.${pkgs.system}.hyprsunset ]; # systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; wayland.windowManager.hyprland = { @@ -22,7 +23,7 @@ # enableNvidiaPatches = false; systemd.enable = true; plugins = [ - # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace + inputs.Hyprspace.packages.${pkgs.system}.Hyprspace inputs.Hyswipe.packages.${pkgs.system}.Hyswipe ]; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 21f1ab0..b594b19 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -5,43 +5,28 @@ bandwhich # Terminal bandwidth utilization tool powertop element-desktop # Nheko is kinda shit so sadly this has to happen - yewtube # Play YouTube videos via the terminal iamb # In-terminal-Matrix-messaging signal-desktop # Since the bridge is broken :( - socat # Required for `hyprland-smart-borders` tesseract # Screen grabbing text from images/PDFs/etc pixcat # Display images in the terminal lm_sensors # Show sensor outputs, i.e. temperatures yubikey-touch-detector # Display notification when YubiKey requires a headpat bitwarden-cli # Use Bitwarden as a CLI secrets manager - gajim # XMPP client - nheko # Matrix client - linuxKernel.packages.linux_hardened.v4l2loopback # Use A7ii as webcam # wikit # Wikipedia summaries from the terminal, not added to Nix yet # reader # Firefox reader mode but in the terminal, not added to Nix yet vimv # edit filenames in batch with $EDITOR - pastel # generate, analyze, convert and manipulate colors + # pastel # generate, analyze, convert and manipulate colors glow # Render Markdown from the terminal - htmlq # jq but for HTML - lemmeknow # Identify anything + # htmlq # jq but for HTML android-tools # ADB/Fastboot eva # Calculator - tofi # drun type launcher - # termpdfpy # Read PDFs from the terminal, errors out for now - anki-bin # Learn languages - vimv # Bulk rename - audacity # Record audio stuff + anki-bin # Flashcards obs-studio # Record video stuff exiftool # Read exif data from CLI - pinta # "Paint.NET-like editor" - kdenlive # Video editor translate-shell # Google Translate but in the CLI wireguard-tools # VPN connections openresolv # required for wireguard-tools - prusa-slicer - blender progress - epy zip ripdrag pwgen @@ -60,14 +45,13 @@ gitleaks # TODO: adds pre-commit hook libreoffice xfce.thunar - prismlauncher lunar-client - jdk ripgrep yt-dlp - wineWowPackages.wayland + # wineWowPackages.wayland # element-desktop # wayland version is very laggy for me spotify + spotify-player thunderbird neofetch hyfetch @@ -84,7 +68,6 @@ ffmpeg killall libnotify - man-pages # extra man pages mpv # video player openssl pamixer # pulseaudio command line mixer diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index c5c3108..d63ffa0 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -152,6 +152,7 @@ # ]; shellAliases = { + spt = "spotify_player"; convert = "magick"; ls = "eza -lh --git"; la = "eza -A --git"; diff --git a/modules/services/binternet-proxy.nix b/modules/services/binternet-proxy.nix new file mode 100644 index 0000000..e1ffe1f --- /dev/null +++ b/modules/services/binternet-proxy.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + services = { + nginx.virtualHosts."curate.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://localhost:8081"; + proxyWebsockets = true; + }; + }; + }; +} diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin.nix new file mode 100644 index 0000000..fd4fa6b --- /dev/null +++ b/modules/services/jellyfin.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = [ + pkgs.jellyfin + pkgs.jellyfin-web + pkgs.jellyfin-ffmpeg + ]; + + services = { + jellyfin = { + enable = true; + }; + nginx.virtualHosts = { + "stream.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://localhost:8096"; + proxyWebsockets = true; + }; + }; + }; + }; +} diff --git a/modules/services/komga.nix b/modules/services/komga.nix deleted file mode 100644 index f5f18a5..0000000 --- a/modules/services/komga.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, config, pkgs, ... }: { - services.komga = { - enable = true; - port = 2872; - stateDir = "/var/lib/komga"; - openFirewall = true; - user = "liv"; - }; - - services = { - nginx.virtualHosts."read.liv.town" = { - useACMEHost = "liv.town"; - forceSSL = true; - locations."/" = { - proxyPass = "http://localhost:2872"; - }; - }; - }; - -} diff --git a/modules/services/librey-proxy.nix b/modules/services/librey-proxy.nix new file mode 100644 index 0000000..92da713 --- /dev/null +++ b/modules/services/librey-proxy.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + services = { + nginx.virtualHosts."search.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://localhost:8080"; + proxyWebsockets = true; + }; + }; + }; +} diff --git a/modules/services/lidarr.nix b/modules/services/lidarr.nix new file mode 100644 index 0000000..a8c41a0 --- /dev/null +++ b/modules/services/lidarr.nix @@ -0,0 +1,21 @@ +{ ... }: + +{ + services = { + lidarr = { + enable = true; + }; + + nginx.virtualHosts = { + "listen.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://127.0.0.1:8686/"; + proxyWebsockets = true; + }; + }; + }; + }; +} diff --git a/modules/services/ntfy.nix b/modules/services/ntfy.nix index 71a28f5..66d7a2b 100644 --- a/modules/services/ntfy.nix +++ b/modules/services/ntfy.nix @@ -15,7 +15,10 @@ in { nginx.virtualHosts.${hostname} = { useACMEHost = "liv.town"; forceSSL = true; - locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; }; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString port}"; + proxyWebsockets = true; + }; }; frp.settings.proxies = [ { diff --git a/modules/services/radicale.nix b/modules/services/radicale.nix index a652fa1..d601bca 100644 --- a/modules/services/radicale.nix +++ b/modules/services/radicale.nix @@ -6,30 +6,33 @@ server.hosts = [ "0.0.0.0:5232" ]; auth = { type = "htpasswd"; - htpasswd_filename = "/home/liv/radicaleusers"; + htpasswd_filename = "/etc/radicale/htpasswd"; htpasswd_encryption = "bcrypt"; }; }; }; - # services.nginx = { - # enable = true; - # recommendedProxySettings = true; - # recommendedTlsSettings = true; - # virtualHosts = { - # "calendar.liv.town" = { - # forceSSL = true; - # enableACME = true; - # # locations."/radicale/" = { - # locations."/" = { - # proxyPass = "http://127.0.0.1:5232/"; - # extraConfig = '' - # # proxy_set_header X-Script-Name /radicale; - # proxy_set_header X-Script-Name /; - # proxy_pass_header Authorization; - # ''; - # }; - # }; - # }; - # }; + services.nginx = { + enable = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts = { + "plan.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + # locations."/radicale/" = { + locations."/" = { + proxyPass = "http://127.0.0.1:5232/"; + proxyWebsockets = true; + extraConfig = '' + proxy_connect_timeout 300; + proxy_send_timeout 300; + proxy_read_timeout 300; + send_timeout 300; + ''; + }; + }; + }; + }; } diff --git a/modules/services/readarr.nix b/modules/services/readarr.nix new file mode 100644 index 0000000..8fdf88f --- /dev/null +++ b/modules/services/readarr.nix @@ -0,0 +1,20 @@ +{ ... }: +{ + services = { + readarr = { + enable = true; + }; + + nginx.virtualHosts = { + "read.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://127.0.0.1:8787/"; + proxyWebsockets = true; + }; + }; + }; + }; +} diff --git a/modules/services/scrutiny.nix b/modules/services/scrutiny.nix new file mode 100644 index 0000000..ebe64d8 --- /dev/null +++ b/modules/services/scrutiny.nix @@ -0,0 +1,18 @@ +{ ... }: + +{ + services.scrutiny = { + enable = true; + collector.enable = true; + settings.web.listen.port = 8181; + settings.notify.urls = [ + "ntfy://notify.liv.town/violet" + ]; + }; + + services.nginx.virtualHosts."scrutiny.liv.town" = { + locations."/" = { + proxyPass = "http://localhost:8181/"; + }; + }; +} diff --git a/modules/services/sharkey-proxy.nix b/modules/services/sharkey-proxy.nix index 4eddaf2..b06dcc4 100644 --- a/modules/services/sharkey-proxy.nix +++ b/modules/services/sharkey-proxy.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ ... }: { services = { nginx.virtualHosts."quack.social" = { diff --git a/modules/services/violet.nix b/modules/services/violet.nix index f7f1d7f..fd9621b 100644 --- a/modules/services/violet.nix +++ b/modules/services/violet.nix @@ -4,12 +4,20 @@ ++ [(import ./mumble.nix)] ++ [(import ./ntfy.nix)] ++ [(import ./sharkey-proxy.nix)] + ++ [(import ./librey-proxy.nix)] + ++ [(import ./binternet-proxy.nix)] ++ [(import ./monitoring.nix)] ++ [(import ./docker.nix)] ++ [(import ./gokapi.nix)] ++ [(import ./nginx.nix)] - ++ [(import ./komga.nix)] + # ++ [(import ./komga.nix)] ++ [(import ./frp.nix)] + ++ [(import ./radicale.nix)] + ++ [(import ./jellyfin.nix)] + ++ [(import ./readarr.nix)] + ++ [(import ./lidarr.nix)] + # ++ [(import ./scrutiny.nix)] + # ++ [(import ./jitsi-meet.nix)] # ++ [(import ./nextcloud.nix)] ++ [(import ./matrix/default.nix)]; # ++ [(import ./tmux.nix)];