feat: separated hyprland

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"
-  "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}"
-  # "systemctl --user import-environment PATH"
-  # "systemctl --user restart xdg-desktop-portal.service"
+  scarlettIn
+  scarlettOut
 ]
+++ 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 =
-    #   if hostname == laptop.name
-    #   then import (configPath + /bindl.nix)
-    #   else null;
+    # bindl = import (configPath + /bindl.nix);
     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;