disable discord

flake.lock

@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "aerothemeplasma-nix": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1771513958,
-        "narHash": "sha256-KoDcVuYgmP/kX6pd9uCW5Wo5Xn3y0SumrMaCLu5ojdY=",
-        "owner": "nyakase",
-        "repo": "aerothemeplasma-nix",
-        "rev": "348cbf661738840d0ae02d5eda7f4c076e59b733",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nyakase",
-        "repo": "aerothemeplasma-nix",
-        "type": "github"
-      }
-    },
     "apple-silicon": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -40,6 +19,39 @@
         "type": "github"
       }
     },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771610171,
+        "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -61,11 +73,11 @@
     "base16-discord": {
       "flake": false,
       "locked": {
-        "lastModified": 1771164756,
+        "lastModified": 1768273180,
-        "narHash": "sha256-6NU5HQZVZ1mSNaIyZxE+U35nF46uXH/768y3auhQdiI=",
+        "narHash": "sha256-uw7lz53YHxvPEyXZiS+NJFhKMb6AMUvVpCLH81NjM7U=",
         "owner": "imbypass",
         "repo": "base16-discord",
-        "rev": "8b005607e5783f751fe369f0442965a86eed8051",
+        "rev": "d4df17db31276d94cc1a8988f34e813aae1f3fb4",
         "type": "github"
       },
       "original": {
@@ -77,11 +89,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1771263855,
+        "lastModified": 1771517207,
-        "narHash": "sha256-akyds1g8cb742d2OrnQ4YciscpynsQ0+0YD2a8aZdvo=",
+        "narHash": "sha256-+zDtnmXNyMd3hMepErdPDZzqYS0PiZA0Anbbx9Pvs4g=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "5ece16c7b4a7d1261da68153cafc318a60b78ce8",
+        "rev": "39737576a25091a3c4ca00729b769a1f92ec98d5",
         "type": "github"
       },
       "original": {
@@ -93,11 +105,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1771399550,
+        "lastModified": 1771516433,
-        "narHash": "sha256-Q2rMJcwZiI1rn8H27gLleKA3ATW/EykukyGR6S1tBPk=",
+        "narHash": "sha256-SuockPZgd2bfjWGmdT8AUBTnBZWvxdA+b8Ss98lNC6c=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "021aae790c8555a4bb6e2135c6b777bf6fdcba02",
+        "rev": "505aef2086e584ba683a5ac1cb8ed8252fea2cfd",
         "type": "github"
       },
       "original": {
@@ -106,22 +118,6 @@
         "type": "github"
       }
     },
-    "catppuccin-discord": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1770426312,
-        "narHash": "sha256-rxvHIifq5CYIBPwFA2SpOrWT+sG/z0ItXT3sx2wbEqg=",
-        "owner": "catppuccin",
-        "repo": "discord",
-        "rev": "b9b5547f0b32296d2389716ef606de87b3c1e7c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "discord",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "locked": {
         "lastModified": 1761640442,
@@ -153,10 +149,47 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
       "locked": {
         "lastModified": 1768135262,
         "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
@@ -171,46 +204,7 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -247,6 +241,28 @@
         "type": "github"
       }
     },
+    "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"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -254,11 +270,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771519029,
+        "lastModified": 1769579508,
-        "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=",
+        "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807",
+        "rev": "eec72f127831326b042d1f35003767a4ab6a9516",
         "type": "github"
       },
       "original": {
@@ -267,16 +283,335 @@
         "type": "github"
       }
     },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753964049,
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770511807,
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1772297734,
+        "narHash": "sha256-ASoB8+3t/DNKWv2LCEDjUP+tV2+Mi6Lzi5lryXGN2B0=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "1c64ef06d9cb555fc562345c172c45e95c3b3077",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-guiutils": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1767023960,
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1765214753,
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771866172,
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764592794,
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771271487,
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770501770,
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771606233,
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
     "niri": {
       "inputs": {
-        "niri-stable": [
+        "niri-stable": "niri-stable",
-          "niri-blur"
-        ],
         "niri-unstable": [
           "niri-blur"
         ],
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ],
         "nixpkgs-stable": [
           "nixpkgs-stable"
@@ -316,20 +651,37 @@
         "type": "github"
       }
     },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nix-cachyos-kernel": {
       "inputs": {
         "cachyos-kernel": "cachyos-kernel",
         "cachyos-kernel-patches": "cachyos-kernel-patches",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1771438239,
+        "lastModified": 1771525883,
-        "narHash": "sha256-/d5FnrQ1nvZ9n1I7o/hMTzjd8tTBvV5rT24Nh7h59RQ=",
+        "narHash": "sha256-XqDuaRbxLGno5HcWRE5lQrgMBeXXs6ncGq+R6eCvsq8=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "58f338b00bc5619144a6f3082eed5c83e79b279b",
+        "rev": "15fb6039dd248d478a8f3f7f6c067b206da2bf54",
         "type": "github"
       },
       "original": {
@@ -356,21 +708,6 @@
       }
     },
     "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1765674936,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1769909678,
         "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
@@ -387,11 +724,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1771419570,
+        "lastModified": 1769598131,
-        "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=",
+        "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47",
+        "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
         "type": "github"
       },
       "original": {
@@ -403,11 +740,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1771369470,
+        "lastModified": 1769461804,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
         "type": "github"
       },
       "original": {
@@ -419,11 +756,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1771353015,
+        "lastModified": 1771482645,
-        "narHash": "sha256-gvMwFEdFCM2zFxLVDaAbhV2N9zK0IW/RceBundHUdZs=",
+        "narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "931ef4db402cdab9dfe66fe4a2b01d50f6fe435d",
+        "rev": "724cf38d99ba81fbb4a347081db93e2e3a9bc2ae",
         "type": "github"
       },
       "original": {
@@ -435,18 +772,18 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1771135771,
+        "lastModified": 1769537308,
-        "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=",
+        "narHash": "sha256-N7famD4s2hiDIicr9mJWhUj8l9EULB60+1QN/S+UjeM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba",
+        "rev": "7addac6d111837217c16762968a9042eac703f7e",
         "type": "github"
       },
       "original": {
@@ -462,11 +799,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771513929,
+        "lastModified": 1769607092,
-        "narHash": "sha256-dPeHevAT1Cb2w/Wrfz/d5i6RfO8bvbGl/KrTPxU2l3w=",
+        "narHash": "sha256-P0KGVjKtN+hkZWskpxr2iXWalPb0SKAgRVyMFZxdxf0=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "9c47ce03f200e0b8fc515d973440d5bc3e359785",
+        "rev": "b2b16ecdda1bc04001a7c714bf8124160a86ddfc",
         "type": "github"
       },
       "original": {
@@ -477,17 +814,17 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1771516225,
+        "lastModified": 1769604042,
-        "narHash": "sha256-G2cPs4Ic8Z1Aq8QfMa1VwJoBwIhVpwzcQ036ZhI4oXc=",
+        "narHash": "sha256-KQGbmKSY3tA4S8qFN76xd+3cbM0mAtPgoUVbjWrprcs=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d4694f0614419034910767b5a036384ab358b138",
+        "rev": "92f5f3f18a365341dd424314a80253f5ede071e4",
         "type": "github"
       },
       "original": {
@@ -509,7 +846,6 @@
       "original": {
         "owner": "OpenMW",
         "repo": "openmw",
-        "rev": "01bcd6a6369fe461caaf900354967b4751aede7a",
         "type": "gitlab"
       }
     },
@@ -523,11 +859,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770766818,
+        "lastModified": 1767662275,
-        "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=",
+        "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "44b928068359b7d2310a34de39555c63c93a2c90",
+        "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
         "type": "github"
       },
       "original": {
@@ -536,14 +872,36 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771858127,
+        "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
-        "aerothemeplasma-nix": "aerothemeplasma-nix",
         "apple-silicon": "apple-silicon",
         "base16": "base16",
         "base16-discord": "base16-discord",
-        "catppuccin-discord": "catppuccin-discord",
         "home-manager": "home-manager",
+        "hyprland": "hyprland",
         "niri": "niri",
         "niri-blur": "niri-blur",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
@@ -566,14 +924,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1771268051,
+        "lastModified": 1769316930,
-        "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=",
+        "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495",
+        "rev": "b2ce438f386943ef611e196a178af2d79042903b",
         "type": "github"
       },
       "original": {
@@ -583,6 +941,21 @@
       }
     },
     "systems": {
+      "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_2": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -597,7 +970,7 @@
         "type": "github"
       }
     },
-    "systems_2": {
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -629,6 +1002,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": 1761431178,
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
+    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {

flake.nix

@@ -8,14 +8,9 @@
     # edit this to switch between stable and unstable
     nixpkgs.follows = "nixpkgs-unstable";
 
-    nix-cachyos-kernel = {
+    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
-      url = "github:xddxdd/nix-cachyos-kernel/release";
+    apple-silicon.url = "github:nix-community/nixos-apple-silicon";
-      # inputs.nixpkgs.follows = "nixpkgs";
+    base16.url = "github:SenchoPens/base16.nix";
-    };
-
-    base16 = {
-      url = "github:SenchoPens/base16.nix";
-    };
 
     tt-schemes = {
       url = "github:tinted-theming/schemes/b9f335ad6a0b7d85b9c2eb932c3215f7429f7d11";
@@ -38,16 +33,10 @@
       inputs.home-manager.follows = "home-manager";
     };
 
-    aerothemeplasma-nix = {
-      url = "github:nyakase/aerothemeplasma-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     niri = {
       url = "github:sckova/niri-flake/feat/blur";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
       inputs.nixpkgs-stable.follows = "nixpkgs-stable";
-      inputs.niri-stable.follows = "niri-blur";
       inputs.niri-unstable.follows = "niri-blur";
     };
 
@@ -56,10 +45,10 @@
       flake = false;
     };
 
-    # niri-blur = {
+    hyprland = {
-    #   url = "github:visualglitch91/niri/feat/blur";
+      url = "github:hyprwm/Hyprland";
-    #   flake = false;
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    # };
+    };
 
     noctalia = {
       url = "github:noctalia-dev/noctalia-shell";
@@ -81,18 +70,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    apple-silicon = {
-      url = "github:nix-community/nixos-apple-silicon";
-      # inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     openmw = {
-      url = "gitlab:OpenMW/openmw/01bcd6a6369fe461caaf900354967b4751aede7a";
+      url = "gitlab:OpenMW/openmw";
-      flake = false;
-    };
-
-    catppuccin-discord = {
-      url = "github:catppuccin/discord";
       flake = false;
     };
   };
@@ -102,20 +81,19 @@
       nixpkgs,
       nixpkgs-unstable,
       nix-cachyos-kernel,
+      apple-silicon,
       base16,
       tt-schemes,
       base16-discord,
       home-manager,
       plasma-manager,
-      aerothemeplasma-nix,
       niri,
+      hyprland,
       noctalia,
       spicetify-nix,
       nur,
       nixvim,
-      apple-silicon,
       openmw,
-      catppuccin-discord,
       ...
     }:
     let
@@ -155,11 +133,11 @@
                 config = pkgConfig;
                 overlays = [
                   niri.overlays.niri
+                  hyprland.overlays.default
                   noctalia.overlays.default
                   nur.overlays.default
                   (final: prev: {
                     openmw-git = openmw;
-                    catppuccin-discord-git = catppuccin-discord;
                     base16-discord-git = base16-discord;
                   })
                   (import ./packages/overlay.nix)
@@ -226,7 +204,6 @@
             ./system/tailscale
             ./system/hosts/${hostname}
             ./hardware/${hostname}
-            aerothemeplasma-nix.nixosModules.aerothemeplasma-nix
             niri.nixosModules.niri
             home-manager.nixosModules.home-manager
             noctalia.nixosModules.default
@@ -255,7 +232,6 @@
                       scheme = "${tt-schemes}/base24/${config.colors.scheme}.yaml";
                     }
                   )
-                  aerothemeplasma-nix.homeModules.aerothemeplasma-nix
                   plasma-manager.homeModules.plasma-manager
                   noctalia.homeModules.default
                   spicetify-nix.homeManagerModules.default

home/apps/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./discord.nix
+    # ./discord.nix
     ./firefox.nix
     ./mpv.nix
     # ./vscode.nix

home/apps/firefox.nix

@@ -76,7 +76,7 @@
           url = "https://web.whatsapp.com/";
           manifestUrl = "https://web.whatsapp.com/data/manifest.json";
           desktopEntry = {
-            icon = "${pkgs.colloid-icon-theme}/share/icons/Colloid/apps/scalable/whatsapp.svg";
+            icon = "${pkgs.morewaita-icon-theme}/share/icons/MoreWaita/scalable/apps/whatsapp.svg";
             categories = [
               "Network"
               "Chat"
@@ -306,8 +306,8 @@
           };
           search =
             let
-              nixIcon = "${pkgs.colloid-icon-theme}/share/icons/Colloid/apps/scalable/nix-snowflake.svg";
+              nixIcon = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-              searchIcon = "${pkgs.colloid-icon-theme}/share/icons/Colloid-Dark/places/symbolic/folder-saved-search-symbolic.svg";
+              searchIcon = "${pkgs.adwaita-icon-theme}/share/icons/Adwaita/scalable/places/folder-saved-search-symbolic.svg";
             in
             {
               force = true;

home/default.nix

@@ -39,9 +39,11 @@
       ffmpeg-full
 
       # kde and kde theming
-      # kde-rounded-corners
+      kde-rounded-corners
       kdePackages.partitionmanager
       pkgs.catppuccin-cursors.mochaPeach
+      adwaita-icon-theme
+      morewaita-icon-theme
 
       # gui applications
       input-leap
@@ -57,7 +59,7 @@
       strawberry
       musescore
       gimp
-      calibre
+      # calibre
       # riff
       dissent
       loupe

home/games/morrowind.nix

@@ -3,7 +3,7 @@
   ...
 }:
 {
-  home.packages = with pkgs; [ openmw ];
+  home.packages = with pkgs; [ openmw-unstable ];
   home.sessionVariables.SDL_VIDEO_DRIVER = "wayland";
 
   programs.firefox.profiles.default.search.engines.uesp = {

home/hosts/peach/default.nix

@@ -5,7 +5,7 @@
 }:
 {
   colors = {
-    scheme = "banana-blueberry";
+    scheme = "kanagawa-dragon";
     accent = "base09";
   };
 
@@ -29,7 +29,7 @@
       mode = {
         width = 3024;
         height = 1964;
-        refresh = 60.000;
+        refresh = 120.000;
       };
       position = {
         x = 272;

home/kde/default.nix

@@ -23,12 +23,6 @@
     };
   };
 
-  # aerothemeplasma = {
-  #   enable = true;
-  #   plasma.enable = true;
-  #   fonts.enable = true;
-  # };
-
   programs.plasma = lib.mkDefault {
     enable = true;
     session = {

home/services/default.nix

@@ -22,6 +22,31 @@
     };
   };
 
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+      clock-format = "12h";
+      clock-show-weekday = true;
+    };
+    "org/gnome/desktop/wm/preferences" = {
+      button-layout = ":";
+      action-double-click-titlebar = "'none'";
+    };
+    "org/gnome/desktop/media-handling" = {
+      automount = false;
+      automount-open = false;
+      autorun-never = true;
+    };
+    "org/gnome/settings-daemon/plugins/power" = {
+      sleep-inactive-ac-type = "nothing";
+    };
+    "org/gnome/mutter" = {
+      edge-tiling = true;
+      dynamic-workspaces = true;
+      experimental-features = [ "variable-refresh-rate" ];
+    };
+  };
+
   home.pointerCursor = {
     gtk.enable = true;
     name = config.userOptions.cursor.name;
@@ -48,15 +73,10 @@
     #     else "Breeze";
     # };
 
-    # iconTheme = {
-    #   name = if config.userOptions.isDark then "Colloid-Dark" else "Colloid-Light";
-    #   package = pkgs.colloid-icon-theme;
-    # };
-
     colorScheme = "dark";
     iconTheme = {
-      name = "Colloid-Dark";
+      name = "MoreWaita";
-      package = pkgs.colloid-icon-theme;
+      package = pkgs.morewaita-icon-theme;
     };
 
     cursorTheme = {

home/tiling/default.nix

@@ -1,6 +1,7 @@
 { pkgs, config, ... }:
 {
   imports = [
+    # ./hyprland.nix
     ./niri.nix
     ./noctalia.nix
     ./wallpaper.nix
@@ -25,7 +26,7 @@
         layer = "overlay";
         font = with config.userOptions.fontMono; name + ":size=" + toString (size + 2);
         launch-prefix = "${pkgs.niri}/bin/niri msg action spawn --";
-        icon-theme = "Colloid-Dark";
+        icon-theme = config.gtk.iconTheme.name;
       };
       border = {
         width = 2;

home/tiling/hyprland.nix

@@ -0,0 +1,299 @@
+{
+  config,
+  ...
+}:
+{
+  wayland.windowManager.hyprland = with config.scheme; {
+    enable = true;
+
+    settings = {
+      # -----------------------------------------------------
+      # Environment Variables & Debug
+      # -----------------------------------------------------
+      env = [
+        "QT_QPA_PLATFORM,wayland"
+        "QT_QPA_PLATFORMTHEME,qt6ct"
+        "DISPLAY,:0"
+        "XCURSOR_THEME,${config.userOptions.cursor.name}"
+        "XCURSOR_SIZE,${toString config.userOptions.cursor.size}"
+      ];
+
+      debug = {
+        disable_scale_checks = true;
+      };
+
+      # -----------------------------------------------------
+      # Monitors (Outputs)
+      # -----------------------------------------------------
+      monitor = [
+        "eDP-1, 3024x1964@120.000, 0x0, 1.5"
+        "HDMI-A-1, 3840x2160@144.000, 0x0, 1.5"
+        "DP-1, 3840x2160@143.999, 0x0, 1.5"
+      ];
+
+      # -----------------------------------------------------
+      # Autostart
+      # -----------------------------------------------------
+      exec-once = [ ]; # systemd is based sorry
+
+      # -----------------------------------------------------
+      # Input
+      # -----------------------------------------------------
+      input = {
+        kb_layout = "us";
+        numlock_by_default = false;
+        repeat_delay = 600;
+        repeat_rate = 25;
+
+        follow_mouse = 1;
+
+        touchpad = {
+          natural_scroll = true;
+          tap-to-click = false;
+          drag_lock = false;
+        };
+      };
+
+      device = [
+        {
+          name = "epic-mouse-v1";
+          accel_profile = "adaptive";
+          natural_scroll = false;
+        }
+      ];
+
+      # -----------------------------------------------------
+      # General & Layout
+      # -----------------------------------------------------
+      general = {
+        gaps_in = 2;
+        gaps_out = 4;
+        border_size = 2;
+
+        "col.active_border" = "rgba(${config.scheme.${config.colors.accent}}E6)";
+        "col.inactive_border" = "rgba(${base01}E6)";
+
+        layout = "dwindle";
+      };
+
+      scrolling = {
+        column_width = 0.5;
+        follow_focus = true;
+        explicit_column_widths = "0.333,0.5,0.667";
+        direction = "right";
+      };
+
+      # -----------------------------------------------------
+      # Decoration (0.54 Syntax)
+      # -----------------------------------------------------
+      decoration = {
+        rounding = 8;
+
+        active_opacity = 0.90;
+        inactive_opacity = 0.90;
+        fullscreen_opacity = 1.0;
+
+        blur = {
+          enabled = true;
+          size = 3;
+          passes = 2;
+          noise = 0.05;
+          contrast = 1.0;
+        };
+
+        # Shadows now live in their own dedicated block
+        shadow = {
+          enabled = true;
+          range = 10;
+          render_power = 3;
+          color = "rgba(${base11}BF)";
+        };
+      };
+
+      # -----------------------------------------------------
+      # Misc Settings
+      # -----------------------------------------------------
+      misc = {
+        disable_hyprland_logo = true;
+        disable_splash_rendering = true;
+      };
+
+      # -----------------------------------------------------
+      # Window Rules (0.54 Block Syntax)
+      # -----------------------------------------------------
+      windowrule = [
+        {
+          name = "games-openmw";
+          "match:class" = "^(openmw)$";
+          opacity = "1.0 1.0";
+          maximize = "on";
+        }
+        {
+          name = "games-minecraft";
+          "match:class" = "^(Minecraft)$";
+          opacity = "1.0 1.0";
+          maximize = "on";
+        }
+        {
+          name = "media-mpv";
+          "match:class" = "^(mpv)$";
+          opacity = "1.0 1.0";
+        }
+        {
+          name = "media-pip";
+          "match:class" = "^(firefox)$";
+          "match:title" = "^(Picture-in-Picture)$";
+          opacity = "1.0 1.0";
+          float = "on";
+        }
+        {
+          name = "terminal-fastfetch";
+          "match:class" = "^(kitty)$";
+          "match:title" = "^(fastfetch)$";
+          float = "on";
+          size = "960 480";
+          center = "on";
+        }
+      ];
+
+      # -----------------------------------------------------
+      # Layer Rules (0.54 Block Syntax)
+      # -----------------------------------------------------
+      layerrule = [
+        {
+          name = "bar-blur";
+          "match:namespace" = "^(noctalia-bar-content-.*)$";
+          blur = "on";
+          ignore_alpha = "0";
+        }
+        {
+          name = "launcher-blur";
+          "match:namespace" = "^(launcher)$";
+          blur = "on";
+          ignore_alpha = "0";
+        }
+      ];
+
+      # -----------------------------------------------------
+      # Keybindings
+      # -----------------------------------------------------
+      "$mod" = "SUPER";
+
+      bind = [
+        "$mod, T, exec, kitty"
+        "$mod SHIFT, T, exec, kitty --title fastfetch sh -c 'fastfetch; sleep 10'"
+        "$mod, Space, exec, fuzzel"
+        ", XF86Search, exec, fuzzel"
+
+        "$mod, M, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
+        ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+        ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
+        ", XF86AudioPrev, exec, playerctl previous"
+        ", XF86AudioPlay, exec, playerctl play-pause"
+        ", XF86AudioNext, exec, playerctl next"
+
+        "$mod, Q, killactive,"
+        "$mod SHIFT, E, exit,"
+        "CTRL ALT, Delete, exit,"
+        "$mod, V, togglefloating,"
+        "$mod SHIFT, F, fullscreen, 1"
+        "$mod CTRL SHIFT, F, fullscreen, 0"
+        "$mod, W, togglegroup,"
+
+        "$mod SHIFT, left, focusmonitor, l"
+        "$mod SHIFT, down, focusmonitor, d"
+        "$mod SHIFT, up, focusmonitor, u"
+        "$mod SHIFT, right, focusmonitor, r"
+        "$mod SHIFT, H, focusmonitor, l"
+        "$mod SHIFT, J, focusmonitor, d"
+        "$mod SHIFT, K, focusmonitor, u"
+        "$mod SHIFT, L, focusmonitor, r"
+
+        "$mod SHIFT CTRL, left, movewindow, mon:l"
+        "$mod SHIFT CTRL, down, movewindow, mon:d"
+        "$mod SHIFT CTRL, up, movewindow, mon:u"
+        "$mod SHIFT CTRL, right, movewindow, mon:r"
+
+        "$mod, Page_Down, workspace, e+1"
+        "$mod, Page_Up, workspace, e-1"
+        "$mod, U, workspace, e+1"
+        "$mod, I, workspace, e-1"
+        "$mod, mouse_down, workspace, e+1"
+        "$mod, mouse_up, workspace, e-1"
+
+        "$mod CTRL, Page_Down, movetoworkspace, e+1"
+        "$mod CTRL, Page_Up, movetoworkspace, e-1"
+        "$mod CTRL, U, movetoworkspace, e+1"
+        "$mod CTRL, I, movetoworkspace, e-1"
+
+        "$mod SHIFT, S, exec, grim -g \"$(slurp)\" ~/Pictures/Screenshots/$(date +'%%a %%b %%e %%Y @%%l:%%M %%p').png"
+        "CTRL SHIFT, S, exec, grim ~/Pictures/Screenshots/$(date +'%%a %%b %%e %%Y @%%l:%%M %%p').png"
+
+        "$mod SHIFT, P, dpms, off"
+        ", XF86Sleep, dpms, off"
+      ]
+      ++ (builtins.concatLists (
+        builtins.attrValues (
+          builtins.mapAttrs
+            (key: dir: [
+              "$mod, ${key}, movefocus, ${dir}"
+              "$mod CTRL, ${key}, movewindow, ${dir}"
+            ])
+            {
+              left = "l";
+              right = "r";
+              up = "u";
+              down = "d";
+              H = "l";
+              L = "r";
+              K = "u";
+              J = "d";
+            }
+        )
+      ))
+      ++ (builtins.concatLists (
+        builtins.genList (
+          x:
+          let
+            ws =
+              let
+                c = (x + 1) / 10;
+              in
+              builtins.toString (x + 1 - (c * 10));
+          in
+          [
+            "$mod, ${ws}, workspace, ${ws}"
+            "$mod CTRL, ${ws}, movetoworkspace, ${ws}"
+          ]
+        ) 9
+      ));
+
+      binde = [
+        ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+"
+        ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-"
+        "SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.01+"
+        "SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.01-"
+
+        ", MouseForward, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+"
+        ", MouseBack, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-"
+        "SHIFT, MouseForward, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.01+"
+        "SHIFT, MouseBack, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.01-"
+
+        ", XF86MonBrightnessUp, exec, noctalia-shell ipc call brightness increase"
+        ", XF86MonBrightnessDown, exec, noctalia-shell ipc call brightness decrease"
+        "SHIFT, XF86MonBrightnessUp, exec, brightnessctl --class=backlight set +1%"
+        "SHIFT, XF86MonBrightnessDown, exec, brightnessctl --class=backlight set 1%-"
+
+        "$mod, equal, resizeactive, 40 0"
+        "$mod, minus, resizeactive, -40 0"
+        "$mod SHIFT, equal, resizeactive, 0 40"
+        "$mod SHIFT, minus, resizeactive, 0 -40"
+      ];
+
+      bindm = [
+        "$mod, mouse:272, movewindow"
+        "$mod, mouse:273, resizewindow"
+      ];
+    };
+  };
+}

home/tiling/noctalia.nix

@@ -68,7 +68,7 @@
         showCapsule = true;
         barType = "simple";
         capsuleColorKey = "none";
-        capsuleOpacity = 1;
+        capsuleOpacity = 0.90;
         displayMode = "always_visible";
         floating = false;
         marginHorizontal = 5;
@@ -595,8 +595,8 @@
 
   systemd.user.services.noctalia-shell = {
     Unit = {
-      After = [ "graphical-session.target" ];
+      After = [ "niri.service" ];
-      PartOf = [ "graphical-session.target" ];
+      PartOf = [ "niri.service" ];
       Description = "Noctalia Shell - Wayland desktop shell";
       Documentation = "https://docs.noctalia.dev";
       X-Restart-Triggers = [
@@ -611,6 +611,6 @@
       Environment = [ "QT_QPA_PLATFORMTHEME=qt6ct" ];
     };
 
-    Install.WantedBy = [ "graphical-session.target" ];
+    Install.WantedBy = [ "niri.service" ];
   };
 }

packages/catppuccin-discord/default.nix

@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchYarnDeps,
-  yarn,
-  nodejs,
-  fixup-yarn-lock,
-  nodePackages,
-  catppuccin-discord-git,
-}:
-stdenv.mkDerivation rec {
-  pname = "catppuccin-discord";
-  version = "unstable-${catppuccin-discord-git.rev}";
-
-  src = catppuccin-discord-git;
-
-  yarnOfflineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-BhE3aKyA/LBErjWx+lbEVb/CIXhqHkXbV+9U2djIBhs=";
-  };
-
-  nativeBuildInputs = [
-    yarn
-    nodejs
-    fixup-yarn-lock
-    nodePackages.sass
-  ];
-
-  postPatch = ''
-    substituteInPlace package.json \
-      --replace-fail "--no-charset --no-source-map" ""
-  '';
-
-  configurePhase = ''
-    export HOME=$TMPDIR
-    yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
-    fixup-yarn-lock yarn.lock
-    yarn install --offline --frozen-lockfile --ignore-scripts --ignore-platform
-  '';
-
-  buildPhase = ''
-    yarn --offline release
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/catppuccin-discord
-    cp -r dist/dist/* $out/share/catppuccin-discord/
-  '';
-
-  meta = {
-    description = "Soothing pastel theme for Discord";
-    homepage = "https://github.com/catppuccin/discord";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}

packages/overlay.nix

@@ -1,11 +1,7 @@
 final: prev: {
   spotify-webapp = final.callPackage ./spotify-webapp { };
 
-  catppuccin-discord = final.callPackage ./catppuccin-discord {
+  openmw-unstable = prev.openmw.overrideAttrs (oldAttrs: {
-    inherit (final) catppuccin-discord-git;
-  };
-
-  openmw = prev.openmw.overrideAttrs (oldAttrs: {
     pname = "openmw";
     src = final.openmw-git;
     version = "${final.openmw-git.rev}";

system/default.nix

@@ -89,16 +89,14 @@
         }
       ];
     };
+    # hyprland = {
+    #   enable = true;
+    #   package = pkgs.hyprland;
+    #   portalPackage = pkgs.xdg-desktop-portal-hyprland;
+    #   withUWSM = true;
+    # };
   };
 
-  # aerothemeplasma = {
-  #   enable = true;
-  #   plasma.enable = true;
-  #   fonts.enable = false;
-  #   plymouth.enable = false;
-  #   sddm.enable = true;
-  # };
-
   services = {
     desktopManager.plasma6.enable = true;
     displayManager = {