feat: updated hyprland

home/modules/hypr/land/config/bind.nix

@@ -81,7 +81,13 @@ let
     "4, movetoworkspacesilent, 4"
   ];
 in
-  superBinds ++ superShiftBinds ++ superCtrlBinds ++ altBinds ++ ctrlBinds ++ ctrlShiftBinds ++ shiftBinds
+  superBinds
+  ++ superShiftBinds
+  ++ superCtrlBinds
+  ++ altBinds
+  ++ ctrlBinds
+  ++ ctrlShiftBinds
+  ++ shiftBinds
 # Docs
 # https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
 

home/modules/hypr/land/config/bindm.nix

@@ -7,4 +7,5 @@ let
     "mouse:272, movewindow"
   ];
 in
-  superBinds ++ altBinds
+  superBinds
+  ++ altBinds

home/modules/hypr/land/config/windowrule.nix

@@ -1,19 +0,0 @@
-let
-  centerWindows = [
-    "center, ^(gnome-characters)$"
-    "center, ^(mpv)$"
-    "center, ^(nomacs)$"
-  ];
-  opaqueWindows = builtins.map (x: "opaque, " + x) [
-    "^(firefox)$"
-    "^(org.kde.kdenlive)$"
-    "^(krita)$"
-    "^(mpv)$"
-    "^(Brave-browser)$"
-    "^(Gimp-2.10)$"
-    "^(org.kde.okular)$"
-    "^(vlc)$"
-    "^(obsidian)$"
-  ];
-in
-  centerWindows ++ opaqueWindows

home/modules/hypr/land/config/windowrulev2.nix

@@ -1,29 +1,98 @@
 let
   blueman = "(.blueman-manager-wrapped)";
+  calculator = "(org.gnome.Calculator)";
   easyeffects = "(com.github.wwmm.easyeffects)";
+  firefox = "(firefox)";
   nomacs = "(org.nomacs.ImageLounge)";
   mpv = "(mpv)";
+  vlc = "(vlc)";
   emote = "(emote)";
   flameshot = "(flameshot)";
+  bitwarden = "(.*Bitwarden.*)";
+  picture = "(.*Picture-in-Picture.*)";
+  signal = "(signal)";
+  vesktop = "(vesktop)";
+  code = "(code)";
+  feishin = "(feishin)";
+  steam = "(steam)";
+  kdenlive = "(org.kde.kdenlive)";
 
   maxsizeWindows = [
-    "maxsize 640 640, class:^${blueman}$"
-    "maxsize 720 720, class:^${easyeffects}$"
-    "maxsize 720 720, class:^${mpv}$"
+    "maxsize 720 400, class:^${blueman}$"
+    "maxsize 360 500, class:^${calculator}$"
+    "maxsize 720 400, class:^${easyeffects}$"
+    "maxsize 720 400, class:^${mpv}$"
+    "maxsize 720 400, class:^${vlc}$"
     "maxsize 640 360, class:^${nomacs}$"
+    "maxsize 800 450, title:^${bitwarden}$"
+    "maxsize 720 400, title:^${picture}$"
   ];
+
   floatWindows = builtins.map (x: "float, " + x) [
-    "class:${blueman}"
-    "class:${easyeffects}"
-    "class:${emote}"
-    "class:${mpv}"
-    "class:${nomacs}"
-    "class:${flameshot}"
-    "title:^(Picture-in-Picture)$"
+    "class:^${blueman}$"
+    "class:^${calculator}$"
+    "class:^${easyeffects}$"
+    "class:^${emote}$"
+    "class:^${mpv}$"
+    "class:^${vlc}$"
+    "class:^${nomacs}$"
+    "class:^${flameshot}$"
+    "title:^(${picture})$"
+    "title:^${bitwarden}$"
   ];
 
   pinWindows = builtins.map (x: "pin, " + x) [
-    "title:^(Picture-in-Picture)$"
+    "title:^${bitwarden}$"
+    "title:^${picture}$"
+  ];
+
+  idleInhibit = builtins.map (x: "idleinhibit, " + x) [
+    "fullscreen, class:^${firefox}$"
+  ];
+
+  workspaceInit1 = builtins.map (x: "workspace 1 silent, " + x) [
+    "class:^${signal}$"
+    "class:^${vesktop}$"
+  ];
+
+  workspaceInit2 = builtins.map (x: "workspace 2 silent, " + x) [
+    "class:^${code}$"
+    "class:^${firefox}$"
+  ];
+
+  workspaceInit3 = builtins.map (x: "workspace 3 silent, " + x) [
+    "class:^${steam}$"
+  ];
+
+  workspaceInit4 = builtins.map (x: "workspace 4 silent, " + x) [
+    "class:^${feishin}$"
+  ];
+
+  centerWindows = builtins.map (x: "center, " + x) [
+    "class:^${emote}$"
+    "class:^${mpv}$"
+    "class:^${nomacs}$"
+  ];
+
+  opaqueWindows = builtins.map (x: "opaque, " + x) [
+    "class:^${firefox}$"
+    "class:^${kdenlive}$"
+    "class:^(krita)$"
+    "class:^(shotcut)$"
+    "class:^${mpv}$"
+    "class:^(Brave-browser)$"
+    "class:^(Gimp-2.10)$"
+    "class:^(org.kde.okular)$"
+    "class:^${vlc}$"
   ];
 in
-  maxsizeWindows ++ floatWindows ++ pinWindows
+  maxsizeWindows
+  ++ floatWindows
+  ++ pinWindows
+  ++ idleInhibit
+  ++ workspaceInit1
+  ++ workspaceInit2
+  ++ workspaceInit3
+  ++ workspaceInit4
+  ++ centerWindows
+  ++ opaqueWindows

home/modules/hypr/land/default.nix

@@ -1,28 +1,33 @@
 {
-  pkgs,
-  flake,
+  # pkgs,
+  # flake,
+  # config,
   ...
 }: 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);
     bindm = import (configPath + /bindm.nix);
     binds = import (configPath + /binds.nix);
-    bindl = import (configPath + /bindl.nix);
+    # bindl =
+    #   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);
     general = import (configPath + /general.nix);
     input = import (configPath + /input.nix);
     misc = import (configPath + /misc.nix);
-    windowrule = import (configPath + /windowrule.nix);
     windowrulev2 = import (configPath + /windowrulev2.nix);
   };
 in {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
     xwayland.enable = true;
     systemd.enable = false;
     settings = configImports;