Merge branch 'desktop' into laptop

programs/hyprland/default.nix

@@ -82,22 +82,21 @@
 
       # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
+      # Inject home-manager session variables
+      exec-once = /etc/profiles/per-user/wizardlink/etc/profile.d/hm-session-vars.sh
+
       # Execute your favorite apps at launch
       exec-once = ~/.local/share/scripts/hyprland/start_services.sh
 
       # Source a file (multi-file configs)
       # source = ~/.config/hypr/myColors.conf
 
-      # Some default env vars.
-      env = XCURSOR_SIZE,36
-      env = QT_QPA_PLATFORM,wayland
-
       # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
       input {
-          kb_layout = us,br
-          kb_variant =
+          kb_layout = us,br,jp
+          kb_variant = ,,kana86
           kb_model =
-          kb_options =
+          kb_options = grp:alts_toggle
           kb_rules =
 
           follow_mouse = 1
@@ -119,8 +118,8 @@
           gaps_in = 6
           gaps_out = 18
           border_size = 2
-          col.active_border = $lavender $red 15deg
-          col.inactive_border = $yellow $sapphire 15deg
+          col.active_border = $base $surface0 $green 45deg
+          col.inactive_border = $base $surface0 $blue 45deg
 
           layout = dwindle
       }
@@ -195,7 +194,6 @@
 
       # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
       bind = $mainMod CTRL, F, fakefullscreen
-      bind = $mainMod CTRL, K, exec, hyprctl switchxkblayout ducky-ducky-one2-mini-rgb next
       bind = $mainMod CTRL, L, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy
       bind = $mainMod CTRL, P, exec, ~/.local/share/scripts/hyprland/screenshot_area.sh
       bind = $mainMod CTRL, V, pin
@@ -254,11 +252,15 @@
       bindm = $mainMod, mouse:273, resizewindow
 
       # Window rules
-      windowrulev2 = float,class:(steam) # Make sure all Steam windows float
       windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
       windowrulev2 = noanim,class:^(xwaylandvideobridge)$
       windowrulev2 = nofocus,class:^(xwaylandvideobridge)$
       windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
+
+      # Rules for windowkill
+      windowrule = noborder, ^(steam_app_2726450)$
+      windowrule = pin, ^(steam_app_2726450)$
+      windowrule = opacity 0.9, ^(steam_app_2726450)$
     '';
   };
 }