diff --git a/flake.lock b/flake.lock index dd22981a..c55ba9a6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745357003, - "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "arcexprs": { "inputs": { "nixpkgs": "nixpkgs" @@ -121,6 +88,22 @@ "type": "github" } }, + "catppuccin-qtct": { + "flake": false, + "locked": { + "lastModified": 1743247755, + "narHash": "sha256-wDj6kQ2LQyMuEvTQP6NifYFdsDLT+fMCe3Fxr8S783w=", + "owner": "catppuccin", + "repo": "qt5ct", + "rev": "cb585307edebccf74b8ae8f66ea14f21e6666535", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "qt5ct", + "type": "github" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -163,7 +146,7 @@ }, "clipboard-sync": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1731355357, @@ -224,7 +207,7 @@ "nixpkgs" ], "utils": [ - "utils" + "flake-utils" ] }, "locked": { @@ -308,11 +291,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -324,11 +307,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -340,11 +323,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -370,43 +353,29 @@ } }, "flake-compat_6": { + "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_7": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -417,17 +386,14 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -438,14 +404,14 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -456,17 +422,32 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -491,7 +472,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -509,7 +492,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_8" + "flake-utils": "flake-utils_9" }, "locked": { "lastModified": 1715533576, @@ -528,14 +511,16 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": [ + "systems" + ] }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -546,7 +531,9 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -563,12 +550,17 @@ } }, "flake-utils_4": { + "inputs": { + "systems": [ + "systems" + ] + }, "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": { @@ -578,12 +570,17 @@ } }, "flake-utils_5": { + "inputs": { + "systems": [ + "systems" + ] + }, "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": { @@ -594,7 +591,9 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_5" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -612,7 +611,9 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_6" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -630,14 +631,36 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_7" + "systems": [ + "systems" + ] }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "inputs": { + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -670,7 +693,9 @@ "flakelib_2": { "inputs": { "fl-config": "fl-config_2", - "std": "std" + "std": [ + "flakelibstd" + ] }, "locked": { "lastModified": 1701802971, @@ -739,28 +764,6 @@ } }, "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": [ "lanzaboote", @@ -802,20 +805,20 @@ "home-manager": { "inputs": { "nixpkgs": [ - "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1751513147, - "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=", + "lastModified": 1751638848, + "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "426b405d979d893832549b95f23c13537c65d244", + "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", "type": "github" }, "original": { "owner": "nix-community", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -841,65 +844,7 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745948457, - "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "ac903e80b33ba6a88df83d02232483d99f327573", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprgraphics_2": { "inputs": { "hyprutils": [ "hyprlock", @@ -928,161 +873,7 @@ "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", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1746735318, - "narHash": "sha256-iN0Ge4LaVT7rATqzIrAZFSdfYuIXbe4/HGcXle7qK1g=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "9958d297641b5c84dcff93f9039d80a5ad37ab00", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "ref": "v0.49.0", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745951494, - "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1746655412, - "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "557241780c179cf7ef224df392f8e67dab6cef83", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "hyprutils": [ "hyprlock", @@ -1113,10 +904,10 @@ }, "hyprlock": { "inputs": { - "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprgraphics": "hyprgraphics", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], @@ -1139,31 +930,6 @@ } }, "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1746635225, - "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { "inputs": { "nixpkgs": [ "hyprlock", @@ -1189,31 +955,6 @@ } }, "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "hyprlock", @@ -1318,7 +1059,7 @@ "konawall-py": { "inputs": { "flake-utils": [ - "utils" + "flake-utils" ], "nixpkgs": [ "nixpkgs" @@ -1344,7 +1085,7 @@ "flake-compat": [ "flake-compat" ], - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], @@ -1399,7 +1140,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -1424,7 +1165,7 @@ "flake-compat" ], "flake-utils": [ - "utils" + "flake-utils" ], "nixpkgs": [ "nixpkgs" @@ -1446,7 +1187,7 @@ }, "moonlight": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -1467,7 +1208,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1717067539, @@ -1502,10 +1243,10 @@ }, "neorg-overlay": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "neorg": "neorg", "neorg-telescope": "neorg-telescope", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_8", "norg": "norg", "norg-meta": "norg-meta" }, @@ -1621,8 +1362,8 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_8" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1751508010, @@ -1683,8 +1424,8 @@ }, "nix-options-doc": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_9", + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_12", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -1717,24 +1458,9 @@ "type": "github" } }, - "nix-std_2": { - "locked": { - "lastModified": 1701658249, - "narHash": "sha256-KIt1TUuBvldhaVRta010MI5FeQlB8WadjqljybjesN0=", - "owner": "chessai", - "repo": "nix-std", - "rev": "715db541ffff4194620e48d210b76f73a74b5b5d", - "type": "github" - }, - "original": { - "owner": "chessai", - "repo": "nix-std", - "type": "github" - } - }, "nixos-cli": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nix-options-doc": "nix-options-doc", "nixpkgs": [ "nixpkgs" @@ -1771,16 +1497,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733205999, - "narHash": "sha256-ospvtfltUSDx1N/Sb2sx+ztyrag9urXZjUXUT/K3sl0=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fcc6fd8761d9979517225721b2d4b6e672ff4da3", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-2405": { @@ -1801,11 +1529,56 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_3": { + "locked": { + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_4": { + "locked": { + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -1832,9 +1605,9 @@ }, "nixpkgs-xr": { "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_11", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_15", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1871,13 +1644,13 @@ "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1901,41 +1674,111 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 0, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", - "path": "/nix/store/dydg48djlykksz8cxq0xjplyxpa9pvf4-source", - "type": "path" + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_14": { "locked": { - "lastModified": 1724517639, - "narHash": "sha256-3eTrclsS5OYShbw0MRiiF3GJ8emUTwVzAZo96pdD7hM=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9edd5ddbd2453e22d4c4820992563c7ba0930f7a", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_15": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1943,15 +1786,127 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_20": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_22": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_23": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_24": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_25": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_26": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1961,13 +1916,13 @@ "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1975,11 +1930,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -1991,75 +1946,75 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1751625545, - "narHash": "sha256-4E7wWftF1ExK5ZEDzj41+9mVgxtuRV3wWCId7QAYMAU=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c860cf0b3a0829f0f6cf344ca8de83a2bbfab428", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1750994206, - "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -2071,9 +2026,9 @@ }, "norg": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1672582520, @@ -2092,9 +2047,9 @@ }, "norg-meta": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_7" + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1713028366, @@ -2112,8 +2067,8 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_12", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_17", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -2153,36 +2108,13 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -2206,7 +2138,7 @@ "push2talk": { "inputs": { "flake-utils": [ - "utils" + "flake-utils" ], "naersk": "naersk", "nixpkgs": [ @@ -2231,7 +2163,7 @@ "rbw-bitw": { "inputs": { "flakelib": "flakelib_2", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_20", "rust": "rust_2" }, "locked": { @@ -2255,6 +2187,7 @@ "base16": "base16", "base16-data": "base16-data", "catppuccin": "catppuccin", + "catppuccin-qtct": "catppuccin-qtct", "chaotic": "chaotic", "ci": "ci", "clipboard-sync": "clipboard-sync", @@ -2262,10 +2195,11 @@ "deploy-rs": "deploy-rs", "empty": "empty", "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "flakelib": "flakelib", "flakelibstd": "flakelibstd", "home-manager": "home-manager_2", - "hyprland": "hyprland", "hyprlock": "hyprlock", "infrastructure": "infrastructure", "konawall-py": "konawall-py", @@ -2280,38 +2214,35 @@ "nix-index-database": "nix-index-database", "nixos-cli": "nixos-cli", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_14", "nixpkgs-xr": "nixpkgs-xr", "nur": "nur", "plasma-manager": "plasma-manager", "push2talk": "push2talk", "rbw-bitw": "rbw-bitw", + "rust": "rust_3", + "rust-overlay": "rust-overlay_4", "solaar": "solaar", "sops-nix": "sops-nix", "spacebar": "spacebar", "spicetify-nix": "spicetify-nix", - "std": "std_2", - "systems": "systems_9", + "std": "std", + "systems": "systems_2", "tree": "tree_2", - "utils": "utils", - "wezterm": "wezterm", - "wsl": "wsl" + "treefmt-nix": "treefmt-nix_3", + "wezterm": "wezterm" } }, "rust": { "inputs": { - "nixpkgs": [ - "infrastructure", - "systemd2mqtt", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1696701304, - "narHash": "sha256-RAS+QPumpiSMwNHmEg+rJBImSh8JHdGu3iyfwZUDRE8=", + "lastModified": 1750275275, + "narHash": "sha256-WxhRr27onWTJcNSmwJMs+zS/AxJDgYqFbSUmPAwr7JU=", "owner": "arcnmx", "repo": "nixexprs-rust", - "rev": "e45a3dc4f4cbd70071860f0170d88c7aa499bb55", + "rev": "d014f72d285e59e5c439cbd63bf106d47b48ed42", "type": "github" }, "original": { @@ -2322,17 +2253,14 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1751510438, - "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", + "lastModified": 1752374969, + "narHash": "sha256-Ky3ynEkJXih7mvWyt9DWoiSiZGqPeHLU1tlBU4b0mcc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", + "rev": "75fb000638e6d0f57cb1e8b7a4550cbdd8c76f1d", "type": "github" }, "original": { @@ -2343,17 +2271,14 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1752374969, + "narHash": "sha256-Ky3ynEkJXih7mvWyt9DWoiSiZGqPeHLU1tlBU4b0mcc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "75fb000638e6d0f57cb1e8b7a4550cbdd8c76f1d", "type": "github" }, "original": { @@ -2364,18 +2289,14 @@ }, "rust-overlay_3": { "inputs": { - "nixpkgs": [ - "nixos-cli", - "nix-options-doc", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1740796337, - "narHash": "sha256-FuoXrXZPoJEZQ3PF7t85tEpfBVID9JQIOnVKMNfTAb0=", + "lastModified": 1752374969, + "narHash": "sha256-Ky3ynEkJXih7mvWyt9DWoiSiZGqPeHLU1tlBU4b0mcc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bbac9527bc6b28b6330b13043d0e76eac11720dc", + "rev": "75fb000638e6d0f57cb1e8b7a4550cbdd8c76f1d", "type": "github" }, "original": { @@ -2386,17 +2307,32 @@ }, "rust-overlay_4": { "inputs": { - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_23" }, "locked": { - "lastModified": 1751251399, - "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=", + "lastModified": 1752374969, + "narHash": "sha256-Ky3ynEkJXih7mvWyt9DWoiSiZGqPeHLU1tlBU4b0mcc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b", + "rev": "75fb000638e6d0f57cb1e8b7a4550cbdd8c76f1d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { + "inputs": { + "nixpkgs": "nixpkgs_26" + }, + "locked": { + "lastModified": 1752374969, + "narHash": "sha256-Ky3ynEkJXih7mvWyt9DWoiSiZGqPeHLU1tlBU4b0mcc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "75fb000638e6d0f57cb1e8b7a4550cbdd8c76f1d", "type": "github" }, "original": { @@ -2407,17 +2343,32 @@ }, "rust_2": { "inputs": { - "nixpkgs": [ - "rbw-bitw", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_21" }, "locked": { - "lastModified": 1715288797, - "narHash": "sha256-E7tcuQWs2QZHPnV5eeB5wAfNZ6aeqqOOzANyypTPY6w=", + "lastModified": 1750275275, + "narHash": "sha256-WxhRr27onWTJcNSmwJMs+zS/AxJDgYqFbSUmPAwr7JU=", "owner": "arcnmx", "repo": "nixexprs-rust", - "rev": "32cce853be1fa59e3238256d06b229a7eece7724", + "rev": "d014f72d285e59e5c439cbd63bf106d47b48ed42", + "type": "github" + }, + "original": { + "owner": "arcnmx", + "repo": "nixexprs-rust", + "type": "github" + } + }, + "rust_3": { + "inputs": { + "nixpkgs": "nixpkgs_22" + }, + "locked": { + "lastModified": 1750275275, + "narHash": "sha256-WxhRr27onWTJcNSmwJMs+zS/AxJDgYqFbSUmPAwr7JU=", + "owner": "arcnmx", + "repo": "nixexprs-rust", + "rev": "d014f72d285e59e5c439cbd63bf106d47b48ed42", "type": "github" }, "original": { @@ -2428,7 +2379,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "solaar", @@ -2452,7 +2403,7 @@ }, "solaar": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "nixpkgs": [ "nixpkgs" ], @@ -2494,7 +2445,7 @@ "spacebar": { "inputs": { "flake-utils": [ - "utils" + "flake-utils" ], "nixpkgs": [ "nixpkgs" @@ -2517,8 +2468,8 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_15", - "systems": "systems_8" + "nixpkgs": "nixpkgs_24", + "systems": "systems" }, "locked": { "lastModified": 1751171964, @@ -2535,20 +2486,17 @@ } }, "std": { - "inputs": { - "nix-std": "nix-std_2" - }, "locked": { - "lastModified": 1701802337, - "narHash": "sha256-JCVCyjDZ6LA0xyVoDZzRXjy0OgWOZo3OpeZEVm/U97w=", - "owner": "flakelib", - "repo": "std", - "rev": "443d1c8246b3d96a4822b02af907ca0d833e8b63", + "lastModified": 1710870712, + "narHash": "sha256-e+7MJF2gsgTBuOWv4mCimSP0D9+naeFSw9a7N3yEmv4=", + "owner": "chessai", + "repo": "nix-std", + "rev": "31bbc925750cc9d8f828fe55cee1a2bd985e0c00", "type": "github" }, "original": { - "owner": "flakelib", - "repo": "std", + "owner": "chessai", + "repo": "nix-std", "type": "github" } }, @@ -2570,21 +2518,6 @@ "type": "github" } }, - "std_2": { - "locked": { - "lastModified": 1710870712, - "narHash": "sha256-e+7MJF2gsgTBuOWv4mCimSP0D9+naeFSw9a7N3yEmv4=", - "owner": "chessai", - "repo": "nix-std", - "rev": "31bbc925750cc9d8f828fe55cee1a2bd985e0c00", - "type": "github" - }, - "original": { - "owner": "chessai", - "repo": "nix-std", - "type": "github" - } - }, "systemd2mqtt": { "inputs": { "flakelib": [ @@ -2613,16 +2546,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2641,121 +2574,13 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "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" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "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" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "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": [ - "infrastructure", "nixpkgs" ], "std": [ - "infrastructure", - "std-fl", - "nix-std" + "std" ] }, "locked": { @@ -2797,17 +2622,14 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": [ - "nixpkgs-xr", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { @@ -2818,17 +2640,14 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { @@ -2837,30 +2656,28 @@ "type": "github" } }, - "utils": { + "treefmt-nix_3": { "inputs": { - "systems": [ - "systems" - ] + "nixpkgs": "nixpkgs_25" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "repo": "treefmt-nix", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { "owner": "numtide", - "repo": "flake-utils", + "repo": "treefmt-nix", "type": "github" } }, "wezterm": { "inputs": { "flake-utils": [ - "utils" + "flake-utils" ], "freetype2": "freetype2", "harfbuzz": "harfbuzz", @@ -2868,7 +2685,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4", + "rust-overlay": "rust-overlay_5", "zlib": "zlib" }, "locked": { @@ -2888,70 +2705,6 @@ "type": "github" } }, - "wsl": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749574455, - "narHash": "sha256-fm2/8KPOYvvIAnNVtjDlTt/My00lIbZQ+LMrfQIWVzs=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "917af390377c573932d84b5e31dd9f2c1b5c0f09", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NixOS-WSL", - "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": 1745871725, - "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index a58e6952..41aa6338 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,9 @@ { description = "Kat's Infrastructure"; inputs = { + rust-overlay.url = "github:oxalica/rust-overlay"; + rust.url = "github:arcnmx/nixexprs-rust"; + treefmt-nix.url = "github:numtide/treefmt-nix"; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; @@ -8,6 +11,7 @@ systems.url = "github:nix-systems/default"; # TODO: https://github.com/catppuccin/nix/issues/601 catppuccin.url = "github:catppuccin/nix";#/194881dd2ad6303bc2d49f9ce484d127372d7465"; + flake-parts.url = "github:hercules-ci/flake-parts"; # to allow non-nix 2.4 evaluation flake-compat = { url = "github:edolstra/flake-compat"; @@ -20,12 +24,6 @@ }; nix-gaming.url = "github:fufexan/nix-gaming"; - hyprland = { - url = "github:hyprwm/Hyprland/v0.49.0"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; # used for overriding unwanted flake inputs empty.url = "github:input-output-hk/empty-flake"; # self-explanatory @@ -87,26 +85,30 @@ lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; - # Optional but recommended to limit the size of your system closure. inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; flake-compat.follows = "flake-compat"; }; }; + catppuccin-qtct = { + type = "github"; + owner = "catppuccin"; + repo = "qt5ct"; + flake = false; + }; spicetify-nix.url = "github:Gerg-L/spicetify-nix"; push2talk = { url = "github:cyrinux/push2talk/main"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; + flake-utils.follows = "flake-utils"; }; }; wezterm = { url = "github:wez/wezterm/main?dir=nix"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; + flake-utils.follows = "flake-utils"; }; }; ci = { @@ -127,7 +129,7 @@ inputs = { flake-compat.follows = "flake-compat"; nixpkgs.follows = "nixpkgs"; - utils.follows = "utils"; + utils.follows = "flake-utils"; }; }; # self-explanatory @@ -147,19 +149,10 @@ url = "github:cmacrae/spacebar/v1.4.0"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; + flake-utils.follows = "flake-utils"; }; }; - # WSL host - wsl = { - url = "github:nix-community/NixOS-WSL"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; - flake-compat.follows = "flake-compat"; - }; - }; - utils = { + flake-utils = { url = "github:numtide/flake-utils"; inputs.systems.follows = "systems"; }; @@ -177,7 +170,7 @@ url = "github:kittywitch/konawall-py"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; + flake-utils.follows = "flake-utils"; }; }; # hardware quirks @@ -187,7 +180,6 @@ url = "github:Mic92/sops-nix"; inputs = { nixpkgs.follows = "nixpkgs"; - nixpkgs-stable.follows = "nixpkgs"; }; }; # pre-computed nix-index @@ -199,7 +191,7 @@ url = "github:Infinidoge/nix-minecraft"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; + flake-utils.follows = "flake-utils"; flake-compat.follows = "flake-compat"; }; }; diff --git a/formatter.nix b/formatter.nix deleted file mode 100644 index 4b0eccf9..00000000 --- a/formatter.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - inputs, - pkgs, - ... -}: -inputs.utils.lib.eachDefaultSystem (system: { - ${system} = pkgs.${system}.alejandra; -}) diff --git a/formatting.nix b/formatting.nix new file mode 100644 index 00000000..27f5c261 --- /dev/null +++ b/formatting.nix @@ -0,0 +1,13 @@ +{ + inputs, + pkgs, + ... +}: +inputs.flake-utils.lib.eachDefaultSystem (system: let + treefmtEval = inputs.treefmt-nix.lib.evalModule inputs.nixpkgs.legacyPackages.${system} ./treefmt.nix; +in { + formatter = treefmtEval.config.build.wrapper; + checks = { + formatting = treefmtEval.config.build.check inputs.self; + }; +}) diff --git a/home/environments/niri/mako.nix b/home/environments/niri/mako.nix index dfae8671..a560adf9 100644 --- a/home/environments/niri/mako.nix +++ b/home/environments/niri/mako.nix @@ -21,12 +21,14 @@ in { }; }; - services.mako = mkForce { + services.mako = { enable = true; - font = "Monaspace Krypton 10"; - defaultTimeout = 3000; - borderColor = palette.base08; - backgroundColor = "${palette.base00}BF"; - textColor = palette.base05; + settings = { + font = "Monaspace Krypton 10"; + defaultTimeout = 3000; + borderColor = palette.base08; + backgroundColor = "${palette.base00}BF"; + textColor = palette.base05; + }; }; } diff --git a/home/profiles/common/catppuccin.nix b/home/profiles/common/catppuccin.nix index 18891d96..876978e9 100644 --- a/home/profiles/common/catppuccin.nix +++ b/home/profiles/common/catppuccin.nix @@ -1,16 +1,218 @@ -{ lib, ... }: let +{ lib, pkgs, inputs, ... }: let inherit (lib) mkForce; + qtct = '' + [Appearance] + color_scheme_path=${inputs.catppuccin-qtct}/themes/Catppuccin-Frappe.conf + custom_palette=true + icon_theme=Breeze + standard_dialogs=kde + style=Breeze + ''; + colors = pkgs.writeTextFile { + name = "colors"; + text = '' + @define-color accent_color ${config.palette.${config.catppuccin.accent}.hex}; + @define-color accent_bg_color ${config.palette.${config.catppuccin.accent}.hex}; + @define-color accent_fg_color ${config.palette.base.hex}; + @define-color destructive_color ${config.palette.red.hex}; + @define-color destructive_bg_color ${config.palette.red.hex}; + @define-color destructive_fg_color ${config.palette.base.hex}; + @define-color success_color ${config.palette.green.hex}; + @define-color success_bg_color ${config.palette.green.hex}; + @define-color success_fg_color ${config.palette.base.hex}; + @define-color warning_color ${config.palette.mauve.hex}; + @define-color warning_bg_color ${config.palette.mauve.hex}; + @define-color warning_fg_color ${config.palette.base.hex}; + @define-color error_color ${config.palette.red.hex}; + @define-color error_bg_color ${config.palette.red.hex}; + @define-color error_fg_color ${config.palette.base.hex}; + @define-color window_bg_color ${config.palette.base.hex}; + @define-color window_fg_color ${config.palette.text.hex}; + @define-color view_bg_color ${config.palette.base.hex}; + @define-color view_fg_color ${config.palette.text.hex}; + @define-color headerbar_bg_color ${config.palette.mantle.hex}; + @define-color headerbar_fg_color ${config.palette.text.hex}; + @define-color headerbar_border_color rgba(${builtins.toString config.palette.base.rgb.r}, ${builtins.toString config.palette.base.rgb.g}, ${builtins.toString config.palette.base.rgb.b}, 0.7); + @define-color headerbar_backdrop_color @window_bg_color; + @define-color headerbar_shade_color rgba(0, 0, 0, 0.07); + @define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07); + @define-color sidebar_bg_color ${config.palette.mantle.hex}; + @define-color sidebar_fg_color ${config.palette.text.hex}; + @define-color sidebar_backdrop_color @window_bg_color; + @define-color sidebar_shade_color rgba(0, 0, 0, 0.07); + @define-color secondary_sidebar_bg_color @sidebar_bg_color; + @define-color secondary_sidebar_fg_color @sidebar_fg_color; + @define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color; + @define-color secondary_sidebar_shade_color @sidebar_shade_color; + @define-color card_bg_color ${config.palette.mantle.hex}; + @define-color card_fg_color ${config.palette.text.hex}; + @define-color card_shade_color rgba(0, 0, 0, 0.07); + @define-color dialog_bg_color ${config.palette.mantle.hex}; + @define-color dialog_fg_color ${config.palette.text.hex}; + @define-color popover_bg_color ${config.palette.mantle.hex}; + @define-color popover_fg_color ${config.palette.text.hex}; + @define-color popover_shade_color rgba(0, 0, 0, 0.07); + @define-color shade_color rgba(0, 0, 0, 0.07); + @define-color scrollbar_outline_color ${config.palette.surface0.hex}; + @define-color blue_1 ${config.palette.blue.hex}; + @define-color blue_2 ${config.palette.blue.hex}; + @define-color blue_3 ${config.palette.blue.hex}; + @define-color blue_4 ${config.palette.blue.hex}; + @define-color blue_5 ${config.palette.blue.hex}; + @define-color green_1 ${config.palette.green.hex}; + @define-color green_2 ${config.palette.green.hex}; + @define-color green_3 ${config.palette.green.hex}; + @define-color green_4 ${config.palette.green.hex}; + @define-color green_5 ${config.palette.green.hex}; + @define-color yellow_1 ${config.palette.yellow.hex}; + @define-color yellow_2 ${config.palette.yellow.hex}; + @define-color yellow_3 ${config.palette.yellow.hex}; + @define-color yellow_4 ${config.palette.yellow.hex}; + @define-color yellow_5 ${config.palette.yellow.hex}; + @define-color orange_1 ${config.palette.peach.hex}; + @define-color orange_2 ${config.palette.peach.hex}; + @define-color orange_3 ${config.palette.peach.hex}; + @define-color orange_4 ${config.palette.peach.hex}; + @define-color orange_5 ${config.palette.peach.hex}; + @define-color red_1 ${config.palette.red.hex}; + @define-color red_2 ${config.palette.red.hex}; + @define-color red_3 ${config.palette.red.hex}; + @define-color red_4 ${config.palette.red.hex}; + @define-color red_5 ${config.palette.red.hex}; + @define-color purple_1 ${config.palette.mauve.hex}; + @define-color purple_2 ${config.palette.mauve.hex}; + @define-color purple_3 ${config.palette.mauve.hex}; + @define-color purple_4 ${config.palette.mauve.hex}; + @define-color purple_5 ${config.palette.mauve.hex}; + @define-color brown_1 ${config.palette.flamingo.hex}; + @define-color brown_2 ${config.palette.flamingo.hex}; + @define-color brown_3 ${config.palette.flamingo.hex}; + @define-color brown_4 ${config.palette.flamingo.hex}; + @define-color brown_5 ${config.palette.flamingo.hex}; + @define-color light_1 ${config.palette.mantle.hex}; + @define-color light_2 ${config.palette.mantle.hex}; + @define-color light_3 ${config.palette.mantle.hex}; + @define-color light_4 ${config.palette.mantle.hex}; + @define-color light_5 ${config.palette.mantle.hex}; + @define-color dark_1 ${config.palette.mantle.hex}; + @define-color dark_2 ${config.palette.mantle.hex}; + @define-color dark_3 ${config.palette.mantle.hex}; + @define-color dark_4 ${config.palette.mantle.hex}; + @define-color dark_5 ${config.palette.mantle.hex}; + ''; + }; + gtk4-vars = pkgs.writeTextFile { + name = "gtk4-vars"; + text = '' + :root { + --accent-bg-color: @accent_bg_color; + --accent-fg-color: @accent_fg_color; + + --destructive-bg-color: @destructive_bg_color; + --destructive-fg-color: @destructive_fg_color; + + --success-bg-color: @success_bg_color; + --success-fg-color: @success_fg_color; + + --warning-bg-color: @warning_bg_color; + --warning-fg-color: @warning_fg_color; + + --error-bg-color: @error_bg_color; + --error-fg-color: @error_fg_color; + + --window-bg-color: @window_bg_color; + --window-fg-color: @window_fg_color; + + --view-bg-color: @view_bg_color; + --view-fg-color: @view_fg_color; + + --headerbar-bg-color: @headerbar_bg_color; + --headerbar-fg-color: @headerbar_fg_color; + --headerbar-border-color: @headerbar_border_color; + --headerbar-backdrop-color: @headerbar_backdrop_color; + --headerbar-shade-color: @headerbar_shade_color; + --headerbar-darker-shade-color: @headerbar_darker_shade_color; + + --sidebar-bg-color: @sidebar_bg_color; + --sidebar-fg-color: @sidebar_fg_color; + --sidebar-backdrop-color: @sidebar_backdrop_color; + --sidebar-border-color: @sidebar_border_color; + --sidebar-shade-color: @sidebar_shade_color; + + --secondary-sidebar-bg-color: @secondary_sidebar_bg_color; + --secondary-sidebar-fg-color: @secondary_sidebar_fg_color; + --secondary-sidebar-backdrop-color: @secondary_sidebar_backdrop_color; + --secondary-sidebar-border-color: @secondary_sidebar_border_color; + --secondary-sidebar-shade-color: @secondary_sidebar_shade_color; + + --card-bg-color: @card_bg_color; + --card-fg-color: @card_fg_color; + --card-shade-color: @card_shade_color; + + --dialog-bg-color: @dialog_bg_color; + --dialog-fg-color: @dialog_fg_color; + + --popover-bg-color: @popover_bg_color; + --popover-fg-color: @popover_fg_color; + --popover-shade-color: @popover_shade_color; + + --thumbnail-bg-color: @thumbnail_bg_color; + --thumbnail-fg-color: @thumbnail_fg_color; + + --shade-color: @shade_color; + --scrollbar-outline-color: @scrollbar_outline_color; + } + ''; + }; in { catppuccin = { enable = true; flavor = "frappe"; firefox.profiles = mkForce {}; + kvantum.enable = false; gtk = { - enable = true; + enable = false; icon.enable = true; gnomeShellTheme = mkForce false; }; }; dconf.settings = mkForce { }; gtk.enable = true; + # https://git.gay/olivia/fur/src/branch/main/modules/home/theming/qt/default.nix + qt = { + enable = true; + platformTheme.name = "qtct"; + }; + xdg.configFile = { + "qt5ct/qt5ct.conf".text = qtct; + "qt6ct/qt6ct.conf".text = qtct; + }; + home.packages = [ + pkgs.kdePackages.breeze + pkgs.kdePackages.breeze-icons + ]; + dconf.settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + }; + }; + gtk = { + enable = true; + theme = { + name = "adw-gtk3-dark"; + package = pkgs.adw-gtk3; + }; + gtk3 = { + extraCss = ''@import url("${colors}");''; + extraConfig = { + gtk-application-prefer-dark-theme = 1; + }; + }; + gtk4 = { + extraCss = '' + @import url("${colors}"); + @import url("${gtk4-vars}"); + ''; + }; + }; } diff --git a/home/profiles/shell/zsh.nix b/home/profiles/shell/zsh.nix index ff59a54e..d485dd12 100644 --- a/home/profiles/shell/zsh.nix +++ b/home/profiles/shell/zsh.nix @@ -28,7 +28,7 @@ in { enable = true; syntaxHighlighting.enable = true; autosuggestion.enable = true; - initExtra = let + initContent = let zshOpts = [ "auto_pushd" "pushd_ignore_dups" diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index 4ebbfac9..2584c815 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -1,5 +1,5 @@ -_: { - programs.zsh.initExtraFirst = '' +{ lib, ... }: { + programs.zsh.initContent = lib.mkBefore '' source /etc/static/zshrc ''; } diff --git a/common/overlay.nix b/nixos/common/overlay.nix similarity index 70% rename from common/overlay.nix rename to nixos/common/overlay.nix index bb552e37..6a64a79d 100644 --- a/common/overlay.nix +++ b/nixos/common/overlay.nix @@ -7,9 +7,6 @@ overlays = import tree.overlays {inherit inputs tree;}; config = { allowUnfree = true; - permittedInsecurePackages = [ - "olm-3.2.16" - ]; }; }; } diff --git a/outputs.nix b/outputs.nix index ea345473..a217e9b8 100644 --- a/outputs.nix +++ b/outputs.nix @@ -6,15 +6,17 @@ systems = import ./systems {inherit inputs tree lib std pkgs;}; shells = import ./shells {inherit inputs tree lib std pkgs;}; inherit (import ./pkgs.nix {inherit inputs tree overlay;}) pkgs; - formatter = import ./formatter.nix {inherit inputs pkgs;}; + formatting = import ./formatting.nix {inherit inputs pkgs;}; wrappers = import ./wrappers {inherit inputs;}; inherit (std) set; checks = set.map (_: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib; in { - inherit inputs tree std pkgs formatter lib checks; + inherit inputs tree std pkgs lib; legacyPackages = pkgs; packages = set.merge [pkgs wrappers.packages]; + checks = checks // formatting.checks; + formatter = formatting.formatter; } // systems // shells diff --git a/pkgs.nix b/pkgs.nix index 869f758f..159e73f7 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -5,7 +5,7 @@ }: let overlays = import tree.overlays {inherit inputs tree;}; in - inputs.utils.lib.eachDefaultSystem (system: { + inputs.flake-utils.lib.eachDefaultSystem (system: { pkgs = import inputs.nixpkgs { inherit system overlays; config = { diff --git a/shells/default.nix b/shells/default.nix index b62e989b..90c8e13e 100644 --- a/shells/default.nix +++ b/shells/default.nix @@ -8,7 +8,7 @@ }: let inherit (std) set; in - inputs.utils.lib.eachDefaultSystem (system: { + inputs.flake-utils.lib.eachDefaultSystem (system: { devShells = let shells = set.map (_: path: import path { diff --git a/systems/koishi.nix b/systems/koishi.nix index 1b8859f4..96565bf5 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -54,11 +54,7 @@ _: let #secureboot ]) ++ (with tree.nixos.environments; [ - #sway - #xfce - #openbox - hyprland - #gnome + niri ]); config = { home-manager.users.kat.imports = @@ -66,10 +62,7 @@ _: let graphical ]) ++ (with tree.home.environments; [ - #xfce - #sway - hyprland - #gnome + niri ]); fileSystems = datasetEntries // { diff --git a/treefmt.nix b/treefmt.nix new file mode 100644 index 00000000..2072958d --- /dev/null +++ b/treefmt.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + projectRootFile = "flake.nix"; + programs = { + alejandra.enable = true; + terraform.enable = true; + beautysh.enable = true; + }; +} diff --git a/wrappers/default.nix b/wrappers/default.nix index d493dba0..9525ebac 100644 --- a/wrappers/default.nix +++ b/wrappers/default.nix @@ -1,5 +1,5 @@ {inputs, ...} @ args: -inputs.utils.lib.eachDefaultSystem (system: let +inputs.flake-utils.lib.eachDefaultSystem (system: let newArgs = args // {inherit system;}; in { packages = {