From ed8d1a7ca7758080848e1a19d52a29b6fc889c07 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Sun, 18 May 2025 19:21:32 +0200
Subject: [PATCH] Cleanup & fix hyprland stuff

---
 environments/hyprland/home.nix      | 65 -----------------------------
 environments/hyprland/hyprland.conf | 34 ++++++++++++---
 2 files changed, 28 insertions(+), 71 deletions(-)

diff --git a/environments/hyprland/home.nix b/environments/hyprland/home.nix
index ff2dad9..fb889af 100644
--- a/environments/hyprland/home.nix
+++ b/environments/hyprland/home.nix
@@ -18,71 +18,6 @@
 
   xdg.configFile."hypr/hyprland.conf".source = ./hyprland.conf;
 
-  # wayland.windowManager.hyprland = {
-  #   enable = true;
-  #   extraSessionVariables = {
-  #     XDG_CURRENT_DESKTOP = "river";
-  #   };
-  #   settings = {
-  #     default-layout = "luatile";
-  #     spawn = [
-  #       "${pkgs.river-luatile}/bin/river-luatile"
-  #       "wallpaper"
-  #       "ags"
-  #     ];
-  #
-  #     input = {
-  #       "'*'" = {
-  #         pointer-accel = 0;
-  #         scroll-method = "two-finger";
-  #       };
-  #     };
-  #
-  #     # border-color-focused = "0x94e2d5";
-  #     # border-color-unfocused = "0x00000000";
-  #     # border-color-urgent = "0xcba6f7";
-  #
-  #     map = {
-  #       normal = {
-  #         # "Super+Shift Period" = "send-to-output -current-tags next";
-  #         # "Super+Shift Comma" = "send-to-output -current-tags previous";
-  #         # "Super+Control+Shift Period" = "send-to-output next";
-  #         # "Super+Control+Shift Comma" = "send-to-output previous";
-  #
-  #         "Super T" = "send-layout-cmd luatile 'set_layout(\"tiling\")'";
-  #         "Super M" = "send-layout-cmd luatile 'set_layout(\"monocle\")'";
-  #         "Super D" = "send-layout-cmd luatile 'set_layout(\"deck\")'";
-  #       };
-  #     };
-  #     map-pointer = {
-  #       normal = {
-  #         "Super+Shift BTN_LEFT" = "move-view";
-  #         "Super+Shift BTN_RIGHT" = "resize-view";
-  #       };
-  #     };
-  #   };
-  #   extraConfig = ''
-  #     for i in $(seq 1 9)
-  #     do
-  #         tags=$((1 << (i - 1)))
-  #         riverctl map normal Super "$i" set-focused-tags -alternate $tags
-  #         riverctl map normal Super+Shift "$i" set-view-tags $tags
-  #         riverctl map normal Super+Control "$i" toggle-focused-tags $tags
-  #         riverctl map normal Super+Shift+Control "$i" toggle-view-tags $tags
-  #     done
-  #
-  #     all_tags=$(((1 << 32) - 1))
-  #     riverctl map normal Super 0 set-focused-tags -alternate "$all_tags"
-  #     riverctl map normal Super+Shift 0 set-view-tags "$all_tags"
-  #
-  #     # Focus second screen by default (also spawn apps there)
-  #     riverctl focus-output DP-1
-  #     riverctl set-focused-tags $((1 << 3))
-  #
-  #     hyprlock --immediate
-  #   '';
-  # };
-
   services.kanshi = {
     enable = true;
     systemdTarget = "graphical-session.target";
diff --git a/environments/hyprland/hyprland.conf b/environments/hyprland/hyprland.conf
index 56d533b..d7df44f 100644
--- a/environments/hyprland/hyprland.conf
+++ b/environments/hyprland/hyprland.conf
@@ -1,6 +1,9 @@
 general {
 	resize_on_border = true
 	layout = master
+
+	col.active_border = rgb(94e2d5)
+	col.inactive_border = rgb(000000)
 }
 
 decoration {
@@ -10,13 +13,16 @@ decoration {
 	shadow {
 		enabled = false
 	}
-	animations {
-		enabled = false
-	}
+}
+
+animations {
+	enabled = false
 }
 
 input {
+	kb_layout = us
 	kb_options = caps:escape_shifted_capslock
+	numlock_by_default = true94e2d594e2d5
 	accel_profile = adaptive
 	touchpad {
 		natural_scroll = true
@@ -32,11 +38,12 @@ gestures {
 
 misc {
 	new_window_takes_over_fullscreen = true
+	exit_window_retains_fullscreen = true
 	middle_click_paste = false
 }
 
 binds {
-	# allow_workspace_cycles = true
+	allow_workspace_cycles = true
 	movefocus_cycles_fullscreen = true
 }
 
@@ -55,6 +62,14 @@ master {
 	new_on_top = true
 }
 
+debug {
+	disable_scale_checks = true
+}
+
+ecosystem {
+	no_update_news = true
+}
+
 
 bindl = , XF86AudioPlay, exec, playerctl play-pause
 bindl = , XF86AudioPause, exec, playerctl play-pause
@@ -67,6 +82,9 @@ bindl = , XF86AudioMute, exec, pamixer --toggle-mute
 bindle = , XF86MonBrightnessUp, exec, brightnessctl s +5%
 bindle = , XF86MonBrightnessDown, exec, brightnessctl s 5%-
 
+bindm = SUPER, mouse:272, movewindow
+bindm = SUPER, mouse:273, resizewindow
+
 bind = Super, c, killactive
 bind = Super+Shift, c, forcekillactive
 
@@ -88,8 +106,8 @@ bind = Super+Shift, f, togglefloating
 
 bind = Super, Period, focusmonitor, +1
 bind = Super, Comma, focusmonitor, -1
-bind = Super+Shift, Period, movewindow, mon:+1
-bind = Super+Shift, Comma, movewindow, mon:-1
+bind = Super+Shift, Period, movewindow, mon:+1 silent
+bind = Super+Shift, Comma, movewindow, mon:-1 silent
 
 bind = Super, 1, focusworkspaceoncurrentmonitor, 1
 bind = Super+Shift, 1, movetoworkspacesilent, 1
@@ -132,3 +150,7 @@ windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
 windowrule = rounding 0, floating:0, onworkspace:w[tv1]
 windowrule = bordersize 0, floating:0, onworkspace:f[1]
 windowrule = rounding 0, floating:0, onworkspace:f[1]
+
+exec-once = wallpaper
+exec-once = ags
+exec-once = hyprlock --immediate