diff --git a/flake.lock b/flake.lock index a9bfd5e..2fac085 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1730968822, + "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "comfyui": { "inputs": { "comfyui": "comfyui_2", @@ -25,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-/oS8eQ7LvBzZx37otTguGK2XQR8eQwj/WI08FljssbE=", + "narHash": "sha256-7oaN0HXDIpTAHQxu6+hE/0n4rkuLAV/GYSGBOfOPAB8=", "path": "./flakes/ComfyUI-Plugins", "type": "path" }, @@ -84,15 +117,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -168,7 +201,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -232,10 +265,10 @@ }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable" + "flake-compat": "flake-compat_2", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_10", + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1729104314, @@ -252,6 +285,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "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_2": { "inputs": { "nixpkgs": [ "nix-rice", @@ -315,6 +370,164 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs_4", + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_2", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1731254055, + "narHash": "sha256-OLEpnZ1b7oT7yHKRigweL1xn6vHYzaPoWRuEitzJigk=", + "path": "/nix/store/k01761gz6v14dgwb8cz5mlvzqb1a7g26-source", + "rev": "9e628067fc54851dc9138c2882abb21f72c5a5a6", + "type": "path" + }, + "original": { + "id": "hyprland", + "type": "indirect" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "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" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1731163338, + "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "kitty-themes-src": { "flake": false, "locked": { @@ -334,11 +547,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1730764481, - "narHash": "sha256-Fyor1ynFLPdNM+eazlX95eca8PBLCi2op4+tixs5SXs=", - "rev": "1c28270c9d18e3a4913f70d62428b43973aa256a", + "lastModified": 1731235488, + "narHash": "sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM=", + "rev": "d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1c28270c9d18e3a4913f70d62428b43973aa256a.tar.gz?rev=1c28270c9d18e3a4913f70d62428b43973aa256a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771.tar.gz?rev=d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771" }, "original": { "type": "tarball", @@ -357,11 +570,11 @@ ] }, "locked": { - "lastModified": 1727752861, - "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", - "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", + "lastModified": 1731185731, + "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", + "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34" }, "original": { "type": "tarball", @@ -416,11 +629,11 @@ "murex": { "flake": false, "locked": { - "lastModified": 1729788399, - "narHash": "sha256-sh88YPBX0uCHqutwipBtK6Y6c7FjivcD1ujdR7LEDhs=", + "lastModified": 1731098536, + "narHash": "sha256-fEQ5q1jTgKOIcu6i6BvXh1bI+38oS1iquZE50m4ZGmA=", "owner": "lmorg", "repo": "murex", - "rev": "2164bcbf9a410b110e22207189a8906236b5dd1c", + "rev": "59b5468bf29bae77d952c0b7cf2528cbab7f048f", "type": "github" }, "original": { @@ -432,7 +645,7 @@ }, "murex-jump": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "src": "src" }, "locked": { @@ -448,7 +661,7 @@ }, "murex-starship": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "src": "src_2" }, "locked": { @@ -464,7 +677,7 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1728371783, @@ -480,16 +693,72 @@ "type": "github" } }, - "nix-index-database": { + "niri": { "inputs": { - "nixpkgs": "nixpkgs_7" + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs_8", + "nixpkgs-stable": "nixpkgs-stable_2", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1730604744, - "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", + "lastModified": 1731269425, + "narHash": "sha256-qgwdIlBWvSN+mThrvjfo6rRnkLVBThZggrCytDuzdM0=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "28e1701eda8eac4aa0da250cb50dfd1017235795", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1731164272, + "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v0.1.10", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1731221223, + "narHash": "sha256-E9lhNv83Z4R+c2H+ymLgybHZ+KylU0QHzO7sh5IHD/E=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "010a2368823bc3959c1468609cd05367e5b6d0b6", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, + "nix-index-database": { + "inputs": { + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1731209121, + "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", + "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "type": "github" }, "original": { @@ -503,9 +772,9 @@ "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_11", "nixpkgs-lib": "nixpkgs-lib_2", - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1729607649, @@ -525,15 +794,15 @@ "inputs": { "flake-parts": "flake-parts_2", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_12", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730169047, - "narHash": "sha256-CmvRSsW97XVrc0WrE2v/acRsfdRhFiFKRwg7PmfYKPc=", + "lastModified": 1731087557, + "narHash": "sha256-W70xy7WFqA5940zhodAsGiC/nvqGwZ07YE34ObMK/po=", "owner": "nix-community", "repo": "nixd", - "rev": "20290ee46699f7c62528d8f44bab1aeac7c8fcf1", + "rev": "1cf9ec0a82bcac57c7c12b6378bd8c28513cd3a6", "type": "github" }, "original": { @@ -542,27 +811,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_11", - "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1730830166, - "narHash": "sha256-F2SA8PkrV+Ed8WZKwEimO2oBxQJFJU2ni/wqIbupX4Y=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "49ee81f51e7449314af27915f3719cc76e9abe1f", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1729880355, @@ -622,6 +870,38 @@ } }, "nixpkgs-stable": { + "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-stable_2": { + "locked": { + "lastModified": 1730963269, + "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -637,29 +917,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { "locked": { - "lastModified": 1714562304, - "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { @@ -671,11 +935,42 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1729507178, + "narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e156ec8b02301cd455ab96bbd53ebd7bf7d1e29d", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1730831018, + "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { + "locked": { + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -716,15 +1011,18 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "path" + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_5": { @@ -741,6 +1039,19 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1727540905, "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", @@ -756,13 +1067,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -772,44 +1083,29 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1729507178, - "narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=", - "owner": "nixos", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e156ec8b02301cd455ab96bbd53ebd7bf7d1e29d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1730846050, - "narHash": "sha256-G7z96CG11PVoBwZFFaak5jmXLY+z6d9Y1/aJBvy0YeI=", + "lastModified": 1731275204, + "narHash": "sha256-g54hkRM0SfYOyAADwaJ5XuZyEoNSWLBWiB2pYBmj8q8=", "owner": "nix-community", "repo": "NUR", - "rev": "dee01da6357dd27c51d5a59237affd11eaee4a75", + "rev": "cbbf744eff5a0cb1c8504170989d003abdd08510", "type": "github" }, "original": { @@ -837,11 +1133,11 @@ "podman": { "flake": false, "locked": { - "lastModified": 1730837388, - "narHash": "sha256-UoLMKEyl/xqBRriQ3AY/ZXX0/A6+NFOI/PpGHeNkZIM=", + "lastModified": 1731082507, + "narHash": "sha256-lCKoRNM20AJDgswOqcTqcRzMjXwe9GizLcF1lFCF7TA=", "owner": "containers", "repo": "podman", - "rev": "c0e24c6b60cfae21ab441b40c7ea3d622d09027d", + "rev": "483a1327d1551c8f157b6333f490366c07473ce6", "type": "github" }, "original": { @@ -850,6 +1146,30 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "comfyui": "comfyui", @@ -857,6 +1177,7 @@ "flatpaks": "flatpaks", "helix": "helix", "home-manager": "home-manager", + "hyprland": "hyprland", "lix": "lix", "lix-module": "lix-module", "madness": "madness", @@ -865,20 +1186,14 @@ "murex-jump": "murex-jump", "murex-starship": "murex-starship", "nh": "nh", + "niri": "niri", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", "nixd": "nixd", - "nixos-cosmic": "nixos-cosmic", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_13", "nur": "nur", "podman": "podman", - "rust-overlay": [ - "nixos-cosmic", - "rust-overlay" - ] + "rust-overlay": "rust-overlay_2" } }, "rust-overlay": { @@ -905,16 +1220,15 @@ "rust-overlay_2": { "inputs": { "nixpkgs": [ - "nixos-cosmic", "nixpkgs" ] }, "locked": { - "lastModified": 1730687492, - "narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=", + "lastModified": 1731119076, + "narHash": "sha256-2eVhmocCZHJlFAz6Mt3EwPdFFVAtGgIySJc1EHQVxcc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "41814763a2c597755b0755dbe3e721367a5e420f", + "rev": "23c4b3ba5f806fcf25d5a3b6b54fa0d07854c032", "type": "github" }, "original": { @@ -972,16 +1286,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1015,6 +1329,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tensorrt": { "flake": false, "locked": { @@ -1054,7 +1383,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -1069,6 +1398,80 @@ "repo": "flake-utils", "type": "github" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1730743262, + "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1730166465, + "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1731123454, + "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ca1a51d..f6317c2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,16 +2,14 @@ description = "nixos config"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.follows = "nixos-cosmic/nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nur.url = "github:/nix-community/NUR"; - # rust-overlay = { - # url = "github:oxalica/rust-overlay"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - rust-overlay.follows = "nixos-cosmic/rust-overlay"; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; helix.url = "github:helix-editor/helix"; @@ -29,7 +27,6 @@ flatpaks.url = "github:gmodena/nix-flatpak"; - nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; madness.url = "github:antithesishq/madness"; @@ -70,12 +67,13 @@ murex-jump.url = "path:./flakes/murex-module-jump"; murex-starship.url = "path:./flakes/murex-module-starship"; + + niri.url = "github:sodiboo/niri-flake"; }; outputs = { self, nixpkgs, - nixos-cosmic, home-manager, nur, flatpaks, @@ -84,6 +82,8 @@ lix-module, meat, comfyui, + hyprland, + niri, ... } @ inputs: let inherit (self) outputs; @@ -94,7 +94,7 @@ madness.nixosModules.madness nur.nixosModules.nur nix-index-database.nixosModules.nix-index - nixos-cosmic.nixosModules.default + niri.nixosModules.niri ./system/cachix.nix ]; system = "x86_64-linux"; diff --git a/flakes/ComfyUI-Plugins/gguf/default.nix b/flakes/ComfyUI-Plugins/gguf/default.nix index 9800f1a..3c45e0f 100644 --- a/flakes/ComfyUI-Plugins/gguf/default.nix +++ b/flakes/ComfyUI-Plugins/gguf/default.nix @@ -4,7 +4,7 @@ python3Packages, ... }: let - inherit (python3Packages) gguf numpy; + inherit (python3Packages) gguf numpy pyyaml; in pkgs.stdenvNoCC.mkDerivation { pname = "comfyui-gguf"; @@ -13,6 +13,7 @@ in propagatedBuildInputs = [ gguf numpy + pyyaml ]; installPhase = '' mkdir -p $out diff --git a/home/home.nix b/home/home.nix index 38093fd..5407be8 100644 --- a/home/home.nix +++ b/home/home.nix @@ -13,9 +13,9 @@ in { ./modules/desktop.nix ./modules/dev.nix ./modules/theming.nix + ./modules/niri.nix ./util/ez.nix ./util/flatpak.nix - ./util/cosmic.nix ./util/murex.nix ./util/name.nix inputs.nix-index-database.hmModules.nix-index @@ -30,23 +30,19 @@ in { xdg = { enable = true; portal = let - cosmic = pkgs.xdg-desktop-portal-cosmic; gtk = pkgs.xdg-desktop-portal-gtk; + gnome = pkgs.xdg-desktop-portal-gnome; in { enable = true; config = { common = { default = [ - "cosmic" + "gnome" ]; }; }; - configPackages = [ - cosmic - gtk - ]; extraPortals = [ - cosmic + gnome gtk ]; }; diff --git a/home/modules/desktop.nix b/home/modules/desktop.nix index f1cb2ac..0677fdc 100644 --- a/home/modules/desktop.nix +++ b/home/modules/desktop.nix @@ -14,5 +14,6 @@ nautilus thunderbird keepassxc + wofi ]; } diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix new file mode 100644 index 0000000..909e93a --- /dev/null +++ b/home/modules/hyprland.nix @@ -0,0 +1,97 @@ +{ + pkgs, + lib, + inputs, + ... +}: let + rice = pkgs.rice; + palette = pkgs.lib.nix-rice.palette.toRGBShortHex rice.palette; +in { + programs.hyprlock = { + # enable = true; + }; + + services.hypridle = { + # enable = true; + }; + + services.hyprpaper = { + # enable = true; + }; + + wayland.windowManager.hyprland = { + enable = true; + package = inputs.hyprland.packages.x86_64-linux.hyprland; + systemd = { + enable = true; + variables = ["--all"]; + }; + settings = { + "$mainMod" = "SUPER"; + general = let + inherit (rice.borders) thickness; + inherit (palette) normal; + in { + inherit (rice.borders) gaps_in gaps_out; + border_size = thickness; + layout = "dwindle"; + "col.inactive_border" = "rgb(${normal.black})"; + "col.active_border" = "rgb(${normal.yellow})"; + "col.nogroup_border" = "rgb(${normal.black})"; + "col.nogroup_border_active" = "rgb(${normal.yellow})"; + snap.enabled = true; + }; + cursor = { + no_hardware_cursors = true; + }; + decoration = { + inherit (rice.borders) rounding; + blur.enabled = false; + shadow.enabled = false; + }; + # input.numlock_by_default = true; + # groups = let + # inherit (palette) normal; + # in { + # "col.border_active" = "rgb(${normal.red})"; + # "col.border_inactive" = "rgb(${normal.black})"; + # "col.border_locked_active" = "rgb(${normal.red})"; + # "col.border_locked_inactive" = "rgb(${normal.black})"; + # }; + misc = { + disable_hyprland_logo = true; + disable_splash_rendering = true; + vrr = 0; + mouse_move_enables_dpms = true; + key_press_enables_dpms = true; + layers_hog_keyboard_focus = true; + background_color = "rgb(${palette.normal.black})"; + }; + dwindle = { + pseudotile = true; + force_split = 2; + preserve_split = true; + }; + monitor = [ + "DP-1, 2560x1440@165, 1080x0, 1" + "HDMI-A-2, 1920x1080@60, auto-left, 1" + "Unknown-1, disable" + ]; + bind = let + makeDirBind = bind: extraMods: + lib.mapAttrsToList (key: dir: "$mainMod${extraMods}, ${key}, ${bind}, ${dir}") + { + h = "l"; + j = "d"; + k = "u"; + l = "r"; + }; + in + [ + "$mainMod, Return, exec, ${lib.getExe pkgs.kitty}" + ] + ++ makeDirBind "movefocus" "" + ++ makeDirBind "movewindow" "+SHIFT"; + }; + }; +} diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 18b904e..b01938f 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -1,7 +1,140 @@ -{...}: { - programs.niri = { - enable = true; - settings = { +{ + pkgs, + lib, + config, + ... +}: let + services = let + inherit (pkgs) ironbar swaynotificationcenter; + in [ + ironbar + swaynotificationcenter + ]; + errata = let + inherit (pkgs) anyrun; + in [ + anyrun + ]; + extraServices = let + inherit (pkgs) swayidle swaylock swaybg systemd niri-unstable; + in [ + { + name = "swaybg"; + value = "${lib.getExe swaybg} -m fill -i /home/${config.mainUser}/.nix/wallpaper.jpg"; + } + { + name = "swayidle"; + value = let + lock = lib.getExe pkgs.swaylock; + niri = lib.getExe niri-unstable; + systemctl = lib.getExe' systemd "systemctl"; + in '' + ${lib.getExe swayidle} -w \ + timeout 1200 '${systemctl} suspend' \ + timeout 601 '${niri} msg action power-off-monitors' \ + timeout 600 '${lock} -f' \ + before-sleep '${lock} -f' + ''; + } + ]; +in { + home.packages = errata; + ezServices = let + attrify = + map (entry: { + name = "${entry.pname}"; + value = "${lib.getExe entry}"; + }) + services; + in + builtins.listToAttrs ( + attrify + ++ extraServices + ); + programs.niri.settings = let + inherit (lib) range nameValuePair mapAttrs'; + inherit (builtins) listToAttrs replaceStrings; + inherit (config.lib.niri) actions; + in { + binds = let + hBinds = { + H = "left"; + L = "right"; + }; + vBinds = { + J = "down"; + K = "up"; + }; + makeDirBind = mods: cmd: keys: + mapAttrs' ( + key: dir: + nameValuePair + "${mods}+${key}" + {action = actions."${replaceStrings ["$DIR"] ["${dir}"] "${cmd}"}";} + ) + keys; + makeWsBind = mods: cmd: + listToAttrs (map (num: { + name = "${mods}+${builtins.toString num}"; + value = {action."${cmd}" = num;}; + }) (range 0 6)); + in + { + "Mod+D".action.spawn = "anyrun"; + "Mod+F".action.spawn = "firefox"; + "Mod+E".action.spawn = "nautilus"; + "Mod+Return".action.spawn = "kitty"; + "Mod+Shift+E".action.spawn = "wlogout"; + "Mod+Shift+Q".action = actions.close-window; + "Mod+Shift+S".action = actions.screenshot; + "Mod+R".action = actions.switch-preset-column-width; + "Mod+Shift+Space".action = actions.maximize-column; + } + // makeDirBind "Mod" "focus-window-or-workspace-$DIR" vBinds + // makeDirBind "Mod" "focus-column-or-monitor-$DIR" hBinds + // makeDirBind "Mod+Shift" "move-window-to-workspace-$DIR" vBinds + // makeDirBind "Mod+Shift" "move-column-$DIR-or-to-monitor-$DIR" hBinds + // makeDirBind "Mod+Ctrl" "consume-or-expel-window-$DIR" hBinds + // makeWsBind "Mod" "focus-workspace" + // makeWsBind "Mod+Shift" "move-window-to-workspace"; + prefer-no-csd = true; + outputs = { + "Unknown-1".enable = false; + "HDMI-A-2" = { + transform.rotation = 90; + scale = 1; + }; + "DP-1" = { + variable-refresh-rate = true; + scale = 1; + }; + }; + input = { + warp-mouse-to-focus = true; + workspace-auto-back-and-forth = true; + }; + cursor = { + hide-after-inactive-ms = 5000; + hide-when-typing = true; + size = 16; + }; + layout = { + always-center-single-column = true; + gaps = 24; + default-column-width.proportion = 0.5; + preset-column-widths = + map + (p: {proportion = p;}) + [ + (2.0 / 3.0) + 0.5 + (1.0 / 3.0) + ]; }; }; + + programs.swaylock = { + enable = true; + settings.color = (pkgs.lib.nix-rice.palette.toRGBShortHex pkgs.rice.palette).normal.black; + }; } diff --git a/home/modules/theming.nix b/home/modules/theming.nix index 1871400..7518699 100644 --- a/home/modules/theming.nix +++ b/home/modules/theming.nix @@ -13,13 +13,9 @@ gtk = with pkgs; with rice; { enable = true; - # theme = with gtk-theme; { - # inherit package name; - # }; - # theme = { - # name = "adw-gtk3-dark"; - # package = adw-gtk3; # cosmic - # }; + theme = with gtk-theme; { + inherit package name; + }; iconTheme = with icons; { inherit package name; }; diff --git a/home/util/ez.nix b/home/util/ez.nix index 4f6aaad..31378b2 100644 --- a/home/util/ez.nix +++ b/home/util/ez.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: { options = { @@ -30,8 +29,8 @@ }; }; - config = rec { - systemd.user.services = with pkgs; + config = { + systemd.user.services = builtins.mapAttrs (name: cmd: { Unit = { Description = "${name}"; diff --git a/mullvad/au-syd-wg-001.conf b/mullvad/au-syd-wg-001.conf index bca625a..55f3731 100644 --- a/mullvad/au-syd-wg-001.conf +++ b/mullvad/au-syd-wg-001.conf @@ -1,7 +1,7 @@ [Interface] -# Device: Neat Sloth -PrivateKey = cDa2KkMYzCJRpvhq8Nt1ZnOieyS9xbrwfOn+iuPpwXw= -Address = 10.65.23.71/32,fc00:bbbb:bbbb:bb01::2:1746/128 +# Device: Deep Cat +PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= +Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 DNS = 10.64.0.1 [Peer] diff --git a/mullvad/au-syd-wg-002.conf b/mullvad/au-syd-wg-002.conf index ebfac9d..d05605f 100644 --- a/mullvad/au-syd-wg-002.conf +++ b/mullvad/au-syd-wg-002.conf @@ -1,7 +1,7 @@ [Interface] -# Device: Neat Sloth -PrivateKey = cDa2KkMYzCJRpvhq8Nt1ZnOieyS9xbrwfOn+iuPpwXw= -Address = 10.65.23.71/32,fc00:bbbb:bbbb:bb01::2:1746/128 +# Device: Deep Cat +PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= +Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 DNS = 10.64.0.1 [Peer] diff --git a/mullvad/au-syd-wg-003.conf b/mullvad/au-syd-wg-003.conf index 9ad01ff..576160e 100644 --- a/mullvad/au-syd-wg-003.conf +++ b/mullvad/au-syd-wg-003.conf @@ -1,7 +1,7 @@ [Interface] -# Device: Neat Sloth -PrivateKey = cDa2KkMYzCJRpvhq8Nt1ZnOieyS9xbrwfOn+iuPpwXw= -Address = 10.65.23.71/32,fc00:bbbb:bbbb:bb01::2:1746/128 +# Device: Deep Cat +PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= +Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 DNS = 10.64.0.1 [Peer] diff --git a/mullvad/au-syd-wg-101.conf b/mullvad/au-syd-wg-101.conf index 0c7bbc0..2adc148 100644 --- a/mullvad/au-syd-wg-101.conf +++ b/mullvad/au-syd-wg-101.conf @@ -1,7 +1,7 @@ [Interface] -# Device: Neat Sloth -PrivateKey = cDa2KkMYzCJRpvhq8Nt1ZnOieyS9xbrwfOn+iuPpwXw= -Address = 10.65.23.71/32,fc00:bbbb:bbbb:bb01::2:1746/128 +# Device: Deep Cat +PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= +Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 DNS = 10.64.0.1 [Peer] diff --git a/mullvad/au-syd-wg-102.conf b/mullvad/au-syd-wg-102.conf index 9589511..f8ffe42 100644 --- a/mullvad/au-syd-wg-102.conf +++ b/mullvad/au-syd-wg-102.conf @@ -1,7 +1,7 @@ [Interface] -# Device: Neat Sloth -PrivateKey = cDa2KkMYzCJRpvhq8Nt1ZnOieyS9xbrwfOn+iuPpwXw= -Address = 10.65.23.71/32,fc00:bbbb:bbbb:bb01::2:1746/128 +# Device: Deep Cat +PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= +Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 DNS = 10.64.0.1 [Peer] diff --git a/mullvad/au-syd-wg-103.conf b/mullvad/au-syd-wg-103.conf index df5ffbc..f96f62f 100644 --- a/mullvad/au-syd-wg-103.conf +++ b/mullvad/au-syd-wg-103.conf @@ -1,7 +1,7 @@ [Interface] -# Device: Neat Sloth -PrivateKey = cDa2KkMYzCJRpvhq8Nt1ZnOieyS9xbrwfOn+iuPpwXw= -Address = 10.65.23.71/32,fc00:bbbb:bbbb:bb01::2:1746/128 +# Device: Deep Cat +PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= +Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 DNS = 10.64.0.1 [Peer] diff --git a/mullvad/au-syd-wg-104.conf b/mullvad/au-syd-wg-104.conf index f3de6dd..ea63cfb 100644 --- a/mullvad/au-syd-wg-104.conf +++ b/mullvad/au-syd-wg-104.conf @@ -1,7 +1,7 @@ [Interface] -# Device: Neat Sloth -PrivateKey = cDa2KkMYzCJRpvhq8Nt1ZnOieyS9xbrwfOn+iuPpwXw= -Address = 10.65.23.71/32,fc00:bbbb:bbbb:bb01::2:1746/128 +# Device: Deep Cat +PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= +Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 DNS = 10.64.0.1 [Peer] diff --git a/system/cachix.nix b/system/cachix.nix index a3caae1..5264490 100644 --- a/system/cachix.nix +++ b/system/cachix.nix @@ -17,6 +17,7 @@ in { "https://helix.cachix.org" "https://cosmic.cachix.org" "https://cuda-maintainers.cachix.org" + "https://hyprland.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" @@ -24,6 +25,7 @@ in { "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; } diff --git a/system/configuration.nix b/system/configuration.nix index 831af7c..7a48f08 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -12,6 +12,7 @@ inputs.nix-rice.overlays.default inputs.helix.overlays.default inputs.nixd.overlays.default + inputs.niri.overlays.niri outputs.overlays.additions outputs.overlays.rice outputs.overlays.murex @@ -47,7 +48,6 @@ imports = [ ./modules/network.nix ./modules/term.nix - ./modules/cosmic.nix ./modules/systemdboot.nix ./modules/sound.nix ./modules/sydney.nix @@ -56,6 +56,11 @@ ./modules/anal-retentive.nix ]; + programs.niri = { + enable = true; + package = pkgs.niri-unstable; + }; + hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; @@ -88,6 +93,7 @@ ]; + services.atuin.enable = true; programs.nh = { @@ -109,4 +115,6 @@ systemd.services."user@".serviceConfig.Delegate = "memory pids cpu cpuset"; systemd.user.extraConfig = "LogLevel=debug"; + + security.pam.services.swaylock = {}; } diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix new file mode 100644 index 0000000..6ffbf7b --- /dev/null +++ b/system/modules/hyprland.nix @@ -0,0 +1,8 @@ +{ pkgs, inputs, ...}: +{ + programs.hyprland = { + enable = true; + package = inputs.hyprland.packages.x86_64-linux.hyprland; + portalPackage = inputs.hyprland.packages.x86_64-linux.xdg-desktop-portal-hyprland; + }; +} diff --git a/system/quiver.nix b/system/quiver.nix index 351cbdf..6fbb5ef 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -61,12 +61,12 @@ environment.sessionVariables = { NIXOS_OZONE_WL = "1"; ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5"; - # GBM_BACKEND = "nvidia-drm"; - # NVD_BACKEND = "direct"; - # __GLX_VENDOR_LIBRARY_NAME = "nvidia"; - # LIBVA_DRIVER_NAME = "nvidia"; - # __GL_GSYNC_ALLOWED = "1"; - # __GL_VRR_ALLOWED = "1"; + GBM_BACKEND = "nvidia-drm"; + NVD_BACKEND = "direct"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + LIBVA_DRIVER_NAME = "nvidia"; + __GL_GSYNC_ALLOWED = "1"; + __GL_VRR_ALLOWED = "1"; EDITOR = "hx"; }; diff --git a/util/rice.nix b/util/rice.nix index dac360c..6891975 100644 --- a/util/rice.nix +++ b/util/rice.nix @@ -1,5 +1,7 @@ final: prev: -with prev.lib.nix-rice; let +let + inherit (prev.lib.nix-rice) kitty-themes; + inherit (prev.lib.nix-rice.palette) toRGBShortHex toRgbHex; # theme = kitty-themes.parseTheme ./op.pal; theme = kitty-themes.parseTheme ./pal.conf; # theme = kitty-themes.getThemeByName "everforest_dark_hard"; @@ -80,7 +82,7 @@ in { gtk-theme = { name = "nix-rice"; - package = prev.callPackage ./gtk-theme.nix {} {palette = palette.toRGBShortHex final.rice.palette;}; + package = prev.callPackage ./gtk-theme.nix {} {palette = toRGBShortHex final.rice.palette;}; }; borders = { @@ -92,7 +94,7 @@ in { bg = { image = prev.callPackage ./wallpaper.nix {} { - palette = palette.toRGBShortHex final.rice.palette; + palette = toRGBShortHex final.rice.palette; wallpaper = builtins.path rec { name = "wallpaper.jpg"; path = ../${name};