From 385262f29bfac25ab73ed706b79c5a3a27021511 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sat, 5 Jul 2025 15:45:37 -0700 Subject: [PATCH] feat: many changes --- flake.lock | 536 +++++++++++++++-------- flake.nix | 19 +- home/environments/hyprland/hyprland.nix | 61 ++- home/environments/hyprland/hyprlock.nix | 9 +- home/environments/hyprland/xdg.nix | 14 + home/environments/i3/cursor.nix | 8 - home/environments/i3/konawall.nix | 63 --- home/environments/i3/konawall.yaml | 110 ----- home/profiles/common/catppuccin.nix | 1 + home/profiles/shell/starship.nix | 2 +- nixos/common/nix.nix | 6 +- nixos/environments/hyprland/hyprland.nix | 17 +- overlays.nix | 3 + systems/goliath.nix | 1 + 14 files changed, 479 insertions(+), 371 deletions(-) create mode 100644 home/environments/hyprland/xdg.nix delete mode 100644 home/environments/i3/cursor.nix delete mode 100644 home/environments/i3/konawall.nix delete mode 100644 home/environments/i3/konawall.yaml diff --git a/flake.lock b/flake.lock index 1d86b31e..438892c1 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1749155310, - "narHash": "sha256-t0HfHg/1+TbSra5s6nNM0o4tnb3uqWedShSpZXsUMYY=", + "lastModified": 1745357003, + "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3", + "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1750013871, - "narHash": "sha256-UQx3rC3QDjD/sIen51+5Juk1rqN3y/sTeMY1WinmhqQ=", + "lastModified": 1751636951, + "narHash": "sha256-07ZP0hEF7HVqGdDc7hgP3jOduNznFt71Lqb3xgXXQWI=", "owner": "catppuccin", "repo": "nix", - "rev": "fe78fa558d6603481c03eb03a946eadb970d1801", + "rev": "09e2be240370f27312a44633d852732b66cb8f01", "type": "github" }, "original": { @@ -123,18 +123,18 @@ }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750098200, - "narHash": "sha256-BtCFs/Ixxn6mEE2zGA/wIH+tR+psjobxs8SXVUyEiiI=", + "lastModified": 1751549328, + "narHash": "sha256-Pzh9+N0palTIX+O2NygrUmMS8omB86SnYthLwE5cu5g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0d0115e6b3e2dce6d2260c7bb3fe894b1cc6b9a6", + "rev": "53209f5724858da5e3e5db3db404c325b4da5414", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1749873626, - "narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "2f140d6ac8840c6089163fb43ba95220c230f22b", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -257,28 +257,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1750056063, - "narHash": "sha256-PGQjkjaj8XUa19tGZi0GHbnCzol4YHurA4pyifmhrs0=", - "owner": "nix-community", - "repo": "fenix", - "rev": "879b4b73522a78529778ce2eb6f3374d1016cf8f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "fl-config": { "locked": { "lastModified": 1653159448, @@ -500,11 +478,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -515,7 +493,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_6" }, "locked": { "lastModified": 1715533576, @@ -533,12 +511,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "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": { @@ -563,8 +544,23 @@ } }, "flake-utils_4": { + "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_5": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -580,9 +576,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -744,11 +740,11 @@ ] }, "locked": { - "lastModified": 1750033262, - "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", + "lastModified": 1751513147, + "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", + "rev": "426b405d979d893832549b95f23c13537c65d244", "type": "github" }, "original": { @@ -764,11 +760,11 @@ ] }, "locked": { - "lastModified": 1750127463, - "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", + "lastModified": 1751638848, + "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", + "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", "type": "github" }, "original": { @@ -794,11 +790,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1745948457, + "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "ac903e80b33ba6a88df83d02232483d99f327573", "type": "github" }, "original": { @@ -823,11 +819,40 @@ ] }, "locked": { - "lastModified": 1749238452, - "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=", + "lastModified": 1745015490, + "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8", + "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprgraphics_2": { + "inputs": { + "hyprutils": [ + "hyprlock", + "hyprutils" + ], + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1750621377, + "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", "type": "github" }, "original": { @@ -880,11 +905,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1743714874, + "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", "type": "github" }, "original": { @@ -912,11 +937,11 @@ ] }, "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", + "rev": "8810df502cdee755993cb803eba7b23f189db795", "type": "github" }, "original": { @@ -948,11 +973,11 @@ ] }, "locked": { - "lastModified": 1749155776, - "narHash": "sha256-t1PM0wxQLQwv2F2AW23uA7pm5giwmcgYEWbNIRct9r4=", + "lastModified": 1745951494, + "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "396e8aa1c06274835b69da7f9a015fff9a9b7522", + "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "type": "github" }, "original": { @@ -977,11 +1002,11 @@ ] }, "locked": { - "lastModified": 1749145882, - "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", + "lastModified": 1746655412, + "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", + "rev": "557241780c179cf7ef224df392f8e67dab6cef83", "type": "github" }, "original": { @@ -990,6 +1015,62 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "hyprlock", + "hyprutils" + ], + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1750371198, + "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlock": { + "inputs": { + "hyprgraphics": "hyprgraphics_2", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1751139849, + "narHash": "sha256-S4WaVk8tR6svR+L8y4VUjFPSYhsUvA9Oc6zYYELTPY0=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "fee04f640676868fe343bd3ffd0b81b22bd032ee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlock", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -1002,11 +1083,36 @@ ] }, "locked": { - "lastModified": 1749819919, - "narHash": "sha256-7F/KG8dwSH9JXdlpOVrEEArS+PJSn0iEnx5eVCk89/I=", + "lastModified": 1746635225, + "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "57ab2a867d8b554ad89f29060c15efd11631db91", + "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1751061882, + "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4", "type": "github" }, "original": { @@ -1027,11 +1133,36 @@ ] }, "locked": { - "lastModified": 1749145760, - "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1750371869, + "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", "type": "github" }, "original": { @@ -1104,11 +1235,11 @@ ] }, "locked": { - "lastModified": 1749627191, - "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "lastModified": 1751529406, + "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", "type": "github" }, "original": { @@ -1151,7 +1282,7 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1737639419, @@ -1198,11 +1329,11 @@ ] }, "locked": { - "lastModified": 1750126013, - "narHash": "sha256-l6WppJJoSfQrca/lhxpK1lmsQomYcMCNfyXi8AKLe0Q=", + "lastModified": 1751594842, + "narHash": "sha256-GhGppbb1lA145Mog9E45FzD+eErOkTwZXIz2bW6AZrA=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "e8084a739aa33d9c72540cc6b4623c779f84176f", + "rev": "2831e6d199ca5ac7df8108e4adc3f12974c9807f", "type": "github" }, "original": { @@ -1211,6 +1342,27 @@ "type": "github" } }, + "moonlight": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750621684, + "narHash": "sha256-E8iHTYK9iUtIjYgBNj54Xeulj9WaxSGDbzOLLFhCSqA=", + "owner": "moonlight-mod", + "repo": "moonlight", + "rev": "9398874e59f5e2b8485c489ce6c0f6c9c7d210a0", + "type": "github" + }, + "original": { + "owner": "moonlight-mod", + "repo": "moonlight", + "type": "github" + } + }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_12" @@ -1233,11 +1385,11 @@ "neorg": { "flake": false, "locked": { - "lastModified": 1749805422, - "narHash": "sha256-q3wIdHnAgCUczum+1WhrcxO2Nf6chN/IeRHjB1v2tI4=", + "lastModified": 1751646203, + "narHash": "sha256-uQSrXTngyRSWRyPN7v7uVQOHw+8rLm8+KXxls4nT2K4=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "9d75ae8e2625db240636870dd7f029c9a82ab9ef", + "rev": "790b0444c0c654131a722817dc893332e06c72b9", "type": "github" }, "original": { @@ -1248,7 +1400,7 @@ }, "neorg-overlay": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "neorg": "neorg", "neorg-telescope": "neorg-telescope", "nixpkgs": "nixpkgs_5", @@ -1256,11 +1408,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1749990869, - "narHash": "sha256-+YCYXwiVxmBvoKGzmUrjyIWxQl6/9vnWgpwKDy1NHgQ=", + "lastModified": 1751660377, + "narHash": "sha256-URGq3xSDVhWQetleMN7GfQt8gXFSMvq6RWUHqvBmgAY=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "f6592fb7c723e11dc1de152d5c30be7af1987ced", + "rev": "5c8e783f89c3592da0ec1d5636857ed48bb6bab5", "type": "github" }, "original": { @@ -1285,6 +1437,26 @@ "type": "github" } }, + "nh": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751375534, + "narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=", + "owner": "nix-community", + "repo": "nh", + "rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nh", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1693833173, @@ -1306,11 +1478,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1750125577, - "narHash": "sha256-4c7D0pOt9pPsQ3QADdnta9vPZbzy12X7jIOp6WBi9Lg=", + "lastModified": 1751508010, + "narHash": "sha256-IXBLUCMTKaMzbbs5SOqH7FEI9fRwOi3ZP6LKjttnO5o=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d904fbbf9cc01cc87b9d458134eecf70442b0776", + "rev": "d00203f8630983aadb57cfde60b481cd97d06659", "type": "github" }, "original": { @@ -1349,11 +1521,11 @@ ] }, "locked": { - "lastModified": 1749960154, - "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "424a40050cdc5f494ec45e46462d288f08c64475", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -1394,11 +1566,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -1471,16 +1643,16 @@ "nixpkgs-xr": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750123866, - "narHash": "sha256-6eZtzIbBJtEpEi9/jz3QVLmURpIWDIebDrjj8s1ICWE=", + "lastModified": 1751592695, + "narHash": "sha256-cXXhBaFJfBRWbsXkTcqAN80x0+ys4PPhajGdrEPQPq0=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "4b3a0f27e719d61b9f94731a1e7cc008cf18cb20", + "rev": "0b60d347a9b04b0b2d2a7761c542ff2df14ed3e5", "type": "github" }, "original": { @@ -1491,11 +1663,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -1507,11 +1679,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -1549,11 +1721,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -1565,11 +1737,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -1581,11 +1753,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -1613,11 +1785,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1749903597, - "narHash": "sha256-jp0D4vzBcRKwNZwfY4BcWHemLGUs4JrS3X9w5k/JYDA=", + "lastModified": 1751625545, + "narHash": "sha256-4E7wWftF1ExK5ZEDzj41+9mVgxtuRV3wWCId7QAYMAU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41da1e3ea8e23e094e5e3eeb1e6b830468a7399e", + "rev": "c860cf0b3a0829f0f6cf344ca8de83a2bbfab428", "type": "github" }, "original": { @@ -1661,11 +1833,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1749871736, - "narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=", + "lastModified": 1750994206, + "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6afe187897bef7933475e6af374c893f4c84a293", + "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", "type": "github" }, "original": { @@ -1677,11 +1849,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -1694,7 +1866,7 @@ "norg": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -1715,7 +1887,7 @@ "norg-meta": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_7" }, "locked": { @@ -1739,11 +1911,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1750143150, - "narHash": "sha256-6u+bQRGVy4viR8SXljOn32HtSWr4Z+BNlWdy/VJL3l4=", + "lastModified": 1751659197, + "narHash": "sha256-aTGJXwTaP7lu/uIEDoXWV7/D5j5jCMh0+W449KOqzT4=", "owner": "nix-community", "repo": "NUR", - "rev": "dddf6ee8c6a0dfc79b242c38e37ed13b2c325755", + "rev": "b332574813ef9f8b0eff201206c8fd6d63173b35", "type": "github" }, "original": { @@ -1785,11 +1957,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -1888,11 +2060,14 @@ "flakelibstd": "flakelibstd", "home-manager": "home-manager_2", "hyprland": "hyprland", + "hyprlock": "hyprlock", "infrastructure": "infrastructure", "konawall-py": "konawall-py", "lanzaboote": "lanzaboote", "minecraft": "minecraft", + "moonlight": "moonlight", "neorg-overlay": "neorg-overlay", + "nh": "nh", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", @@ -1909,7 +2084,7 @@ "spicetify-nix": "spicetify-nix", "split-monitor-workspaces": "split-monitor-workspaces", "std": "std_2", - "systems": "systems_6", + "systems": "systems_7", "tree": "tree_2", "utils": "utils", "wezterm": "wezterm", @@ -1938,24 +2113,28 @@ "type": "github" } }, - "rust-analyzer-src": { - "flake": false, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1750005282, - "narHash": "sha256-VXLDkb1iOw7wWhgOgBMP9hTcpW6Eo399YbBif5hlxS8=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "a207299344bf7797e4253c3f6130313e33c2ba6f", + "lastModified": 1751510438, + "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", "type": "github" }, "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", + "owner": "oxalica", + "repo": "rust-overlay", "type": "github" } }, - "rust-overlay": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -1976,7 +2155,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "wezterm", @@ -1984,11 +2163,11 @@ ] }, "locked": { - "lastModified": 1747449297, - "narHash": "sha256-veyXchTz6eWwvuW5X49UluHkheHkFcqHJSwGuKBhrmQ=", + "lastModified": 1751251399, + "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f44db7d7cea4528288780c6347756173a8248225", + "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b", "type": "github" }, "original": { @@ -2096,11 +2275,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": { @@ -2136,14 +2315,14 @@ "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_14", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1749961984, - "narHash": "sha256-1Nmycj9cVUIkoDsVEn9k8SGMS9V+BcBUL+rDXNapslw=", + "lastModified": 1751171964, + "narHash": "sha256-SeVvQm9ex+6BhDPIsRt9E1kSmMblQ6gTi53baphnX08=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c9f12a733e8edcf8d408ccd178c1a11e753ffa08", + "rev": "16adc163d966fc2bb5da47580df4602ae2c7a310", "type": "github" }, "original": { @@ -2160,11 +2339,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1749573726, - "narHash": "sha256-Bj11uVqKPHI2sKsXMQdVhdMMbJ403Ps6x4jOcmVfr2Q=", + "lastModified": 1751646985, + "narHash": "sha256-QQQr6iyOh8Mn6+sze9+mg57C/7aVA4na5gfVTHJ2WGY=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "a0015f8ba44bc194916dc797501ea06823c51926", + "rev": "e9acfbc08f443f98c691e22f0a89b035eb060070", "type": "github" }, "original": { @@ -2340,6 +2519,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tree": { "inputs": { "nixpkgs": [ @@ -2397,11 +2591,11 @@ ] }, "locked": { - "lastModified": 1749194973, - "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { @@ -2462,16 +2656,16 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay_3", "zlib": "zlib" }, "locked": { "dir": "nix", - "lastModified": 1750014871, - "narHash": "sha256-2P4YKeMy9LXy0totnWIWzgW3A0UwB7HY0CfdCt8OOBU=", + "lastModified": 1751522981, + "narHash": "sha256-OisqRgWHKADyoAV5wuPPUI+wryP2gznfLdGuafEnho0=", "owner": "wez", "repo": "wezterm", - "rev": "d6c178f961d3de351ad72b8176f5d05e8ad8e8c6", + "rev": "c7f4b081a685ab71eef6571b4050af061fff9c85", "type": "github" }, "original": { @@ -2533,11 +2727,11 @@ ] }, "locked": { - "lastModified": 1749490041, - "narHash": "sha256-R9Dn9IyUdPaJHD2Oqd7XJnnxpka6M6UYw4Ld0iA46HM=", + "lastModified": 1745871725, + "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "3cf35e178bc192ee51e3fddfd69e531e2c106a30", + "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c17c8c95..2b6ea806 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "Kat's Infrastructure"; inputs = { systems.url = "github:nix-systems/default"; - catppuccin.url = "github:catppuccin/nix"; + # TODO: https://github.com/catppuccin/nix/issues/601 + catppuccin.url = "github:catppuccin/nix";#/194881dd2ad6303bc2d49f9ce484d127372d7465"; # to allow non-nix 2.4 evaluation flake-compat = { url = "github:edolstra/flake-compat"; @@ -55,6 +56,22 @@ url = "https://flakehub.com/f/Svenum/Solaar-flake/*.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; + nh = { + url = "github:nix-community/nh"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + moonlight = { + url = "github:moonlight-mod/moonlight"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs = { + nixpkgs.follows = "nixpkgs"; + systems.follows = "systems"; + }; + }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; diff --git a/home/environments/hyprland/hyprland.nix b/home/environments/hyprland/hyprland.nix index 366ead78..f7bd6073 100644 --- a/home/environments/hyprland/hyprland.nix +++ b/home/environments/hyprland/hyprland.nix @@ -1,5 +1,7 @@ { std, + parent, + lib, pkgs, inputs, ... @@ -19,7 +21,9 @@ in { brightnessctl playerctl glib + pcmanfm ]; + services.hyprpolkitagent.enable = true; services.swww.enable = true; wayland.windowManager.hyprland = let import-gsettings = pkgs.writeShellScriptBin "import-gsettings" '' @@ -40,7 +44,7 @@ ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" in { enable = true; systemd = { - enable = true; + enable = false; variables = ["--all"]; enableXdgAutostart = true; extraCommands = [ @@ -54,9 +58,30 @@ ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ]; settings = { + # TODO: break it up + windowrule = let + in [ + "suppressevent fullscreen, class:steam_app_default" + "workspace 2, class:steam_app_default" + "suppressevent maximize, class:.*" + + "tile, class:battle\.net\.exe" + + "renderunfocused, class:discord, initialTitle:Discord" + + "unset, title:Wine System Tray" + "workspace special:hidden silent, title:Wine System Tray" + "noinitialfocus, title:Wine System Tray" + ]; "$mod" = "SUPER"; input = { kb_options = "ctrl:nocaps"; + accel_profile = "flat"; + sensitivity = 1.0; + scroll_factor = 1.0; + }; + cursor = { + use_cpu_buffer = true; }; workspace = let commonOptions = "gapsin:0,gapsout:0,rounding:false"; @@ -87,6 +112,7 @@ ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" "GDK_BACKEND,wayland,x11" "CLUTTER_BACKEND,wayland" ]; + render.direct_scanout = false; debug.disable_logs = false; exec-once = [ "${pkgs.swww}/bin/swww init" @@ -123,14 +149,22 @@ ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" "$mod, mouse:273, resizewindow" "$mod ALT, mouse:272, resizewindow" ]; + bindl = [ + ", XF86AudioPlay, exec, playerctl play-pause" + ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + ]; binde = [ ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl -c backlight set 5%+" ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl -c backlight set 5%-" ]; - bind = - [ + bind = let + uwsmCmd = lib.optionalString parent.programs.uwsm.enable "uwsm app -- "; + uwsmApp = cmd: uwsmCmd + cmd; + uwsmSingleApp = cmd: "pgrep ${cmd} || ${uwsmCmd + cmd}"; + in [ ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" ", XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next" @@ -138,12 +172,17 @@ ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" "$mod, R, exec, wofi -t wezterm -IS drun" "$mod SHIFT, R, exec, wofi -t wezterm -IS run" - "$mod, Return, exec, wezterm" - ", Print, exec, grimblast copy area" + "$mod, RETURN, exec, ${uwsmApp "wezterm"}" + "$mod, W, exec, ${uwsmApp "firefox"}" + "$mod, E, exec, ${uwsmApp "pcmanfm"}" + ", Print, exec, ${uwsmSingleApp "grimblast"} copy area" + "CTRL ALT, DELETE, exec, ${uwsmApp "hyprctl kill"}" + "CTRL ALT SHIFT, DELETE, exec, loginctl terminate-user \"\"" "$mod SHIFT, E, exec, pkill Hyprland" "$mod SHIFT, Q, killactive," - "$mod, F, fullscreen," + "$mod, F, fullscreenstate, 2 -1" # dont inform + "$mod SHIFT, F, fullscreenstate, -1 2" # do inform "$mod, G, togglegroup," "$mod SHIFT, N, changegroupactive, f" "$mod SHIFT, P, changegroupactive, b" @@ -152,7 +191,7 @@ ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" "$mod SHIFT, X, pseudo," "$mod ALT, ,resizeactive," "$mod, Escape, exec, wlogout -p layer-shell" - "$mod, L, exec, loginctl lock-session" + "$mod, L, exec, ${uwsmSingleApp "hyprlock"}" "$mod, left, movefocus, l" "$mod, right, movefocus, r" @@ -169,11 +208,11 @@ ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" "$mod, P, exec, ${pkgs.hyprpicker}/bin/hyprpicker -na" - "CTRL, Print, exec, grimblast --notify --cursor copysave output" - "$mod SHIFT CTRL, R, exec, grimblast --notify --cursor copysave output" + "CTRL, Print, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave output" + "$mod SHIFT CTRL, R, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave output" - "ALT, Print, exec, grimblast --notify --cursor copysave screen" - "$mod SHIFT ALT, R, exec, grimblast --notify --cursor copysave screen" + "ALT, Print, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave screen" + "$mod SHIFT ALT, R, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave screen" "$mod, bracketleft, workspace, m-1" "$mod, bracketright, workspace, m+1" diff --git a/home/environments/hyprland/hyprlock.nix b/home/environments/hyprland/hyprlock.nix index 6ee012c8..6a129e4d 100644 --- a/home/environments/hyprland/hyprlock.nix +++ b/home/environments/hyprland/hyprlock.nix @@ -1,5 +1,10 @@ -_: { +{ inputs, pkgs, ... }: { programs.hyprlock = { - enable = false; + enable = true; + package = inputs.hyprlock.packages.${pkgs.system}.hyprlock; + + settings = { + animations.enabled = false; + }; }; } diff --git a/home/environments/hyprland/xdg.nix b/home/environments/hyprland/xdg.nix new file mode 100644 index 00000000..5af3ec31 --- /dev/null +++ b/home/environments/hyprland/xdg.nix @@ -0,0 +1,14 @@ +_: { + xdg = { + enable = true; + autostart.enable = true; + mime.enable = true; + + mimeApps = { + enable = true; + defaultApplications = { + "inode/directory" = "pcmanfm.desktop"; + }; + }; + }; +} diff --git a/home/environments/i3/cursor.nix b/home/environments/i3/cursor.nix deleted file mode 100644 index dba5daaa..00000000 --- a/home/environments/i3/cursor.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: { - home.pointerCursor = { - enable = true; - package = pkgs.graphite-cursors; - size = 16; - name = "graphite-dark"; - }; -} diff --git a/home/environments/i3/konawall.nix b/home/environments/i3/konawall.nix deleted file mode 100644 index 69b8204c..00000000 --- a/home/environments/i3/konawall.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - inputs, - pkgs, - config, - ... -}: let - konawallConfig = { - interval = 30 * 60; - rotate = true; - source = "e621"; - tags = [ - "rating:s" - "-five_nights_at_freddy's" - #"touhou" - "-large_breasts" - "-scalie" - #"-my_little_pony" - "-sonic_the_hedgehog" - "-amputee" - "-inflation" - "-pool_toy" - "-cuckold" - "-gore" - "-human" - "-animated" - "-hyper" - "-death" - "ratio:>=1.3" - "-muscular_male" - "-model_sheet" - "score:>=100" - "width:>=1500" - ]; - logging = { - file = "INFO"; - console = "DEBUG"; - }; - }; -in { - sops.secrets.konawall-py-env = { - sopsFile = ./konawall.yaml; - }; - home.packages = [ - inputs.konawall-py.packages.${pkgs.system}.konawall-py - ]; - xdg.configFile = { - "konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig; - }; - systemd.user.services.konawall-py = { - Unit = { - Description = "konawall-py"; - X-Restart-Triggers = [(toString config.xdg.configFile."konawall/config.toml".source)]; - After = ["graphical-session.target" "network-online.target"]; - }; - Service = { - ExecStart = "${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall"; - Restart = "on-failure"; - RestartSec = "1s"; - EnvironmentFile = config.sops.secrets.konawall-py-env.path; - }; - Install = {WantedBy = ["graphical-session.target"];}; - }; -} diff --git a/home/environments/i3/konawall.yaml b/home/environments/i3/konawall.yaml deleted file mode 100644 index 539c8bfb..00000000 --- a/home/environments/i3/konawall.yaml +++ /dev/null @@ -1,110 +0,0 @@ -konawall-py-env: ENC[AES256_GCM,data:8SWQgZkKXffy+GfhbIkZAB3ZJ9a+q5yPmMdt3lgrzezguX23p7vqgRac9AHq1x8=,iv:K5Pj9FuLWbpah8WaD5TZwmomZUgJnuaCdzFlu7K4n/w=,tag:qTlbMlsTeTnXSm+lyDe1iw==,type:str] -sops: - shamir_threshold: 1 - age: - - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0UlgrSHRGR0dlQk9CRXBL - MVpmK3ExOUE2TXN1WDMzSHo0eHBHT0o1T1FBCnFPVXJOczFyYk9rNzk4YWNkbGh6 - eWxlbG1pOFVPdHoxeDdEb2t6djlLdFUKLS0tIGczR0twcmNTZ1JrTnhBaDlRaWNM - STJ3cC80bW0zQWFtM0l1SnJIVDl5TmcKsSno/d3sAB416gN7PJF5wk1bZ4YYG7pW - 3rRY8dnu8pG751dViBN8kiEm7hxsYHl5PLM92YSUoB2qbJU9sa/9AA== - -----END AGE ENCRYPTED FILE----- - - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3L2tRYmQycXJHMHFmRGVJ - LzZCTzZRbW5DY1dmclptR3RLd0hyaVA4b1VVCjRzRXZDR09OaXJUaG4vUmVNWjlC - dTl6RGVibklrOE8yZkJ3RmlSSWxyYU0KLS0tIExZbjRWVElscm8rVlpTcVhCQ1FV - TVorVjJoVFE3Mlh4d055NnhDK1FRRVUKDjwINUxOtArvjqQ5XP9m3Dq+m9kcavLS - zllxC8AiQIgEAQY9R7KPHNQ1wk01UOeOo7MzdfXQOzFb4mph7+QhBg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2REVOY0xQNlB2WEo2M0t5 - eFJvbVcxY0hQUHArSFlKS1Vtd003L3picDNJCk03cFdEcGFlamxCV3lPbkR1SHFu - WVpVcnJnQ3hzdzRuQTg5UGliQ282UTAKLS0tIFFlZXJGbkxJUXE5UHV1TnRZWTNV - dXNlQWljRVkzOUNiQ3hKaksxekY0S0kKnVB7FDTtzyG2U/6BeKWvlHzSF4st1amw - /nmZ9isatsELJJyPbMkIQBs8/MFwc4xKkbu0T/gh77ViAPYxoSQfTQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXRlRCOXpsb1FCU2pzZUtP - emliZVd1U1FkZEZqQ1BzZTFudTdhTzJldlI4CnN6eEZWUS82V3ltbHlMdVRJWDhY - NlB3NzRDbUovUGtMNjVPamxvUU53TlUKLS0tIE00NGxXUHljVXJodVVWYVRLUXpS - elZWV0c3aG5NL3RQamthaXZWalRaN0kK7GcmwR3N2wIV1+6QGADrCoq2tTjEgP6e - CSNys+qSYd1MRR84GE0S6KOa27MiC109fjL8Gsra6jXjq0LuRHKwww== - -----END AGE ENCRYPTED FILE----- - - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIZkdYV0VTZzVSWkhDZXFJ - c1dZQld0WStyWGhpQWV2bEk3ZzFKN2I3Tmg0ClZUZVpLVlJiMDV0WTU0YTF6bkQ1 - dm5KUnZ3YXFyekNVcldBMVF1RW5zeEUKLS0tIGhvQnpoZVZnbUMrdWF3T29HKzFz - T1h6SkpqVEN2M2MxK2NuemdtSEpQZ0UKz1xv1baKX0z9ffDZxKSsXS6a3+p4rUhW - mQwpcJ6D7nJ1EHBUu6n/a/rbLbtPUSH1cZKFJcC1+SuWydaYnG/sEA== - -----END AGE ENCRYPTED FILE----- - - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmWFFGWHMrY2N0MFZaM0ds - REdjdk1TQUJPRHRXemRZQldkZGViMHgrV0V3CnpSbm9mbi82NWRJWFZoQ3VuOS9S - bk9DcGNFaU05NmkrNVQwOTNnVldXYWsKLS0tIFN1RVVIbkIrMUhEQXU4cS9IaW9x - MjJqTUNSMklzeXpsaERBT0dVY1FuWEUK+KnpwIOa2xYZWtqYj5iWCIqDLM5BNOuV - qeSwbtBkLGaMUNuURg9Ut9G25wTxGxZC8A84eDUxqWVDR7YcT9e3Uw== - -----END AGE ENCRYPTED FILE----- - - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAybEhYZ1NRUTdoTkc0S05m - SVJhMW1uQktvV1l5VHBIL1FjVzRNaTdsRVVRCmZLd1JUZVZGbjFkSWVBVWMyWXc1 - TGVWY2hnMWI1R1RhVi8vV0VsOXRpa0UKLS0tIHVDanFTL2lYSzFhNWNORDVsQmxT - b1dwY01BdU4xbFppcUpuL2tiN0kvSHcKLnLHUB0sXbPNUC43Uh8sb15NjnTMkGAR - KlbXY247TtheYk20GL7M48iXTUtNQA6a0FtyiDI7gBKKbbslhkXJLw== - -----END AGE ENCRYPTED FILE----- - - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArUzByQmh5cElrTG43dWFq - cENCWGJPeUNoT1dDWFZlaDBqWHJGRGltNFNnCmlDTUZxcUsrVGN4SEU3OEJsZWxX - U1I4SFRpWVpkY2RBa29VZWFEcTJubXcKLS0tICtob3VCc24wbHVGdFdwOEtyc2xM - MzhvaDhqMzVBZ0tTNmFJNG5nc3dUQjQKrh9RpV8nq06J/LyXwN1lVaBcfEvM+H1o - aIfU72FQiBN5QDCjHO7VyalyRewaqjCyf/yJW4gy2DKJP4/LXst5Jg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKTnFHT0RHc0NJZGFMb1pp - dTdBdGd5bUlZRmxxU0t6N1Evb2tqdDJPYmdFCkZqYlRiRzZucWoxSEFxdUpiTzBl - em15RXdTbXVjblVxSnZTYzA1UFBsR0kKLS0tICszSWhxQnU5dGUxYWM0VWJWMmpz - MGZLWHpnWW40NjF4dVB5YTh0MXZ0OHMKsjtyHbWLKNJ9x7XoKh1+vqFdPQIcORJS - lsvBhAeedFHmpc0cJTw+7Rjb7MTEM1mi8EbEZ/4xOgN5UkcnckoazQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-28T21:15:38Z" - mac: ENC[AES256_GCM,data:2QggqmZhRgx+kpvDZOBU/KBLruwxbD4F3NHTiNK2N8Ux133pgLDjP88HDmBy8ZRXmGFdkUK0IqOSx1Axy3qpy14DlSdOw9L/WQhOCybEX21ib+ANb90275FtD+7J8luIvOPbCtus9c9gpqYQIirlQMqwkMZ1QADv62ewmVUJD6w=,iv:4V9KA9oq1TR5+cFtZdEop7haPOavRaRd6wwgJDyJeXQ=,tag:MXwB98KN5kit4Oyl+qQFLw==,type:str] - pgp: - - created_at: "2025-06-27T20:11:05Z" - enc: |- - -----BEGIN PGP MESSAGE----- - - hQIMA82M54yws73UAQ//SqGFueUwSXKm4F0tpKa52aJxbpSXHflmW5XWaInLAq4H - LtUNVo9NgCkTGerr6UjawXlEZC8BrTsfrjeWL8tUegrTI7gKFOTvEcqtY1uMH3uc - TmnKYGA4H0NtjzbjFWNpPfASeDW1iBlWPXAPMGObhP2Dejyi5jh74JRr5HAL26o2 - 7zsNZR8OhZLPr1ShPgF5hSU5jdskIoOPfxn9u0e8pTinbJWPY9ZMuhydA9cmO6e4 - IcE9Fu2kEi0+C96AQUdvExGxlvtKQkHD4+ps5nrHi1dvaE6YwClMmJqS5Nd5os0E - KdHBoAkNjgaZEBG8jkK25YN7cLt8HjWX4bElPwP0Q7LD0/+IOHgYeQJhbVMclblh - rfvvq1G5QYJ5IoJZOOtd2arxy0BUVjB7irJQ41yAxO48xL5tLdqq2ODKtunnyQnn - dhxDqfubyNohm5CLr7dpmgYe+I4d4DhcGQqD06m3M0ymVFo4Uvfta81jRGV/+gXk - teYYpZRhVG4+4en8Yoq/84r1LM5Roh+s2mp883+5zYE5YcZfihORmVuWVvP6357e - GmoTEh12O8mzbeXInlh0+DQEM9uUd2Z9QlzT5SyqNvLqQkNcDFo1ojADx0FvQmUm - cJIiNby5aJv5liNEQXUHslHOI9iS7m55oztZpxzRTdNdxWuFocKBccnr8fc8CD7S - XgEklZAZby3XIhlkeoviAAjAx9benYh/p5iSQJrQVDEP9Nx8p3TKmIaZeDqLh/Vl - /SmWyI3NnXFYEq5zTgihvv6idt/suVheRSZ6fXtGRSeWe5PRWklZbpGtz7QyByk= - =Q/Jq - -----END PGP MESSAGE----- - fp: CD8CE78CB0B3BDD4 - unencrypted_suffix: _unencrypted - version: 3.9.4 diff --git a/home/profiles/common/catppuccin.nix b/home/profiles/common/catppuccin.nix index ef48f925..18891d96 100644 --- a/home/profiles/common/catppuccin.nix +++ b/home/profiles/common/catppuccin.nix @@ -4,6 +4,7 @@ in { catppuccin = { enable = true; flavor = "frappe"; + firefox.profiles = mkForce {}; gtk = { enable = true; icon.enable = true; diff --git a/home/profiles/shell/starship.nix b/home/profiles/shell/starship.nix index 33d96c85..7737c33e 100644 --- a/home/profiles/shell/starship.nix +++ b/home/profiles/shell/starship.nix @@ -4,7 +4,7 @@ _: { enableZshIntegration = true; settings = { time = { - disable = false; + disabled = false; }; }; }; diff --git a/nixos/common/nix.nix b/nixos/common/nix.nix index 9061a645..b451cd97 100644 --- a/nixos/common/nix.nix +++ b/nixos/common/nix.nix @@ -1,4 +1,8 @@ -_: { +{inputs, pkgs, ...}: { + programs.nh = { + enable = true; + package = inputs.nh.packages.${pkgs.system}.nh; + }; nix = { gc = { automatic = true; diff --git a/nixos/environments/hyprland/hyprland.nix b/nixos/environments/hyprland/hyprland.nix index 954306e1..9330af55 100644 --- a/nixos/environments/hyprland/hyprland.nix +++ b/nixos/environments/hyprland/hyprland.nix @@ -1,11 +1,22 @@ -{ pkgs, ... }: { +{ pkgs, inputs, ... }: { programs.hyprland = { enable = true; + withUWSM = true; + package = inputs.hyprland.packages."${pkgs.system}".hyprland; + portalPackage = inputs.hyprland.packages."${pkgs.system}".xdg-desktop-portal-hyprland; }; + + # auto launch hyprland on tty1 + environment.loginShellInit = '' + if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ] && uwsm check may-start; then + exec uwsm start hyprland-uwsm.desktop + fi + ''; + services.clipboard-sync.enable = true; - services.displayManager.sddm = { + /*services.displayManager.sddm = { enable = true; package = pkgs.kdePackages.sddm; wayland.enable = true; - }; + };*/ } diff --git a/overlays.nix b/overlays.nix index 8e31449f..6e4a6c30 100644 --- a/overlays.nix +++ b/overlays.nix @@ -9,4 +9,7 @@ inputs.deploy-rs.overlays.default inputs.neorg-overlay.overlays.default (import tree.packages.default {inherit inputs tree;}) + (final: prev: { + wivrn = prev.wivrn.override { cudaSupport = true; }; + }) ] diff --git a/systems/goliath.nix b/systems/goliath.nix index 9e67b08f..10d61482 100644 --- a/systems/goliath.nix +++ b/systems/goliath.nix @@ -125,6 +125,7 @@ _: let availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; }; kernelModules = ["nct6775" "kvm-amd"]; + extraModulePackages = [config.boot.kernelPackages.v4l2loopback.out]; supportedFilesystems = ["ntfs" "zfs"]; };