stuff

flake.lock

@@ -17,35 +17,18 @@
         "type": "github"
       }
     },
-    "all-cabal-json_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1665552503,
-        "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
-        "owner": "nix-community",
-        "repo": "all-cabal-json",
-        "rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "hackage",
-        "repo": "all-cabal-json",
-        "type": "github"
-      }
-    },
     "base16-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1654895891,
+        "lastModified": 1665690101,
-        "narHash": "sha256-xYYmZkHnyLCUBAkqkZ7v1Lc5m39857MukQLMRtGuvdk=",
+        "narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=",
-        "owner": "base16-project",
+        "owner": "tinted-theming",
         "repo": "base16-schemes",
-        "rev": "7c247f734eac7f04518c6e28d098635ee8dcabf5",
+        "rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced",
         "type": "github"
       },
       "original": {
-        "owner": "base16-project",
+        "owner": "tinted-theming",
         "repo": "base16-schemes",
         "type": "github"
       }
@@ -97,6 +80,18 @@
         "url": "https://git.gaze.systems/dusk/website.git"
       }
     },
+    "catppuccin-discord": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-Yic2wQb2Dg86yimbTXDVdRcN1N+9FJrY34PQKpQuRfo=",
+        "type": "file",
+        "url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"
+      }
+    },
     "crane": {
       "flake": false,
       "locked": {
@@ -116,11 +111,11 @@
     "crane_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1661875961,
+        "lastModified": 1670900067,
-        "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
+        "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
+        "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
         "type": "github"
       },
       "original": {
@@ -148,11 +143,11 @@
     "devshell_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1666548262,
+        "lastModified": 1667210711,
-        "narHash": "sha256-4DyN4KXqQQsCw0vCXkMThw4b5Q4/q87ZZgRb4st8COc=",
+        "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "c8ce8ed81726079c398f5f29c4b68a7d6a3c2fa2",
+        "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
         "type": "github"
       },
       "original": {
@@ -225,31 +220,38 @@
       "inputs": {
         "alejandra": [
           "helix",
-          "nci",
+          "nci"
-          "nixpkgs"
+        ],
+        "all-cabal-json": [
+          "helix",
+          "nci"
         ],
-        "all-cabal-json": "all-cabal-json_2",
         "crane": "crane_2",
         "devshell": [
           "helix",
           "nci",
           "devshell"
         ],
+        "flake-parts": "flake-parts_2",
         "flake-utils-pre-commit": [
           "helix",
-          "nci",
+          "nci"
-          "nixpkgs"
+        ],
+        "ghc-utils": [
+          "helix",
+          "nci"
         ],
-        "ghc-utils": "ghc-utils_2",
         "gomod2nix": [
           "helix",
-          "nci",
+          "nci"
-          "nixpkgs"
         ],
         "mach-nix": [
           "helix",
-          "nci",
+          "nci"
-          "nixpkgs"
+        ],
+        "nix-pypi-fetcher": [
+          "helix",
+          "nci"
         ],
         "nixpkgs": [
           "helix",
@@ -258,21 +260,19 @@
         ],
         "poetry2nix": [
           "helix",
-          "nci",
+          "nci"
-          "nixpkgs"
         ],
         "pre-commit-hooks": [
           "helix",
-          "nci",
+          "nci"
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1666993587,
+        "lastModified": 1671323629,
-        "narHash": "sha256-4cLrs+CwWnceYXnCpL5gO3bybS9CjLxUoTEKjB2QFtg=",
+        "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "2b7456e3d2f0053bc2474fb0c461dd468545277f",
+        "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e",
         "type": "github"
       },
       "original": {
@@ -330,11 +330,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1667044926,
+        "lastModified": 1672946489,
-        "narHash": "sha256-VJx7GKkVmXCxsDfOXEDXGrAHZWyHN74Ax6GUXiir0Z8=",
+        "narHash": "sha256-IliWerC9qk4MxYNRoe/8uuQZkqjPJPsph46fmVBvo9U=",
         "owner": "elkowar",
         "repo": "eww",
-        "rev": "7a0e1b77f24ee89d627e552f9abc55eb636aaaa6",
+        "rev": "6a64a286291456984011c4fb160def106ee55dff",
         "type": "github"
       },
       "original": {
@@ -377,6 +377,24 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1668450977,
+        "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1656928814,
@@ -409,11 +427,11 @@
     },
     "flake-utils_3": {
       "locked": {
-        "lastModified": 1659877975,
+        "lastModified": 1667395993,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -438,22 +456,6 @@
         "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
       }
     },
-    "ghc-utils_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1662774800,
-        "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
-        "ref": "refs/heads/master",
-        "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
-        "revCount": 1072,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
-      }
-    },
     "haskell-flake": {
       "locked": {
         "lastModified": 1661726764,
@@ -492,11 +494,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1667455761,
+        "lastModified": 1674602802,
-        "narHash": "sha256-+1++fBJw6yIXpGrBHpDdYLLCD1XGNRh6CYCOWEAYb5o=",
+        "narHash": "sha256-MXq9P36zSJTD0yFd1cXC9AV6WJZJuL36R1rrwDlc0d4=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "ba394dca6d3a5b52622c4d7b0d3aba7c30af9701",
+        "rev": "91dca3f667e146f93e6dca205b0a3f2a7a64b488",
         "type": "github"
       },
       "original": {
@@ -513,11 +515,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1667468181,
+        "lastModified": 1674556204,
-        "narHash": "sha256-806/nrDW6e7bl4/oJEdAykYz/NaBuTUi7EUYArw2oic=",
+        "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "93335810751f0404fe424e61ad58bc8e94bf8e9d",
+        "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6",
         "type": "github"
       },
       "original": {
@@ -529,17 +531,19 @@
     },
     "hyprland": {
       "inputs": {
+        "hyprland-protocols": "hyprland-protocols",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "wlroots": "wlroots"
+        "wlroots": "wlroots",
+        "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1667482534,
+        "lastModified": 1674604320,
-        "narHash": "sha256-whsQ4dAdvOptYh3cHm5uu1Twik6TEZsU8FFOwS37El4=",
+        "narHash": "sha256-yhSiPmT3fmOaV2dLBNCsGGpN4t2Ucs6Q3dGygBH34sc=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d0e47d9fe09dfa3be0c46833bee832ddbe0fcb51",
+        "rev": "12e293e3092b03dbb9d82e7a749f482ef2b7ea6e",
         "type": "github"
       },
       "original": {
@@ -555,11 +559,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1666104453,
+        "lastModified": 1672071700,
-        "narHash": "sha256-gMH11FNZtnU7d+pIkwg9NmumJ6YvxyUP9Do43YKrd/E=",
+        "narHash": "sha256-Z0pbBVtijv4xbL42rPzMoYFSOqALFRYDMN9iOumSEso=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "5b21c74a3200ffdd48ed7764c7041d43c3cd5588",
+        "rev": "37c8121f98d76f57caa00dd7106877876e0d7483",
         "type": "github"
       },
       "original": {
@@ -568,6 +572,27 @@
         "type": "github"
       }
     },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1671839510,
+        "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
     "nci": {
       "inputs": {
         "devshell": "devshell",
@@ -606,11 +631,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667232647,
+        "lastModified": 1671430291,
-        "narHash": "sha256-cFo7G8BqYShgL9m7yD6p+SHAZ+aIt2guuF69LV235n8=",
+        "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "16082f7b4e42ce140a562fa630bcf8e96eadeb59",
+        "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c",
         "type": "github"
       },
       "original": {
@@ -628,11 +653,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1666573264,
+        "lastModified": 1674573236,
-        "narHash": "sha256-0pNGQaU8DSqVgg2susfzUID+fHw6l6oQxve6eB8EZU8=",
+        "narHash": "sha256-VN1KG1Sh9s5IpLzVhCYAQcBITh4jmG8gl0F4wBX8lVk=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "68d9663f8eb556df8f5b4629614004f595e6af4e",
+        "rev": "6e5321582ca7595455edf2a9643f83ce390d0a71",
         "type": "github"
       },
       "original": {
@@ -644,14 +669,14 @@
     "nix-colors": {
       "inputs": {
         "base16-schemes": "base16-schemes",
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1667165773,
+        "lastModified": 1672236234,
-        "narHash": "sha256-47gEPN7UKrNM+a3OKAFtNQeyc1/sSPgDm3OGCgphCyo=",
+        "narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=",
         "owner": "Misterio77",
         "repo": "nix-colors",
-        "rev": "a58fb210eb285920ec10f204d007185b3629cadc",
+        "rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1",
         "type": "github"
       },
       "original": {
@@ -667,11 +692,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1666918008,
+        "lastModified": 1671116920,
-        "narHash": "sha256-SqdXt8rPOj59mgIFwB+DvkzDbLWjrChw+UyVfMlS6Rg=",
+        "narHash": "sha256-QmDGsUUmAGn77UTR7eQJmebl8f3IIUCtmbbAdJqKA3s=",
         "owner": "matthewcroughan",
         "repo": "nixinate",
-        "rev": "118c71c5111ab218d0cca3e4c77303797344b409",
+        "rev": "b4d17b8e2a4abc47e93e1a1c466e0286a63640d8",
         "type": "github"
       },
       "original": {
@@ -682,11 +707,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1667283320,
+        "lastModified": 1674550793,
-        "narHash": "sha256-qHvB/6XBKVjjJJCUM+z6/t9HzUC7J55wdY3KJ/ZWSHo=",
+        "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "18934557eeba8fa2e575b0fd4ab95186e2e3bde3",
+        "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
         "type": "github"
       },
       "original": {
@@ -697,11 +722,11 @@
     },
     "nixos-persistence": {
       "locked": {
-        "lastModified": 1661933071,
+        "lastModified": 1668668915,
-        "narHash": "sha256-RFgfzldpbCvS+H2qwH+EvNejvqs+NhPVD5j1I7HQQPY=",
+        "narHash": "sha256-QjY4ZZbs9shwO4LaLpvlU2bO9J1juYhO9NtV3nrbnYQ=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "def994adbdfc28974e87b0e4c949e776207d5557",
+        "rev": "5df9108b346f8a42021bf99e50de89c9caa251c3",
         "type": "github"
       },
       "original": {
@@ -727,6 +752,24 @@
       }
     },
     "nixpkgs-lib": {
+      "locked": {
+        "dir": "lib",
+        "lastModified": 1665349835,
+        "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
+        "type": "github"
+      },
+      "original": {
+        "dir": "lib",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1655599917,
         "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=",
@@ -744,11 +787,11 @@
     "nixpkgs-wayland": {
       "flake": false,
       "locked": {
-        "lastModified": 1667477532,
+        "lastModified": 1674656022,
-        "narHash": "sha256-tGy6lGMf0ElLDDKxGX15tJRC44rbqtIU8vDvFUHfbNY=",
+        "narHash": "sha256-/GPbEGC4rfvG/ySNmwGmXA9w7o0NxducqVXJJREN328=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "6bc549f2f03a1f6ea7fa6536b8870b48b8c86ebe",
+        "rev": "880c0dc1dc100b2938e49206cc145fbec39ca532",
         "type": "github"
       },
       "original": {
@@ -775,11 +818,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1667142599,
+        "lastModified": 1671359686,
-        "narHash": "sha256-OLJxsg9VqfKjFkerOxWtNIkibsCvxsv5A8wNWO1MeWk=",
+        "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "412b9917cea092f3d39f9cd5dead4effd5bc4053",
+        "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
         "type": "github"
       },
       "original": {
@@ -791,11 +834,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1667231093,
+        "lastModified": 1674459583,
-        "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=",
+        "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458",
+        "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f",
         "type": "github"
       },
       "original": {
@@ -807,11 +850,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1667496346,
+        "lastModified": 1674651781,
-        "narHash": "sha256-n0bHzcQ/sx+E96FumgF2OeT6bbTendRDtmQHijTrQg0=",
+        "narHash": "sha256-EXq3gfw6uJLlyaSkv1GiFuJx5fVkBFKeAe2UBqTZ7wA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "04d9c7bd3c4a2ce32f44cc970cc3e03d5a4aa334",
+        "rev": "30a00b5df32dfa34f069e83bc92283bd614cd021",
         "type": "github"
       },
       "original": {
@@ -824,6 +867,7 @@
       "inputs": {
         "bernbot": "bernbot",
         "blog": "blog",
+        "catppuccin-discord": "catppuccin-discord",
         "eww": "eww",
         "helix": "helix",
         "home": "home",
@@ -886,11 +930,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667184938,
+        "lastModified": 1671416426,
-        "narHash": "sha256-/kuCiXuAxiD0c0zrfDvJ1Yba3FuVdRk/ROfb393AeX4=",
+        "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8f81faec35508647ced65c44fd3e8648a5518afb",
+        "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d",
         "type": "github"
       },
       "original": {
@@ -911,11 +955,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1666494036,
+        "lastModified": 1674095406,
-        "narHash": "sha256-4mmm+1MBPMD56LMLN9QcEwnfnu41NkA6lDeZGjSrxIw=",
+        "narHash": "sha256-RexH/1rZTiX4OhdYkuJP3MuANJ+JRgoLKL60iHm//T0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "af2e939ba2c7cbb188d06d6650c6353b10b3f2be",
+        "rev": "5f7315b9800e2e500e6834767a57e39f7dbfd495",
         "type": "github"
       },
       "original": {
@@ -943,11 +987,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1667077288,
+        "lastModified": 1667395993,
-        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -960,11 +1004,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1666466001,
+        "lastModified": 1672824257,
-        "narHash": "sha256-ZjxAnqtcGmHQHKL1Z9sIraDnzIqrJleWcJXfPtzAm74=",
+        "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "c2d2773df57750081b16d56da13b5015d752cbd7",
+        "rev": "5f264a7d6c8af27d41ff440c05262b022c055593",
         "type": "gitlab"
       },
       "original": {
@@ -973,6 +1017,31 @@
         "repo": "wlroots",
         "type": "gitlab"
       }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1673116118,
+        "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -37,6 +37,8 @@
     eww.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-colors.url = "github:Misterio77/nix-colors";
+    catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
+    catppuccin-discord.flake = false;
   };
 
   outputs = inputs: let

hosts/tkaronto/default.nix

@@ -30,13 +30,13 @@
         domain = "*";
         type = "soft";
         item = "nofile";
-        value = "524288";
+        value = "16777216";
       }
       {
         domain = "*";
         type = "hard";
         item = "nofile";
-        value = "524288";
+        value = "16777216";
       }
     ];
     allowSimultaneousMultithreading = true;
@@ -122,12 +122,5 @@
     gvfs.enable = true;
   };
 
-  virtualisation = {
-    waydroid.enable = false;
-    podman.enable = false;
-    docker.enable = false;
-    libvirtd.enable = false;
-  };
-
   system.stateVersion = "22.05";
 }

hosts/tkaronto/modules/gnome-boxes.nix

@@ -0,0 +1 @@
+../../../modules/gnome-boxes/default.nix

modules/ananicy/default.nix

@@ -20,6 +20,7 @@ in {
       (mkRule "ld" "BG_CPUIO")
       (mkRule "gold" "BG_CPUIO")
       (mkRule "rustc" "BG_CPUIO")
+      (mkRule "zig" "BG_CPUIO")
       (mkRule "cargo" "BG_CPUIO")
       (mkRule "rust-analyzer" "BG_CPUIO")
       (mkRule "go" "BG_CPUIO")
@@ -31,11 +32,16 @@ in {
       # browser
       (mkRule "firefox" "Doc-View")
       (mkRule ".firefox-wrapped" "Doc-View")
+      (mkRule "chromium" "Doc-View")
+      (mkRule ".chromium-wrapped" "Doc-View")
       # wm
       (mkRule ".gnome-shell-wrapped" "LowLatency_RT")
       (mkRule "gnome-shell" "LowLatency_RT")
       (mkRule "Hyprland" "LowLatency_RT")
+      (mkRule "sway" "LowLatency_RT")
+      (mkRule ".sway-wrapped" "LowLatency_RT")
       (mkRule "rofi" "LowLatency_RT")
+      (mkRule ".rofi-wrapped" "LowLatency_RT")
       (mkRule "wlsunset" "BG_CPUIO")
       (mkRule "swayidle" "BG_CPUIO")
       # term

modules/base/hm-system-defaults.nix

@@ -40,5 +40,8 @@
       ];
     })
   ];
-  home-manager.extraSpecialArgs = {inherit inputs tlib;};
+  home-manager.extraSpecialArgs = {
+    inherit inputs tlib;
+    nixosConfig = config;
+  };
 }

modules/cachix/iohk.nix

@@ -1,6 +0,0 @@
-{
-  nix.settings = {
-    trusted-public-keys = ["hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="];
-    substituters = ["https://hydra.iohk.io"];
-  };
-}

modules/gamemode/default.nix

@@ -27,8 +27,8 @@ in {
         renice = 15;
       };
       custom = {
-        start = "${startscript}";
+        # start = "${startscript}";
-        end = "${endscript}";
+        # end = "${endscript}";
       };
     };
   };

modules/gnome-boxes/default.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  virtualisation.libvirtd.enable = true;
+  environment.systemPackages = [pkgs.gnome.gnome-boxes];
+}

modules/network/default.nix

@@ -1,3 +1,4 @@
 {
   imports = [./networkmanager];
+  systemd.network.wait-online.enable = false;
 }

modules/network/networkmanager/default.nix

@@ -1,4 +1,7 @@
 {
   imports = [../dns ../iwd];
-  networking.networkmanager.enable = true;
+  networking.networkmanager = {
+    enable = true;
+    wifi.powersave = true;
+  };
 }

pkgs-set/overlays/helix.nix

@@ -3,6 +3,6 @@
     includeGrammarIf = grammar:
       prev.lib.any
       (name: grammar.name == name)
-      ["toml" "rust" "nix" "protobuf" "yaml" "json" "markdown" "html" "css"];
+      ["toml" "rust" "nix" "protobuf" "yaml" "json" "markdown" "html" "css" "zig"];
   };
 }

pkgs-set/overlays/nixpkgs-wayland.nix

@@ -1 +1,2 @@
-{inputs}: (import "${inputs.nixpkgs-wayland}/overlay.nix")
+# {inputs}: (import "${inputs.nixpkgs-wayland}/overlay.nix")
+final: prev: prev

pkgs-set/overlays/obsidian.nix

@@ -2,7 +2,7 @@ final: prev: {
   obsidian = prev.obsidian.overrideAttrs (old: {
     installPhase =
       prev.lib.replaceStrings
-      ["makeWrapper ${final.electron_17}/bin/electron $out/bin/obsidian"]
+      ["makeWrapper ${final.electron_18}/bin/electron $out/bin/obsidian"]
       [
         ''          makeWrapper ${final.electron_20}/bin/electron $out/bin/obsidian \
                   --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"''

pkgs-set/overlays/polymc.nix

@@ -1,5 +0,0 @@
-{inputs}: final: prev: {
-  polymc = prev.polymc.overrideAttrs (old: {
-    patches = [((toString inputs.self) + "/pkgs-set/patches/polymc-offline.patch")];
-  });
-}

pkgs-set/overlays/prismlauncher.nix

@@ -0,0 +1,5 @@
+{inputs}: final: prev: {
+  # prismlauncher = prev.prismlauncher.overrideAttrs (old: {
+  #   patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")];
+  # });
+}

pkgs-set/overlays/spotify.nix

@@ -0,0 +1,14 @@
+final: prev: {
+  spotify =
+    final.runCommand prev.spotify.name {
+      inherit (prev.spotify) meta;
+      nativeBuildInputs = [final.makeWrapper];
+    } ''
+      shopt -s extglob
+      mkdir -p $out/bin
+      ln -sf ${prev.spotify}/!(bin) $out/
+      ln -sf ${prev.spotify}/bin/* $out/bin/
+      wrapProgram $out/bin/spotify \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
+    '';
+}

users/modules/chromium/default.nix

@@ -1,5 +1,8 @@
 {config, ...}: {
-  home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [".config/chromium"];
+  home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
+    ".config/chromium"
+    ".local/share/applications"
+  ];
   programs.chromium = {
     enable = true;
     commandLineArgs = [

users/modules/discord/default.nix

@@ -4,12 +4,7 @@
   pkgs,
   lib,
   ...
-}: let
+}: {
-  theme = pkgs.fetchurl {
-    url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
-    hash = "sha256-LCjw3k2NuPKGwAEvPUnJeQk9zQQ+TyHpZ/eNrETkWSM=";
-  };
-in {
   home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
     ".config/discordcanary"
   ];
@@ -18,7 +13,7 @@ in {
       setup = true;
       noTyping = true;
       quickstart = true;
-      theme = builtins.readFile theme;
+      theme = builtins.readFile inputs.catppuccin-discord;
     };
     SKIP_HOST_UPDATE = true;
     IS_MAXIMIZED = true;
@@ -42,6 +37,7 @@ in {
     ];
     pkg =
       (pkgs.discord-canary.override {
+        nss = pkgs.nss_latest;
         withOpenASAR = true;
       })
       .overrideAttrs (old: {

users/modules/foot/default.nix

@@ -1,7 +1,13 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   settings.terminal.name = "foot";
+  settings.terminal.binary = "${pkgs.foot}/bin/foot";
   programs.foot = {
     enable = true;
+    package = pkgs.foot;
     server.enable = false;
     settings = {
       main = {

users/modules/lollypop/default.nix

@@ -0,0 +1,8 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home.packages = [pkgs.lollypop];
+  home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [".local/share/lollypop"];
+}

users/modules/newsflash/default.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home.packages = [pkgs.newsflash];
+  home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
+    ".local/share/news-flash"
+    ".config/news-flash"
+  ];
+}

users/modules/settings/default.nix

@@ -35,6 +35,9 @@ in {
       name = l.mkOption {
         type = t.str;
       };
+      binary = l.mkOption {
+        type = t.path;
+      };
     };
     settings.font = {
       regular = fontSettings;

users/modules/spotify/default.nix

@@ -0,0 +1,16 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.spotifyd = {
+    enable = true;
+    settings = {
+      device_name = "nix";
+    };
+  };
+  home.packages = [pkgs.spotify-tui];
+  home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
+    ".config/spotify-tui"
+  ];
+}

users/modules/sway/default.nix

@@ -0,0 +1,118 @@
+{
+  config,
+  nixosConfig,
+  pkgs,
+  lib,
+  tlib,
+  ...
+}: {
+  imports = [
+    ../wayland
+    ../swaylock
+    ../wlsunset
+    ../dunst
+    ../rofi
+    # ./swayidle.nix
+  ];
+  wayland.windowManager = {
+    sway = let
+      mkRofiCmd = args: "${config.programs.rofi.package}/bin/rofi ${lib.concatStringsSep " " args} | ${pkgs.sway}/bin/swaymsg --";
+      inherit (tlib) pkgBin;
+    in {
+      enable = true;
+      extraSessionCommands = ''
+        export SDL_VIDEODRIVER=wayland
+        export QT_QPA_PLATFORM=wayland
+      '';
+      wrapperFeatures.gtk = true;
+      extraConfig = ''
+        exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+        exec xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2
+      '';
+      config = {
+        fonts = {
+          names = [config.settings.font.regular.name];
+          size = config.settings.font.regular.size + 0.0;
+        };
+        bars = [];
+        gaps.smartBorders = "on";
+        menu = mkRofiCmd ["-show" "drun"];
+        modifier = "Mod4";
+        terminal = config.settings.terminal.binary;
+        keybindings = let
+          mod = config.wayland.windowManager.sway.config.modifier;
+
+          cat = pkgs.coreutils + "/bin/cat";
+          grim = pkgBin pkgs.grim;
+          slurp = pkgBin pkgs.slurp;
+          pactl = pkgs.pulseaudio + "/bin/pactl";
+          playerctl = pkgBin pkgs.playerctl;
+          wf-recorder = pkgBin pkgs.wf-recorder;
+          wl-copy = pkgs.wl-clipboard + "/bin/wl-copy";
+          wlogout = pkgBin pkgs.wlogout;
+          light = pkgBin pkgs.light;
+
+          shotFile = config.home.homeDirectory + "/shots/shot_$(date '+%Y_%m_%d_%H_%M')";
+          shotDir = config.home.homeDirectory + "/shots";
+        in
+          lib.mkOptionDefault
+          {
+            "${mod}+Escape" = "exec ${wlogout} -p layer-shell";
+            "${mod}+q" = "kill";
+            "${mod}+Shift+e" = "exit";
+            "${mod}+Shift+r" = "reload";
+            # Screenshot and copy it to clipboard
+            "Mod1+s" = ''
+              exec export SFILE="${shotFile}.png" && mkdir -p ${shotDir} && ${grim} "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png
+            '';
+            # Save selected area as a picture and copy it to clipboard
+            "Mod1+Shift+s" = ''
+              exec export SFILE="${shotFile}.png" && mkdir -p ${shotDir} && ${grim} -g "$(${slurp})" "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png
+            '';
+            # Record screen
+            "Mod1+r" = ''exec mkdir -p ${shotDir} && ${wf-recorder} -f "${shotFile}.mp4"'';
+            # Record an area
+            "Mod1+Shift+r" = ''exec mkdir -p ${shotDir} && ${wf-recorder} -g "$(${slurp})" -f "${shotFile}.mp4"'';
+            # Stop recording
+            "Mod1+c" = "exec pkill -INT wf-recorder";
+            "XF86AudioRaiseVolume" = "exec ${pactl} set-sink-volume 0 +5%";
+            "XF86AudioLowerVolume" = "exec ${pactl} set-sink-volume 0 -5%";
+            "XF86AudioMute" = "exec ${pactl} set-sink-mute 0 toggle";
+            "XF86AudioPlay" = "exec ${playerctl} play-pause";
+            "XF86AudioPrev" = "exec ${playerctl} previous";
+            "XF86AudioNext" = "exec ${playerctl} next";
+            "XF86AudioStop" = "exec ${playerctl} stop";
+            "XF86MonBrightnessUp" = "exec ${light} -T 1.4";
+            "XF86MonBrightnessDown" = "exec ${light} -T 0.72";
+          };
+        input = {
+          "type:keyboard" = {
+            xkb_layout = nixosConfig.services.xserver.layout;
+          };
+          "type:pointer" = {
+            accel_profile = "flat";
+          };
+          "type:touchpad" = {
+            accel_profile = "adaptive";
+            tap = "enabled";
+            scroll_method = "edge";
+            dwt = "enabled";
+            events = "disabled_on_external_mouse";
+          };
+        };
+        output = {
+          "*" = {
+            bg = "${config.home.homeDirectory}/.config/wallpaper fill";
+          };
+          "eDP-1" = {
+            scale = "2";
+            adaptive_sync = "on";
+          };
+          "HDMI-A-1" = {
+            mode = "1920x1080@74.973Hz";
+          };
+        };
+      };
+    };
+  };
+}

users/patriot/default.nix

@@ -10,7 +10,7 @@
 
   nixosConfig = globalAttrs.config;
 in {
-  imports = [../../modules/de/gnome];
+  # imports = [../../modules/de/gnome];
   users.users.patriot = {
     isNormalUser = true;
     createHome = true;
@@ -33,6 +33,7 @@ in {
       "/home/patriot/proj"
       "/home/patriot/games"
       "/home/patriot/.var"
+      "/home/patriot/.config/libvirt"
     ];
     systemPackages = with pkgs; [qt5.qtwayland];
     shells = with pkgs; [bashInteractive zsh];
@@ -55,6 +56,10 @@ in {
     seahorse.enable = true;
     dconf.enable = true;
     weylus.users = ["patriot"];
+    java = {
+      enable = true;
+      package = pkgs.jre8;
+    };
   };
   services = {
     syncthing.folders = {
@@ -99,6 +104,7 @@ in {
       modulesToEnable = l.flatten [
         # wm
         # ["hyprland" "foot"]
+        ["sway" "foot"]
         # desktop stuff
         ["wayland"]
         ["chromium"]
@@ -106,6 +112,7 @@ in {
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
         # dev stuff
         ["helix" "git" "ssh" "obsidian"]
+        ["lollypop" "newsflash"]
       ];
     in
       l.flatten [
@@ -139,10 +146,13 @@ in {
           "keyrings"
           "lutris"
           "Terraria"
+          "gnome-boxes"
+          "PrismLauncher"
         ]
         ++ mkPaths ".config" [
           "lutris"
           "dconf"
+          "gnome-boxes"
         ];
       files = l.flatten [
         ".config/wallpaper"
@@ -166,7 +176,7 @@ in {
     };
 
     settings.iconTheme = {
-      name = "Yaru";
+      name = "Yaru-dark";
       package = pkgs.yaru-theme;
     };
 
@@ -190,7 +200,7 @@ in {
       iconTheme = config.settings.iconTheme;
 
       theme = {
-        name = "Yaru-Dark";
+        name = "Yaru-dark";
         package = pkgs.yaru-theme;
       };
     };
@@ -221,15 +231,11 @@ in {
         lutris
         protontricks
         # fractal-next
-        (
-          writeShellScriptBin "gh" ''
-            GH_TOKEN=${secrets.githubToken} ${gh}/bin/gh $@
-          ''
-        )
         obs-studio
         libreoffice-fresh
         helvum
         nix-output-monitor
+        prismlauncher
       ];
     };
     programs = {
@@ -243,11 +249,12 @@ in {
         userName = name;
         userEmail = email;
       };
-      # zsh.loginExtra = ''
+      zsh.loginExtra = ''
-      #   if [[ "$(tty)" == "/dev/tty1" ]]; then
+        if [[ "$(tty)" == "/dev/tty1" ]]; then
-      #     exec Hyprland
+          export WLR_DRM_DEVICES=/dev/dri/card0
-      #   fi
+          exec sway --unsupported-gpu
-      # '';
+        fi
+      '';
     };
     services = {
       gpg-agent = let