chore: lock n load

flake.lock

@@ -1,5 +1,38 @@
 {
   "nodes": {
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738456976,
+        "narHash": "sha256-cufyHbOMnSt9V4w4OVSzNcpJ+8DwzRZRJaca2Q89KVI=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "257b2050790ab3b1eb389e0f8bdc400eb9510139",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "buildbot-nix": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -39,6 +72,21 @@
         "type": "github"
       }
     },
+    "crane_2": {
+      "locked": {
+        "lastModified": 1736898272,
+        "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "dream2nix": {
       "inputs": {
         "nixpkgs": [
@@ -128,6 +176,37 @@
     },
     "flake-compat_5": {
       "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_6": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_7": {
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -243,7 +322,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -282,7 +361,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -321,11 +400,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1738275804,
+        "lastModified": 1738619868,
-        "narHash": "sha256-n9cSCLlWjc8Bc5QyZYLo5+c6MfTZjgDpUGx/FGxBiY8=",
+        "narHash": "sha256-q4h4SY1kVkZG4t/59CmJvaKjlx+xjojhdU1HqxiQhrQ=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "c5508e7d1922842ecd3160ea73b97da1282168b3",
+        "rev": "f0d276062b78658fc1f3857e9ea104788f1f4e58",
         "type": "github"
       },
       "original": {
@@ -335,6 +414,28 @@
       }
     },
     "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_2": {
       "inputs": {
         "nixpkgs": [
           "ngipkgs",
@@ -356,7 +457,7 @@
         "type": "github"
       }
     },
-    "gitignore_2": {
+    "gitignore_3": {
       "inputs": {
         "nixpkgs": [
           "pre-commit-hooks-nix",
@@ -387,11 +488,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1738547365,
+        "lastModified": 1738625866,
-        "narHash": "sha256-4GrVwyIZKx14eVG8TZMKmgyw8v3TuETPrLvYkFNqlyc=",
+        "narHash": "sha256-0GibVm6Pfm99Lu5fcH68YGa3jO0zUdoO+V3DqmAcJTc=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "066e938ba083c0259ff411b681eca7bad30980df",
+        "rev": "8995ccaae25b1af2e052d0d78ed74e7d225dec5a",
         "type": "github"
       },
       "original": {
@@ -434,11 +535,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738448366,
+        "lastModified": 1738610386,
-        "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
+        "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
+        "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe",
         "type": "github"
       },
       "original": {
@@ -447,6 +548,396 @@
         "type": "github"
       }
     },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738178255,
+        "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738437059,
+        "narHash": "sha256-J+8ecqaP3zD9GHeN8Y4hUapoELSoggp0IZI8laTFt/0=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "5ac80e3686a4dfa55d2bd15c81a266b89594a295",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems_3",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1738622170,
+        "narHash": "sha256-M9lm/lbT10cOXcfMMEzRFLehDlVWnkiy38xVDPWyqk4=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "5e7292434a9189d0550187f8a6fb687848194a41",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-portal": {
+      "inputs": {
+        "hyprland-protocols": "hyprland-protocols_2",
+        "hyprlang": "hyprlang_2",
+        "hyprutils": "hyprutils_2",
+        "hyprwayland-scanner": "hyprwayland-scanner_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1737634991,
+        "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738422629,
+        "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols_2": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland-portal",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-portal",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737556638,
+        "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
+        "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": 1737981711,
+        "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634606,
+        "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprlang_2": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland-portal",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland-portal",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-portal",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634606,
+        "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737978343,
+        "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprutils_2": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland-portal",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-portal",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737632363,
+        "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "006620eb29d54ea9086538891404c78563d1bae1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735493474,
+        "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner_2": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland-portal",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-portal",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735493474,
+        "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
     "lix": {
       "flake": false,
       "locked": {
@@ -489,9 +980,9 @@
         "flake-utils": "flake-utils_4",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable_2",
-        "pre-commit-hooks": "pre-commit-hooks",
+        "pre-commit-hooks": "pre-commit-hooks_2",
         "sops-nix": "sops-nix",
-        "systems": "systems_4"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1738530522,
@@ -573,11 +1064,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1738410390,
+        "lastModified": 1738546358,
-        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+        "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+        "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
         "type": "github"
       },
       "original": {
@@ -627,8 +1118,53 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks-nix": {
+      "inputs": {
+        "flake-compat": "flake-compat_5",
+        "gitignore": "gitignore_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore_2",
         "nixpkgs": [
           "ngipkgs",
           "nixpkgs"
@@ -648,31 +1184,9 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks-nix": {
-      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737465171,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "purescript-overlay": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "ngipkgs",
           "dream2nix",
@@ -717,15 +1231,18 @@
         "ghostty": "ghostty",
         "helix": "helix",
         "home-manager": "home-manager",
+        "hyprland": "hyprland",
+        "hyprland-portal": "hyprland-portal",
         "lix-module": "lix-module",
         "ngipkgs": "ngipkgs",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "sops-nix": "sops-nix_2",
-        "systems": "systems_5",
+        "systems": "systems_7",
         "waybar": "waybar",
-        "yazi": "yazi"
+        "yazi": "yazi",
+        "zed-editor": "zed-editor"
       }
     },
     "rust-overlay": {
@@ -770,6 +1287,27 @@
         "type": "github"
       }
     },
+    "rust-overlay_3": {
+      "inputs": {
+        "nixpkgs": [
+          "zed-editor",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737166965,
+        "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "slimlock": {
       "inputs": {
         "nixpkgs": [
@@ -866,16 +1404,16 @@
     },
     "systems_3": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1689347949,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -895,6 +1433,36 @@
       }
     },
     "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": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_7": {
       "locked": {
         "lastModified": 1680978846,
         "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
@@ -909,7 +1477,7 @@
         "type": "github"
       }
     },
-    "systems_6": {
+    "systems_8": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -969,7 +1537,7 @@
     },
     "waybar": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_6",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -988,6 +1556,47 @@
         "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": 1737634991,
+        "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
+    },
     "yazi": {
       "inputs": {
         "flake-utils": "flake-utils_5",
@@ -995,11 +1604,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1738314122,
+        "lastModified": 1738657731,
-        "narHash": "sha256-lyA97h4cKYgX/RX2IDw1J3XWCj9rC4v2yW70nEX2wYo=",
+        "narHash": "sha256-TfqSe8oywhZEIBs//PI7WXy+PtfkJTEbmFJ5tfXHvcM=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "c41f2e21e039c068d4ae1d286f2a8a9eef182895",
+        "rev": "4e96341f512522d948977f5dc97a32c0c88f447b",
         "type": "github"
       },
       "original": {
@@ -1008,6 +1617,29 @@
         "type": "github"
       }
     },
+    "zed-editor": {
+      "inputs": {
+        "crane": "crane_2",
+        "flake-compat": "flake-compat_7",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_3"
+      },
+      "locked": {
+        "lastModified": 1738656328,
+        "narHash": "sha256-bxFVQC8OuL2pdz4DYb8s0y+1pSftXGc375PDO0ZQRtk=",
+        "owner": "zed-industries",
+        "repo": "zed",
+        "rev": "386cfacb25aae8e89d337f2893f5f8ec14cfee6b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zed-industries",
+        "repo": "zed",
+        "type": "github"
+      }
+    },
     "zig": {
       "inputs": {
         "flake-compat": [

flake.nix

@@ -41,8 +41,19 @@
       url = "github:Alexays/Waybar";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    hyprland = {
+      url = "github:hyprwm/Hyprland";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprland-portal = {
+      url = "github:hyprwm/xdg-desktop-portal-hyprland";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    zed-editor = {
+      url = "github:zed-industries/zed";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
-
   outputs =
     inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
@@ -65,6 +76,7 @@
               ./profiles/user1
               config.nixosModules.desktop
               config.nixosModules.hyprland
+              config.nixosModules.wayland
               config.nixosModules.personal
               config.nixosModules.shared
               config.nixosModules.sops

home/default.nix

@@ -50,7 +50,9 @@ in
             messaging
             sharing
             tools
-            hypr
+            hyprland
+            wayland
+            theming
             ;
         };
       };

home/modules/gui/apps/code/cursor/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      code-cursor
+      ;
+  };
+}

home/modules/gui/apps/code/zed/default.nix

@@ -18,10 +18,12 @@ let
       ;
   };
   extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; };
+  packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
 in
 {
   programs.zed-editor = {
     enable = true;
+    # package = packagePath;
     extraPackages = extraPackagesPath;
     extensions = extensionsPath;
     userKeymaps = userKeymapsPath;

home/modules/gui/apps/messaging/discord/default.nix

@@ -1,11 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
 {
-  pkgs,
+  imports = importList;
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      discord
-      ;
-  };
 }

home/modules/gui/apps/messaging/discord/discordCanary/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      discord-canary
+      ;
+  };
+}

home/modules/gui/apps/messaging/discord/discordOfficial/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      discord
+      ;
+  };
+}

home/modules/gui/apps/messaging/discord/webcord/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      webcord
+      ;
+  };
+}

home/modules/gui/apps/messaging/matrix/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/gui/desktop/hypr/hyprland/config/bind.nix

@@ -10,14 +10,14 @@ let
   superBinds = builtins.map (x: "SUPER, " + x) [
     # Apps
     "Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun"
-    "C, exec, zed"
+    "C, exec, zeditor"
     "A, exec, obsidian"
     "D, exec, ghostty -e zellij a dotfiles"
     "E, exec, ghostty -e nu -e y"
     "T, exec, ghostty"
     "G, exec, firefox https://cronometer.com/#diary"
     "B, exec, firefox"
-    "V, exec, vesktop"
+    "V, exec, discordcanary"
     "W, exec, bitwarden"
     "H, exec, feishin"
     "Y, exec, scrcpy"

home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix

@@ -3,6 +3,13 @@ let
   inherit (flake.config.aesthetics.themes)
     cursor
     ;
+  scarlettOut = "pactl set-default-sink alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink";
+  scarlettIn = "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source";
+  catppuccin = [
+    "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'"
+    "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
+    "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
+  ];
 in
 [
   "swaylock"
@@ -15,15 +22,12 @@ in
   "waybar"
   "nm-applet"
   "blueman-applet"
+  "rfkill block bluetooth"
+  "rfkill unblock bluetooth"
   "easyeffects -r"
   "emote"
   "flameshot"
-  "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1"
+  scarlettIn
-  "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
+  scarlettOut
-  "bluetoothctl power on"
-  "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'"
-  "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
-  "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
-  # "systemctl --user import-environment PATH"
-  # "systemctl --user restart xdg-desktop-portal.service"
 ]
+++ catppuccin

home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix

@@ -10,6 +10,7 @@ let
   flameshot = "(flameshot)";
   bitwarden = "(.*Bitwarden.*)";
   save = "(.*Enter name of file to save to….*)";
+  proton = "(.*.protonvpn-app-wrapped.*)";
   picture = "(.*Picture-in-Picture.*)";
   discord-popout = "(.*Discord Popout.*)";
   upload = "(.*File Upload.*)";
@@ -28,10 +29,10 @@ let
     "maxsize 360 500, class:^${calculator}$"
     "maxsize 720 400, class:^${easyeffects}$"
     "maxsize 720 400, class:^${scrcpy}$"
-    "minsize 720 400, class:^${scrcpy}$"
     "maxsize 720 400, class:^${mpv}$"
     "maxsize 720 400, class:^${vlc}$"
     "maxsize 640 360, class:^${nomacs}$"
+    "maxsize 1000 600, class:^${proton}$"
     "maxsize 800 450, title:^${bitwarden}$"
     "maxsize 720 400, title:^${picture}$"
     "maxsize 720 400, title:^${save}$"
@@ -52,6 +53,8 @@ let
     "class:^${nomacs}$"
     "class:^${flameshot}$"
     "class:^${scrcpy}$"
+    "class:^${nomacs}$"
+    "class:^${proton}$"
     "title:^(${picture})$"
     "title:^(${discord-popout})$"
     "title:^${bitwarden}$"

home/modules/gui/desktop/hypr/hyprland/default.nix

@@ -1,21 +1,18 @@
 {
   flake,
   config,
+  pkgs,
   ...
 }:
 let
-  # hostname = config.networking.hostName;
+
-  # inherit (flake.config.machines.devices) desktop laptop;
   configPath = ./config;
   configImports = {
     animations = import (configPath + /animations.nix);
     bind = import (configPath + /bind.nix) { inherit flake config; };
     bindm = import (configPath + /bindm.nix);
     binds = import (configPath + /binds.nix);
-    # bindl =
+    # bindl = import (configPath + /bindl.nix);
-    #   if hostname == laptop.name
-    #   then import (configPath + /bindl.nix)
-    #   else null;
     decoration = import (configPath + /decoration.nix);
     dwindle = import (configPath + /dwindle.nix);
     exec-once = import (configPath + /exec-once.nix) { inherit flake; };
@@ -28,6 +25,8 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = true;
+    package = null;
+    portalPackage = null;
     xwayland.enable = true;
     systemd = {
       enable = true;

home/modules/gui/desktop/river/config/map.nix

@@ -0,0 +1,21 @@
+{
+  # "Super Space" = "rm -r /home/$USER/.cache/tofi* ; tofi-drun";
+  "Super C" = "zed";
+  "Super A" = "obsidian";
+  # "Super D" = "ghostty -e zellij a dotfiles";
+  # "Super E" = "ghostty -e nu -e y";
+  "Super T" = "ghostty";
+  # "Super G" = "firefox https://cronometer.com/#diary";
+  "Super B" = "firefox";
+  "Super V" = "vesktop";
+  "Super W" = "bitwarden";
+  "Super H" = "feishin";
+  "Super Y" = "scrcpy";
+  # "Super R" = "ghostty -e nu -e btm";
+  "Super N" = "signal-desktop";
+  "Super M" = "element-desktop";
+  # "Super Home" = "sudo protonvpn c --cc CA";
+  "Super End" = "exit";
+  "Super S" = "steam";
+  "Super period" = "emote";
+}

home/modules/gui/desktop/river/config/spawn.nix

@@ -0,0 +1,28 @@
+{ flake, ... }:
+let
+  inherit (flake.config.aesthetics.themes)
+    cursor
+    ;
+in
+[
+  "swaylock"
+  "hypridle"
+  "wl-clipboard"
+  "wpaperd"
+  "gammastep"
+  "dunst"
+  "playerctrld"
+  "waybar"
+  "nm-applet"
+  "blueman-applet"
+  "easyeffects -r"
+  "emote"
+  "flameshot"
+  "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1"
+  "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
+  "bluetoothctl power on"
+  "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'"
+  "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
+  "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
+  "nmcli connection delete pvpn-killswitch-ipv6"
+]

home/modules/gui/desktop/river/default.nix

@@ -0,0 +1,77 @@
+{
+  flake,
+  config,
+  pkgs,
+  ...
+}:
+let
+  inherit (flake.config.aesthetics.themes) cursor;
+  configPath = ./config;
+  settingsPath = {
+    spawn = import (configPath + /spawn.nix) { inherit config flake; };
+    map = import (configPath + /map.nix);
+  };
+in
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      rivercarro
+      ;
+  };
+
+  services.kanshi = {
+    enable = true;
+    systemdTarget = "river-session.target";
+  };
+
+  wayland.windowManager.river = {
+    enable = true;
+    xwayland.enable = true;
+    settings = {
+      border-width = 4;
+      declare-mode = [
+        "locked"
+        "normal"
+        "passthrough"
+      ];
+      input = {
+        pointer-foo-bar = {
+          accel-profile = "flat";
+          events = true;
+          pointer-accel = -0.3;
+          tap = false;
+        };
+      };
+      rule-add = {
+        "-app-id" = {
+          "'bar'" = "csd";
+          "'float*'" = {
+            "-title" = {
+              "'foo'" = "float";
+            };
+          };
+        };
+      };
+      set-cursor-warp = "on-output-change";
+      set-repeat = "50 300";
+      map-pointer = {
+        normal = {
+          "Alt BTN_LEFT" = "move-view";
+          "Super BTN_LEFT" = "resize-view";
+          "Super F" = "toggle-float";
+        };
+      };
+      default-layout = "rivercarro";
+      attach-mode = "bottom";
+      map.normal = settingsPath.map;
+      spawn = settingsPath.spawn;
+    };
+    systemd = {
+      enable = true;
+      extraCommands = [
+        "systemctl --user stop river-session.target"
+        "systemctl --user start river-session.target"
+      ];
+    };
+  };
+}

home/modules/gui/desktop/theming/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/gui/desktop/theming/qt/default.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  qt = {
+    enable = true;
+    style = {
+      package = pkgs.catppuccin-qt5ct;
+    };
+  };
+}

home/modules/gui/desktop/wayland/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/gui/desktop/wayland/waybar/config/settings.nix

@@ -103,8 +103,8 @@ in
       tooltip = false;
       format-muted = " Muted";
       on-click = "easyeffects";
-      on-scroll-up = "amixer sset Master 5%+";
+      on-scroll-up = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
-      on-scroll-down = "amixer sset Master 5%-";
+      on-scroll-down = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
       scroll-step = 5;
       format-icons = {
         headphone = "";
@@ -151,7 +151,7 @@ in
     };
 
     "custom/weather" = {
-      exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh Winnipeg";
+      exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg";
       return-type = "json";
       format = "{}";
       tooltip = true;

home/modules/gui/desktop/wayland/wpaperd/default.nix

@@ -3,7 +3,7 @@
     enable = true;
     settings = {
       "default" = {
-        path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/hypr/wpaperd/wallpaper";
+        path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wayland/wpaperd/wallpaper";
         apply-shadow = true;
         duration = "1m";
         sorting = "random";