Merge branch 'main' of db:dotfiles

7 files changed, 19 insertions, 20 deletions

diff --git a/config/wayland/dwl/startup.sh b/config/wayland/dwl/startup.sh
index d743f19..8817ad2 100755
--- a/config/wayland/dwl/startup.sh
+++ b/config/wayland/dwl/startup.sh
@@ -10,6 +10,7 @@ swaybg -i ~/pics/wallpaper &
 wl-paste --watch cliphist store &
 swayidle 300 locker &
 keyadd id_rsa &
+emacs --daemon &
 
 pkill -f "tail -f $HOME/.config/wob/pipe"
 WOBCONFIG="$HOME"/.config/wob
diff --git a/config/wayland/hypr/binds.conf b/config/wayland/hypr/binds.conf
index 19c1c8d..251ce69 100644
--- a/config/wayland/hypr/binds.conf
+++ b/config/wayland/hypr/binds.conf
@@ -11,19 +11,19 @@ bind = $mainMod, F, togglefloating,
 bind = $mainMod SHIFT, P, pseudo
 bind = $mainMod, S, togglesplit
 
-bind = $mainMod, E, focusmonitor, +1
-bind = $mainMod, W, focusmonitor, -1
+bind = $mainMod, COMMA, focusmonitor, +1
+bind = $mainMod, PERIOD, focusmonitor, -1
 binde = $mainMod, H, movefocus, l
 binde = $mainMod, J, movefocus, d
 binde = $mainMod, K, movefocus, u
 binde = $mainMod, L, movefocus, r
 binde = $mainMod, SPACE, swapnext
-bind = $mainMod SHIFT, E, movewindow, mon:+1
-bind = $mainMod SHIFT, W, movewindow, mon:-1
-bind = $mainMod CTRL, E, movewindow, mon:+1
-bind = $mainMod CTRL, E, focusmonitor, -1
-bind = $mainMod CTRL, W, movewindow, mon:-1
-bind = $mainMod CTRL, W, focusmonitor, +1
+bind = $mainMod SHIFT, PERIOD, movewindow, mon:+1
+bind = $mainMod SHIFT, COMMA, movewindow, mon:-1
+bind = $mainMod CTRL, PERIOD, movewindow, mon:+1
+bind = $mainMod CTRL, PERIOD, focusmonitor, -1
+bind = $mainMod CTRL, COMMA, movewindow, mon:-1
+bind = $mainMod CTRL, COMMA, focusmonitor, +1
 
 binde = $mainMod SHIFT, H, resizeactive, -60 0
 binde = $mainMod SHIFT, J, resizeactive, 0 60
@@ -69,12 +69,13 @@ bind = $mainMod, mouse_up, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
+bind = $mainMod, B, exec, $BROWSER
+bind = $mainMod, E, exec, emacsclient -c -a 'emacs'
+
 bind = $mainMod, A, submap, apps
 submap = apps
 bind = $mainMod, D, exec, discord
 bind = , D, exec, discord
-bind = $mainMod, B, exec, $BROWSER
-bind = , B, exec, $BROWSER
 bind = $mainMod, G, exec, gml
 bind = , G, exec, gml
 source = ./reset-submap.conf
diff --git a/config/wayland/waybar/configs/hyprland.jsonc b/config/wayland/waybar/configs/hyprland.jsonc
index cd24d14..9d60915 100644
--- a/config/wayland/waybar/configs/hyprland.jsonc
+++ b/config/wayland/waybar/configs/hyprland.jsonc
@@ -23,7 +23,7 @@
 		"interval": 10,
 	},
 	"hyprland/window": {
-		"format": "{}",
+		"format": " {}",
 		"separate-outputs": true,
 	},
 	"pulseaudio": {
diff --git a/config/wayland/waybar/style.css b/config/wayland/waybar/style.css
index b5a6cf9..76f49ff 120000
--- a/config/wayland/waybar/style.css
+++ b/config/wayland/waybar/style.css
@@ -1 +1 @@
-styles/base16.css
\ No newline at end of file
+styles/nord.css
\ No newline at end of file
diff --git a/config/wayland/waybar/styles/base16.css b/config/wayland/waybar/styles/base16.css
index c9e3170..639b590 100644
--- a/config/wayland/waybar/styles/base16.css
+++ b/config/wayland/waybar/styles/base16.css
@@ -17,7 +17,7 @@
 	border-radius: 0;
 	font-family: monospace;
 	font-weight: bold;
-	font-size: 14px;
+	font-size: 12px;
 	min-height: 24px;
 }
 
@@ -90,8 +90,6 @@ window#waybar.PCSX2 #window {
 
 #workspaces button.active, #tags button.focused {
 	background-color: @color6;
-	border-bottom: 6px solid @color4;
-
 }
 
 #workspaces button:hover, #tags button:hover {
diff --git a/config/wayland/waybar/styles/colors/colors.css b/config/wayland/waybar/styles/colors/colors.css
index 2a2c2fa..801cf92 120000
--- a/config/wayland/waybar/styles/colors/colors.css
+++ b/config/wayland/waybar/styles/colors/colors.css
@@ -1 +1 @@
-/home/aluc/.cache/wal/colors-waybar.css
\ No newline at end of file
+colors-nord
\ No newline at end of file
diff --git a/config/wayland/waybar/styles/nord.css b/config/wayland/waybar/styles/nord.css
index efd0e81..3b7b7f6 100644
--- a/config/wayland/waybar/styles/nord.css
+++ b/config/wayland/waybar/styles/nord.css
@@ -40,7 +40,6 @@ window#waybar.PCSX2 #window {
 	margin-left: 8px;
 	padding-left: 16px;
 	padding-right: 16px;
-	border-radius: 26px;
 }
 
 #workspaces, #mpd, #battery,
@@ -48,6 +47,7 @@ window#waybar.PCSX2 #window {
 	margin-top: 4px;
 	margin-bottom: 2px;
 	transition: none;
+	border-radius: 6px;
 }
 
 #battery {
@@ -57,7 +57,6 @@ window#waybar.PCSX2 #window {
 
 #workspaces {
 	margin-left: 12px;
-	border-radius: 26px;
 	background: #2e3440;
 }
 
@@ -69,7 +68,8 @@ window#waybar.PCSX2 #window {
 }
 
 #workspaces button.active {
-	color: #5e81ac;
+	color: #a3be8c;
+    text-shadow: 0px 0px 1px #a3be8c;
 }
 
 #workspaces button:hover {
@@ -122,7 +122,6 @@ window#waybar.PCSX2 #window {
 	margin-right: 12px;
 	padding-left: 16px;
 	padding-right: 16px;
-	border-radius: 26px;
 	color: #d8dee9;
 	background: #2e3440;
 }