From dbaadad869d85ad4fb6e6341b14101cd69ef2757 Mon Sep 17 00:00:00 2001
From: Antoine Phan <antoine.phan@mail.mcgill.ca>
Date: Sat, 24 May 2025 22:23:42 -0400
Subject: [PATCH] Update hyprland QOL and niri, waybar for niri

---
 README.md                       | 18 ++++++++++++++++--
 hypr/.config/hypr/hyprland.conf | 16 +++++++++-------
 niri/.config/niri/config.kdl    | 10 +++++++++-
 waybar/.config/waybar/config    | 13 +++++++++++--
 waybar/.config/waybar/style.css |  3 ++-
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 78a12f3..4424fdc 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 # dotfiles
-
 My configuration and styling for things I use on my Linux PC, while embracing the power of GNU Stow and symlink!
 
 ```sh
@@ -34,4 +33,19 @@ pacman -Qs | grep "local/" | awk '{print $1}' - | awk -F '/' '{print $2}' > allP
 - (Re)Installing all packages back
 ```sh
 cat allPackages.txt | yay -S - --needed
-```
\ No newline at end of file
+```
+
+# Actively using programs
+- Shell: `zsh` with `oh-my-zsh`
+- Terminal: `alacritty`
+- WM: `hyprland` and (slowly configuring) `niri`
+  - Wallpaper: `hyprpaper`
+  - Notification: `mako`
+  - Lock: `swaylock`
+  - Bar: `waybar`
+  - Menu: `wofi` and `wofi-emoji`
+- Audio: `wireplumber`
+- Tools:
+  - `tmux`
+  - `neovim`
+
diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
index 7091b8a..cbddb75 100644
--- a/hypr/.config/hypr/hyprland.conf
+++ b/hypr/.config/hypr/hyprland.conf
@@ -170,6 +170,12 @@ bind = $mainMod, J, togglesplit, # dwindle
 bind = $mainMod, F, fullscreen
 bind = $mainMod_SHIFT, F, fullscreen, 1
 
+# Resize windows, inspired by i3 config
+bind = $mainMod CTRL, right, resizeactive, 50 0
+bind = $mainMod CTRL, left, resizeactive, -50 0
+bind = $mainMod CTRL, up, resizeactive, 0 -50
+bind = $mainMod CTRL, down, resizeactive, 0 50
+
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
 bind = $mainMod, right, movefocus, r
@@ -221,16 +227,12 @@ bind = $mainMod, mouse_up  , workspace, m+1
 bind = $mainMod SHIFT, mouse_down, workspace, r-1
 bind = $mainMod SHIFT, mouse_up  , workspace, r+1
 
-# Create new workspace on screen. Go to previous workspace on screen
-bind = $mainMod ALT, N, workspace, r+1
-bind = $mainMod ALT, P, workspace, r-1 
-
 bind = $mainMod SHIFT, N, movetoworkspace, r+1
 bind = $mainMod SHIFT, P, movetoworkspace, r-1
 
-# Cycle through workspaces on the montior
-bind = $mainMod, N, workspace, m+1
-bind = $mainMod, P, workspace, m-1
+# Cycle through workspaces on the montior, relatively
+bind = $mainMod, N, workspace, r+1
+bind = $mainMod, P, workspace, r-1
 
 # Swap windows from different monitors
 bind = $mainMod, S, swapactiveworkspaces, 0 1
diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl
index 81d09d1..141bee8 100644
--- a/niri/.config/niri/config.kdl
+++ b/niri/.config/niri/config.kdl
@@ -29,6 +29,14 @@ output "eDP-1" {
     // Use logical size to set position
 }
 
+output "HDMI-A-1" {
+  mode "1920x1080@170"
+  scale 1
+  // Second monitor above
+  position x=0 y=-1080
+
+}
+
 
 // Input device configuration.
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Input
@@ -82,7 +90,7 @@ input {
 
     // Focus windows and outputs automatically when moving the mouse into them.
     // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
-    // focus-follows-mouse max-scroll-amount="0%"
+    focus-follows-mouse max-scroll-amount="50%"
 }
 
 // ==== LAYOUT ====
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 83e7439..b2e79d5 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -9,7 +9,8 @@
 	"modules-left": [
 		"hyprland/workspaces",
     "hyprland/window",
-    "niri/workspaces"
+    "niri/workspaces",
+    "niri/window"
 	],
 	"modules-center": [
 		"clock#1",
@@ -41,11 +42,19 @@
   },
 
   "niri/workspaces": {
-	  "format": "{icon}",
+	  "format": "{output} {index}",
 	  "format-icons": {
 	  }
   },
 
+  "niri/window": {
+	  "format": "{}",
+    "icon": true,
+    "separate-outputs": true,
+    "all-outputs": true,
+    "offscreen-css": true
+  },
+
 	"clock#1": {
 		"format": "{:%A}",
 		"tooltip": false
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index bed9439..2c6ae65 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -28,7 +28,8 @@ window#waybar {
 #window {
   padding: 0 12px;
   margin: 0 2px;
-  background: rgba(12, 12, 12, 0.3);
+  color: white;
+  background: rgba(12, 12, 12, 0.5);
   text-shadow: 2px 4px rgba(20, 20, 20, 0.2);
 }