updated hyprland config for pc and laptop

.config/hypr/conf.d/10-appearance.conf##hostname.viking-mate

@@ -0,0 +1,17 @@
+general { gaps_in = 6; gaps_out = 12; border_size = 2; col.active_border = rgba(4f84ccff) rgba(3c6eb1ff) 45deg; col.inactive_border = rgba(4f84cc80); layout = master; }
+decoration { rounding = 8; blur = yes; blur_size = 7; blur_passes = 3; drop_shadow = yes; shadow_range = 20; shadow_render_power = 3; col.shadow = rgba(00000066); }
+animations { enabled = yes; bezier = ease, 0.05, 0.9, 0.1, 1.0; animation = windows, 1, 5, ease, slide; animation = windowsOut, 1, 5, ease, slide; animation = border, 1, 10, default; animation = fade, 1, 7, ease; animation = workspaces, 1, 6, ease; }
+
+input {
+  kb_layout = ultimatekeys
+  follow_mouse = 1
+  touchpad {
+    natural_scroll = true
+    tap-to-click = true
+    middle_button_emulation = true
+  }
+}
+
+master { new_is_master = true; mfact = 0.56; orientation = left; }
+xwayland { force_zero_scaling = true; }
+

.config/hypr/conf.d/20-monitors.conf##hostname.viking-mate

@@ -0,0 +1,3 @@
+# Adjust resolution/refresh after survey if needed
+monitor = eDP-1, preferred, auto, 1
+

.config/hypr/conf.d/30-workspaces.conf##hostname.viking-mate

@@ -0,0 +1,11 @@
+# Single display: keep 1-9 on eDP-1
+workspace = 1, monitor:eDP-1
+workspace = 2, monitor:eDP-1
+workspace = 3, monitor:eDP-1
+workspace = 4, monitor:eDP-1
+workspace = 5, monitor:eDP-1
+workspace = 6, monitor:eDP-1
+workspace = 7, monitor:eDP-1
+workspace = 8, monitor:eDP-1
+workspace = 9, monitor:eDP-1
+

.config/hypr/conf.d/40-keybinds.conf##hostname.cn-arch

@@ -83,13 +83,8 @@ bind = $mainMod CTRL, A, exec, $notcloseall
 #bind = ALT SHIFT, 4, exec, GRIMBLAST_EDITOR="satty -f" grimblast --notify edit area
 
 #testing stuff
-<<<<<<< HEAD
 bind = ALT SHIFT, 3, exec, GRIMBLAST_EDITOR="/home/cnachtigall/data/git/clone/Satty/target/debug/satty -f" grimblast --notify edit output
 bind = ALT SHIFT, 4, exec, GRIMBLAST_EDITOR="/home/cnachtigall/data/git/clone/Satty/target/debug/satty -f" grimblast --notify edit area
-=======
-bind = ALT SHIFT, 3, exec, GRIMBLAST_EDITOR="/home/vikingowl/git/clone/Satty/target/debug/satty -f" grimblast --notify edit output
-bind = ALT SHIFT, 4, exec, GRIMBLAST_EDITOR="/home/vikingowl/git/clone/Satty/target/debug/satty -f" grimblast --notify edit area
->>>>>>> f130af1 (config stash laptop)
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l

.config/hypr/conf.d/40-keybinds.conf##hostname.viking-mate

@@ -0,0 +1,43 @@
+# same as desktop + brightness keys are useful on laptops
+$mod = SUPER
+bind = $mod, SPACE, exec, rofi -show drun
+bind = $mod, RETURN, exec, kitty
+bind = $mod, B, exec, firefox
+
+bind = $mod, Q, killactive,
+bind = $mod, F, fullscreen, 0
+bind = $mod, V, togglefloating,
+
+bind = $mod, H, movefocus, l
+bind = $mod, L, movefocus, r
+bind = $mod, K, movefocus, u
+bind = $mod, J, movefocus, d
+
+bind = $mod, 1, workspace, 1
+bind = $mod, 2, workspace, 2
+bind = $mod, 3, workspace, 3
+bind = $mod, 4, workspace, 4
+bind = $mod, 5, workspace, 5
+bind = $mod, 6, workspace, 6
+bind = $mod, 7, workspace, 7
+bind = $mod, 8, workspace, 8
+bind = $mod, 9, workspace, 9
+bind = $mod, 0, workspace, 10
+
+# Screenshots
+bind = , PRINT, exec, grimblast copy screen
+bind = SHIFT, PRINT, exec, grimblast copy area
+
+# Audio / mic / brightness
+bindle =, XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindle =, XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindle =, XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
+bindle =, XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bindle =, XF86MonBrightnessUp, exec, brightnessctl set +5%
+bindle =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
+bind = , XF86AudioPlay, exec, playerctl play-pause
+bind = , XF86AudioPrev, exec, playerctl previous
+bind = , XF86AudioNext, exec, playerctl next
+
+bind = $mod, ESCAPE, exec, hyprlock
+

.config/hypr/conf.d/50-autostart.conf##hostname.cn-arch

@@ -1,17 +1,10 @@
 # ~/.config/hypr/conf.d/50-autostart.conf
 
 exec-once = uwsm app -- swaync
-<<<<<<< HEAD
 exec-once = xsettingsd
-exec-once = hyprsunset -l 48.1:11.6
 exec-once = ~/.config/waybar/scripts/hyprsunset_daemon.sh
-=======
 exec-once = uwsm app -- waybar
-exec-once = xsettingsd
 exec-once = hyprsunset
-exec-once = xrdb -merge ~/.Xresources
-exec-once = uwsm finalize WAYLAND_DISPLAY DISPLAY GDK_SCALE GDK_DPI_SCALE QT_SCALE_FACTOR
->>>>>>> f130af1 (config stash laptop)
 
 exec = hyprpaper -c $HOME/.config/hyprpaper.conf
 exec = swayosd-server

.config/hypr/conf.d/50-autostart.conf##hostname.viking-mate

@@ -0,0 +1,8 @@
+exec-once = bash -lc 'command -v /usr/lib/lxqt-policykit-agent >/dev/null && /usr/lib/lxqt-policykit-agent &'
+exec-once = hyprpaper
+exec-once = hypridle
+exec-once = ~/.config/waybar/scripts/hyprsunset_daemon.sh
+exec-once = bash -lc 'command -v nm-applet >/dev/null && nm-applet &'
+exec-once = bash -lc 'command -v blueman-applet >/dev/null && blueman-applet &'
+exec-once = waybar -c ~/.config/waybar/config.jsonc -s ~/.config/waybar/style.css
+

.config/hypr/conf.d/60-windowrules.conf##hostname.viking-mate

@@ -0,0 +1,7 @@
+windowrulev2 = float, class:^(pavucontrol|blueman-manager|nm-connection-editor|wdisplays|org.gnome.Calculator|qalculate-gtk)$
+windowrulev2 = center, class:^(pavucontrol|blueman-manager|nm-connection-editor|wdisplays|org.gnome.Calculator|qalculate-gtk)$
+windowrulev2 = size 1000 640, class:^(pavucontrol|blueman-manager)$
+
+windowrulev2 = workspace 2, class:^(firefox|zen)$
+windowrulev2 = workspace 3, class:^(spotify|Spotify)$
+