Merge branch 'main' of db:dotfiles

15 files changed, 65 insertions, 483 deletions

diff --git a/config/wayland/dwl/startup.sh b/config/wayland/dwl/startup.sh
index d743f19..0f482fa 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
@@ -20,4 +21,5 @@ then
 fi
 (tail -f "$WOBCONFIG"/pipe | wob) &
 
-$TERMINAL -e tmux a || $TERMINAL tmux &
+# $TERMINAL -e tmux a || $TERMINAL tmux &
+emacsclient -c -a 'emacs' &
diff --git a/config/wayland/hypr/binds.conf b/config/wayland/hypr/binds.conf
index 251ce69..15af7dd 100644
--- a/config/wayland/hypr/binds.conf
+++ b/config/wayland/hypr/binds.conf
@@ -112,8 +112,8 @@ bind = $mainMod, L, exec, dmlang
 bind =, L, exec, dmlang
 bind = $mainMod, S, exec, mmedia schoolpdf
 bind =, S, exec, mmedia schoolpdf
-bind = $mainMod, V, exec, mmedia video
-bind =, V, exec, mmedia video
+bind = $mainMod, V, exec, mmpv
+bind =, V, exec, mmpv
 bind = $mainMod, U, exec, mmedia cursus
 bind =, U, exec, mmedia cursus
 bind = $mainMod, M, exec, mmedia
diff --git a/config/wayland/hypr/hyprland.conf b/config/wayland/hypr/hyprland.conf
index 9eb0549..eb232c9 100644
--- a/config/wayland/hypr/hyprland.conf
+++ b/config/wayland/hypr/hyprland.conf
@@ -10,7 +10,7 @@ input {
     kb_layout = us
     kb_variant =
     kb_model =
-    kb_options = ctrl:nocaps
+    kb_options = ctrl:swapcaps
     kb_rules =
 
     follow_mouse = 2
@@ -23,8 +23,8 @@ input {
 }
 
 general {
-    gaps_in = 1
-    gaps_out = 3
+    gaps_in = 0
+    gaps_out = 0
     border_size = 2
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = rgba(595959aa)
@@ -46,20 +46,20 @@ decoration {
 		enabled = 1
 		size = 6
 	}
-	dim_inactive = true
+	dim_inactive = false
 	dim_strength = 0.08
 
-	active_opacity = 0.98
-	inactive_opacity = 0.92
+	active_opacity = 1.00
+	inactive_opacity = 0.97
 
-    drop_shadow = yes
+    drop_shadow = no
     shadow_range = 4
     shadow_render_power = 3
     col.shadow = rgba(1a1a1aee)
 }
 
 animations {
-    enabled = yes
+    enabled = no
 
     bezier = myBezier, 0.05, 0.9, 0.1, 1.05
 
@@ -93,3 +93,16 @@ windowrulev2 = noanim, class:dmenu
 layerrule = noanim, launcher
 
 source = ./binds.conf
+
+# Even are for left monitor
+workspace = 1,monitor:HDMI-A-4
+workspace = 3,monitor:HDMI-A-4
+workspace = 5,monitor:HDMI-A-4
+workspace = 7,monitor:HDMI-A-4
+workspace = 9,monitor:HDMI-A-4
+
+# Odd are for right monitor
+workspace = 2,monitor:DP-2
+workspace = 4,monitor:DP-2
+workspace = 6,monitor:DP-2
+workspace = 8,monitor:DP-2
diff --git a/config/wayland/mako/config b/config/wayland/mako/config
index 4380506..06eed6e 100644
--- a/config/wayland/mako/config
+++ b/config/wayland/mako/config
@@ -24,6 +24,6 @@ default-timeout=0
 default-timeout=2000
 group-by=category
 
-[app-name=gurk]
+[summary=lolaa]
 # 45887 = 70%
 on-notify=exec paplay --volume=45887 ~/.local/share/sounds/ring1.ogg
diff --git a/config/wayland/waybar/config.jsonc b/config/wayland/waybar/config.jsonc
index 1d795fc..aa93297 120000..100644
--- a/config/wayland/waybar/config.jsonc
+++ b/config/wayland/waybar/config.jsonc
@@ -1 +1,16 @@
-configs/hyprland.jsonc
\ No newline at end of file
+{
+	"modules-left": ["hyprland/workspaces", "custom/layout", "hyprland/window"],
+	"modules-right": ["custom/status"],
+	"hyprland/window": {
+		"format": " {} "
+	},
+	"custom/layout": { 
+		"format": " []= ",
+		"interval": "once",
+	},
+	"custom/status": { 
+		"exec": "~/.config/waybar/status.sh",
+		"format": " {} ",
+		"interval": 1
+	}
+}
diff --git a/config/wayland/waybar/configs/dwm.jsonc b/config/wayland/waybar/configs/dwm.jsonc
deleted file mode 100644
index 211f776..0000000
--- a/config/wayland/waybar/configs/dwm.jsonc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"modules-left": ["hyprland/workspaces", "custom/layout", "hyprland/window"],
-	"modules-right": ["custom/status"],
-	"hyprland/window": {
-		"format": " {} "
-	},
-	"custom/layout": { 
-		"format": " []= ",
-		"interval": "once",
-	},
-	"custom/status": { 
-		"exec": "~/.config/waybar/scripts/status.sh",
-		"format": " {} ",
-		"interval": 1
-	}
-}
diff --git a/config/wayland/waybar/configs/hyprland.jsonc b/config/wayland/waybar/configs/hyprland.jsonc
deleted file mode 100644
index 9d60915..0000000
--- a/config/wayland/waybar/configs/hyprland.jsonc
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-	"layer": "top",
-	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
-	"modules-center": ["clock"],
-	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "custom/bluetooth", "tray"],
-	"mpd": {
-		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
-		"artist-len": 24,
-		"format-disconnected": "s",
-		"format-stopped": "",
-		"state-icons": {
-			"playing": "",
-			"paused": "",
-		},
-		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
-		"on-click": "mpc toggle",
-		"on-scroll-up": "mpc volume +5",
-		"on-scroll-down": "mpc volume -5",
-	},
-	"battery": {
-		"format-charging": " {capacity}%",
-		"on-click": "mpower",
-		"interval": 10,
-	},
-	"hyprland/window": {
-		"format": " {}",
-		"separate-outputs": true,
-	},
-	"pulseaudio": {
-		"scroll-step": 1,
-		"format": "{icon} {volume:3}%",
-		"format-icons": {
-			"default": ["", "", ""]
-		},
-		"on-click": "pavucontrol",
-	},
-	"temperature": {
-		"interval": 3,
-		"format": "{icon} {temperatureC}°C",
-		"format-icons": {
-			"default":["", "", "", "", ""]
-		},
-	},
-	"custom/wireguard": {
-		"exec": "ip addr show dev wg0",
-		"format": "wg0",
-		"restart-interval": 3,
-	},
-	"network": {
-		"format-wifi": " ",
-		"tooltip-format-wifi": "{ifname} {essid}",
-		"format-ethernet": "",
-		"tooltip-format-ethernet": "{ifname} {ipaddr}",
-		"format-disconnected": "",
-	},
-	"cpu": {
-		"format": " {usage:2}%",
-		"interval": 3,
-	},
-	"custom/memory": {
-		"exec": "free -h | awk '(NR==2){ print $3 }'",
-		"format": "{}",
-		"restart-interval": 3,
-	},
-	"clock": {
-		"format": "{:%R}",
-		"format-alt": "{:(%T) %A %d %B}",
-		"interval": 1,
-	},
-	"custom/bluetooth": {
-		"exec": "bluetoothctl info",
-		"format": "",
-		"interval": 3,
-	},
-	"tray": {
-		"spacing": 5,
-	}
-}
diff --git a/config/wayland/waybar/scripts/status.sh b/config/wayland/waybar/scripts/status.sh
deleted file mode 100755
index 3b658e5..0000000
--- a/config/wayland/waybar/scripts/status.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-printf 'Hyprland %s' "$(expac %v hyprland)"
diff --git a/config/wayland/waybar/status.sh b/config/wayland/waybar/status.sh
new file mode 100755
index 0000000..6d5bd66
--- /dev/null
+++ b/config/wayland/waybar/status.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+printf '%s' "$(date '+%-d %b %R')"
diff --git a/config/wayland/waybar/style.css b/config/wayland/waybar/style.css
index 76f49ff..31eacf0 120000..100644
--- a/config/wayland/waybar/style.css
+++ b/config/wayland/waybar/style.css
@@ -1 +1,20 @@
-styles/nord.css
\ No newline at end of file
+* {
+	border: none;
+	border-radius: 0;
+	font-family: monospace;
+	font-size: 14px;
+	min-height: 16px;
+}
+
+window#waybar, #workspaces button.active  {
+	background-color: #4c566a;
+}
+
+#workspaces button, #custom-layout, #custom-status {
+	background-color: #2e3440;
+}
+
+#workspaces button {
+	padding: 0 2px;
+	margin: 0;
+}
diff --git a/config/wayland/waybar/styles/base16.css b/config/wayland/waybar/styles/base16.css
deleted file mode 100644
index 639b590..0000000
--- a/config/wayland/waybar/styles/base16.css
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-@import "styles/colors/colors.css";
-
-* {
-	border: none;
-	border-radius: 0;
-	font-family: monospace;
-	font-weight: bold;
-	font-size: 12px;
-	min-height: 24px;
-}
-
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.hidden {
-	opacity: 0.2;
-}
-
-tooltip {
-	background: @background;
-	color: @foreground;
-	border: 2px solid @color0;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
-    color: @background;
-	background: @color7;
-}
-
-.modules-right * {
-	padding: 0 16px;
-}
-
-.modules-right {
-	margin-right: 2px;
-}
-.modules-left {
-	margin-left: 3px;
-}
-
-#workspaces, #tags, #mpd, #battery, 
-#clock,
-#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
-	border: solid @background;
-	border-width: 2px 2px 2px 0;
-	margin-top: 4px;
-	margin-bottom: 2px;
-	transition: none;
-}
-
-#battery {
-	color: @color6;
-	background: @background;
-	border-color: @color4;
-	border-width: 2px;
-	padding: 0 12px;
-	margin-right: 16px;
-}
-
-#workspaces, #tags {
-	border: solid @background 2px;
-	background: @color3;
-}
-
-#workspaces button, #tags button {
-	transition: none;
-	background: transparent;
-	color: @background;
-}
-
-#tags button.occupied {
-	background: @color2;
-}
-
-#workspaces button.active, #tags button.focused {
-	background-color: @color6;
-}
-
-#workspaces button:hover, #tags button:hover {
-	transition: none;
-	color: @color8;
-}
-
-#tags button {
-	margin: 0;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-#mpd {
-	color: @background;
-	padding: 0 16px;
-	background: @color6;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
-	color: @foreground;
-	background: @background;
-	border-color: @color4;
-}
-
-#clock {
-	border: solid @color4 2px;
-	padding: 0 16px;
-	color: @color3;
-	background: @background;
-}
-
-#window {
-	margin-left: 16px;
-	padding: 0;
-	color: @color5;
-}
-
-#custom-wireguard {
-	color: @color5;
-	border: 2px solid @color8;
-	background: @background;
-}
-
-#network {
-	color: @background;
-	border-left: 2px solid @background;
-	background: @color5;
-}
-
-#pulseaudio {
-	color: @background;
-	background: @color4;
-}
-
-#temperature {
-	color: @background;
-	background: @color3;
-}
-
-#cpu {
-	color: @background;
-	background: @color4;
-}
-
-#custom-memory {
-	padding: 0 16px;
-	color: @background;
-	background: @color5;
-}
-
-#custom-bluetooth {
-	color: @color6;
-	background: @color8;
-}
-
-#tray * {
-	padding: unset;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: @color1;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
diff --git a/config/wayland/waybar/styles/colors/colors-nord b/config/wayland/waybar/styles/colors/colors-nord
deleted file mode 100644
index 9622792..0000000
--- a/config/wayland/waybar/styles/colors/colors-nord
+++ /dev/null
@@ -1,29 +0,0 @@
-@define-color foreground #d8dee9;
-@define-color background #2e3440;
-
-@define-color color0 #3b4252;
-@define-color color1 #bf616a;
-@define-color color2 #a3be8c;
-@define-color color3 #ebcb8b;
-@define-color color4 #81a1c1;
-@define-color color5 #b48ead;
-@define-color color6 #88c0d0;
-@define-color color7 #e5e9f0;
-
-@define-color color8 #4c566a;
-@define-color color9 #bf616a;
-@define-color color10 #a3be8c;
-@define-color color11 #ebcb8b;
-@define-color color12 #81a1c1;
-@define-color color13 #b48ead;
-@define-color color14 #d08770;
-@define-color color15 #eceff4;
-
-@define-color color16 #373e4d;
-@define-color color17 #94545d;
-@define-color color18 #809575;
-@define-color color19 #b29e75;
-@define-color color20 #68809a;
-@define-color color21 #8c738c;
-@define-color color22 #6d96a5;
-@define-color color23 #aeb3bb;
diff --git a/config/wayland/waybar/styles/colors/colors.css b/config/wayland/waybar/styles/colors/colors.css
deleted file mode 120000
index 801cf92..0000000
--- a/config/wayland/waybar/styles/colors/colors.css
+++ /dev/null
@@ -1 +0,0 @@
-colors-nord
\ No newline at end of file
diff --git a/config/wayland/waybar/styles/dwm.css b/config/wayland/waybar/styles/dwm.css
deleted file mode 100644
index 31eacf0..0000000
--- a/config/wayland/waybar/styles/dwm.css
+++ /dev/null
@@ -1,20 +0,0 @@
-* {
-	border: none;
-	border-radius: 0;
-	font-family: monospace;
-	font-size: 14px;
-	min-height: 16px;
-}
-
-window#waybar, #workspaces button.active  {
-	background-color: #4c566a;
-}
-
-#workspaces button, #custom-layout, #custom-status {
-	background-color: #2e3440;
-}
-
-#workspaces button {
-	padding: 0 2px;
-	margin: 0;
-}
diff --git a/config/wayland/waybar/styles/nord.css b/config/wayland/waybar/styles/nord.css
deleted file mode 100644
index 3b7b7f6..0000000
--- a/config/wayland/waybar/styles/nord.css
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-* {
-	border: none;
-	border-radius: 0;
-	font-family: JetBrains Mono;
-	font-weight: bold;
-	font-size: 14px;
-	min-height: 24px;
-}
-
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.hidden {
-	opacity: 0.2;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
-    color: #2e3440;
-	background: #e6e6e6;
-}
-
-#mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory {
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-}
-
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
-	margin-top: 4px;
-	margin-bottom: 2px;
-	transition: none;
-	border-radius: 6px;
-}
-
-#battery {
-	color: #b48ead;
-	background: #4c566a;
-}
-
-#workspaces {
-	margin-left: 12px;
-	background: #2e3440;
-}
-
-#workspaces button {
-	transition: none;
-	color: #d8dee9;
-	background: transparent;
-	font-size: 16px;
-}
-
-#workspaces button.active {
-	color: #a3be8c;
-    text-shadow: 0px 0px 1px #a3be8c;
-}
-
-#workspaces button:hover {
-	transition: none;
-	color: #d08770;
-}
-
-#mpd {
-	color: #2e3440;
-	background: #88c0d0;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
-	color: #d8dee9;
-	background: #2e3440;
-}
-
-#window {
-	color: #88c0d0;
-}
-
-#network {
-	color: #2e3440;
-	background: #5e81ac;
-}
-
-#pulseaudio {
-	color: #2e3440;
-	background: #b48ead;
-}
-
-#temperature {
-	color: #2e3440;
-	background: #d08770;
-}
-
-#cpu {
-	color: #2e3440;
-	background: #ebcb8b;
-}
-
-#custom-memory {
-	color: #2e3440;
-	background: #a3be8c;
-}
-
-#clock {
-	margin-left: 8px;
-	margin-right: 12px;
-	padding-left: 16px;
-	padding-right: 16px;
-	color: #d8dee9;
-	background: #2e3440;
-}
-
-#tray {
-	margin-right: 12px;
-	color: #d8dee9;
-	background: transparent;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #bf616a;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}