Merge branch 'main' of db:dotfiles

5 files changed, 58 insertions, 26 deletions

diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
index d52392c..9219f84 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/hypr/binds.conf
@@ -13,19 +13,6 @@ bind = $mainMod, F, togglefloating,
 bind = $mainMod SHIFT, P, pseudo
 bind = $mainMod, S, togglesplit
 
-bind = $mainMod, A, submap, applications
-submap = applications
-bind = $mainMod, B, exec, firefox
-bind = , B, exec, firefox
-bind = $mainMod, T, exec, $term -e tmux a || tmux
-bind = , T, exec, $term -e tmux a || tmux
-bind = $mainMod, D, exec, foot -e ssh -t db tmux a
-bind = , D, exec, foot -e ssh -t db tmux a
-bind = $mainMod, M, exec, gamelaunch
-bind = , M, exec, gamelaunch
-source = ./reset-submap.conf
-submap = reset
-
 bind = $mainMod, E, focusmonitor, +1
 bind = $mainMod, W, focusmonitor, -1
 binde = $mainMod, H, movefocus, l
@@ -84,6 +71,28 @@ bind = $mainMod, mouse_up, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
+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, lutris
+bind = , G, exec, lutris
+bind = $mainMod, M, exec, mclaunch
+bind = , M, exec, mclaunch
+source = ./reset-submap.conf
+submap = reset
+
+bind = $mainMod, T, submap, termapps
+submap = termapps
+bind = $mainMod, T, exec, $term -e tmux a || tmux
+bind = , T, exec, $term -e tmux a || tmux
+bind = $mainMod, D, exec, foot -e ssh -t db tmux a
+bind = , D, exec, foot -e ssh -t db tmux a
+source = ./reset-submap.conf
+submap = reset
+
 bind = $mainMod, M, submap, menuscripts
 submap = menuscripts
 bind = $mainMod, A, exec, dmask
@@ -104,19 +113,22 @@ bind = $mainMod, I, exec, mapimg
 bind =, I, exec, mapimg
 bind = $mainMod, L, exec, dmlang
 bind =, L, exec, dmlang
-bind = $mainMod, M, exec, mpass
-bind =, M, exec, mpass
-bind = $mainMod, P, exec, mmedia pdf
-bind =, P, exec, mmedia pdf
-bind = $mainMod, O, exec, mpower
-bind =, O, exec, mpower
-bind = $mainMod, U, exec, mmedia cursus
-bind =, U, exec, mmedia cursus
+bind = $mainMod, S, exec, mmedia schoolpdf
+bind =, S, exec, mmedia schoolpdf
 bind = $mainMod, V, exec, mmedia video
 bind =, V, exec, mmedia video
+bind = $mainMod, U, exec, mmedia cursus
+bind =, U, exec, mmedia cursus
+bind = $mainMod, M, exec, mmedia
+bind =, M, exec, mmedia
+bind = $mainMod, P, exec, mpass
+bind =, P, exec, mpass
+bind = $mainMod, O, exec, mpower
+bind =, O, exec, mpower
 source = ./reset-submap.conf
 submap = reset
 
+bind = $mainMod SHIFT, M, exec, mplay
 bind =, XF86AudioLowerVolume, exec, pamixer -d 5
 bind =, XF86AudioRaiseVolume, exec, pamixer -i 5
 bind =, XF86AudioMute, exec, pamixer -t
diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf
index 17f0235..ed932e0 100644
--- a/config/hyprland/hypr/hyprland.conf
+++ b/config/hyprland/hypr/hyprland.conf
@@ -86,7 +86,9 @@ gestures {
 
 windowrulev2 = noanim, class:^(.*[Pp]inentry.*)$
 windowrulev2 = float, class:^(.*[Pp]inentry.*)$
+windowrulev2 = float, class:^(feh|imv)$
 windowrulev2 = noanim, class:dmenu
+windowrulev2 = float, class:^(imv)$
 
 layerrule = noanim, launcher
 
diff --git a/config/hyprland/hypr/startup.sh b/config/hyprland/hypr/startup.sh
index 6d5957f..8887cf2 100755
--- a/config/hyprland/hypr/startup.sh
+++ b/config/hyprland/hypr/startup.sh
@@ -5,4 +5,4 @@ gammastep &
 wl-paste --watch cliphist store &
 keyadd id_rsa &
 swayidle 300 locker &
-$TERMINAL &
+$TERMINAL -e tmux a || $TERMINAL tmux &
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index ebf9cf9..4c95c25 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -2,7 +2,7 @@
 	"layer": "top",
 	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
 	"modules-center": ["clock"],
-	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
+	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "bluetooth", "tray"],
 	"mpd": {
 		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
 		"artist-len": 24,
@@ -67,6 +67,15 @@
 		"format-alt": "{:(%T) %A %d %B}",
 		"interval": 1,
 	},
+	"bluetooth": {
+		"format": "",
+		"format-disabled": "",
+		"format-connected": "",
+		"format-on": "",
+		"tooltip-format": "{controller_alias}\t{controller_address}",
+		"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}",
+		"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}"
+	},
 	"tray": {
 		"spacing": 5,
 	}
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 76efbb3..b32d3df 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -51,11 +51,12 @@ window#waybar.PCSX2 #window {
 	margin-right: 2px;
 }
 .modules-left {
-	margin-left: 2px;
+	margin-left: 3px;
 }
 
-#workspaces, #mpd, #battery, #clock,
-#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
+#workspaces, #mpd, #battery, 
+#clock,
+#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #bluetooth, #tray {
 	border: solid @background;
 	border-width: 2px 2px 2px 0;
 	margin-top: 4px;
@@ -67,6 +68,9 @@ window#waybar.PCSX2 #window {
 	color: @color6;
 	background: @background;
 	border-color: @color4;
+	border-width: 2px;
+	padding: 0 12px;
+	margin-right: 16px;
 }
 
 #workspaces {
@@ -148,6 +152,11 @@ window#waybar.PCSX2 #window {
 	background: @color5;
 }
 
+#bluetooth {
+	color: @color6;
+	background: @color8;
+}
+
 #tray * {
 	padding: unset;
 }