From e4e54c0cfbd4fee37d148674f38d2000b640eacd Mon Sep 17 00:00:00 2001
From: "Matthieu Fortin (CPC/CCP)" <matthieu.fortin.cpc@gmail.com>
Date: Wed, 27 Nov 2024 15:13:16 -0500
Subject: [PATCH] Made it to compile...

---
 hypr/.config/hypr/hyprland.conf     | 157 ++--------------------------
 hypr/.config/hypr/keybinds.conf     | 139 ++++++++++++++++++++++++
 hypr/.config/hypr/scripts/Volume.sh | 143 +++++++++++++++++++++++++
 hypr/.config/waybar/config.jsonc    |  89 +++++++---------
 hypr/.config/waybar/style.css       |  30 +++---
 scripts/.local/bin/umountbackups    |   2 +-
 scripts/.local/bin/umountnas        |   3 +
 7 files changed, 350 insertions(+), 213 deletions(-)
 create mode 100644 hypr/.config/hypr/keybinds.conf
 create mode 100755 hypr/.config/hypr/scripts/Volume.sh
 create mode 100755 scripts/.local/bin/umountnas

diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
index ea9e0e8..a1e65e6 100644
--- a/hypr/.config/hypr/hyprland.conf
+++ b/hypr/.config/hypr/hyprland.conf
@@ -9,22 +9,12 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=,preferred,auto,1
 
+source = ~/.config/hypr/keybinds.conf
 
 ### MY PROGRAMS ###
 
 # See https://wiki.hyprland.org/Configuring/Keywords/
 
-# Set programs that you use
-$terminal = kitty
-$fileManager = dolphin
-$emoji = rofi -mode emoji -show emoji -kb-secondary-copy '' -kb-custom-1 Ctrl+c
-$menu = ~/.config/rofi/launcher.sh
-#$menu = ~/.config/rofi/launchers/type-2/launcher.sh
-#$menu = tofi-drun -c ~/.config/tofi/configA --drun-launch=true
-$browser = librewolf
-$editor = code
-$editor-alt = nvim
-$colorPicker = hyprpicker
 
 
 ### AUTOSTART ###
@@ -85,20 +75,16 @@ env = NVD_BACKEND,direct
 env = ELECTRON_OZONE_PLATFORM_HINT,auto
 
 # QT
-env = QT_QPA_PLATFORM,wayland
+env = QT_QPA_PLATFORM,wayland;xcb
 env = QT_QPA_PLATFORMTHEME,qt6ct
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-#env = QT_STYLE_OVERRIDE,kvantum
 
 # Toolkit Backend Variables
-env = GDK_BACKEND,wayland,x11,*
+env = GDK_BACKEND,wayland,x11
 env = SDL_VIDEODRIVER,wayland
 env = CLUTTER_BACKEND,wayland
 
-#env = GTK_THEME,Breeze-Dark
-#env = GTK2_RC_FILES,/usr/share/themes/Breeze-Dark/gtk-2.0
-
 # XDG Specifications
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
@@ -113,8 +99,8 @@ general {
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = rgba(595959aa)
     allow_tearing = false
-    #layout = dwindle
-    layout = master
+    layout = dwindle
+    #layout = master
     resize_on_border = true
     hover_icon_on_border = true
 }
@@ -171,6 +157,7 @@ animations {
 dwindle {
     pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = true # You probably want this
+    force_split = 2
 }
 
 master {
@@ -190,10 +177,10 @@ misc {
 ### INPUT ###
 
 input {
-    kb_layout = us
+    kb_layout = us,ca
     kb_variant =
     kb_model =
-    kb_options =
+    kb_options = grp:alt_shift_toggle
     kb_rules =
 
     follow_mouse = 1
@@ -214,134 +201,6 @@ device {
     sensitivity = -0.5
 }
 
-
-### KEYBINDINGS ###
-
-$mainMod = SUPER # Sets "Windows" key as main modifier
-
-bind = $mainMod, return, exec, $terminal # Launch a terminal
-bind = $mainMod, B, exec, $browser # Launch the default browser
-bind = $mainMod, C, exec, $editor # Launch Visual Studio Code
-bind = $mainMod, N, exec, $editor-alt # Launch Neovim
-bind = $mainMod, Q, killactive, # Kill active window
-bind = $mainMod SHIFT, Q, exec, "$HOME/.config/hypr/scripts/KillActiveProcess.sh # Kill active window
-bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0, # Exit Hyprland
-bind = $mainMod, E, exec, XDG_CURRENT_DESKTOP=kde $fileManager # Launch the file manager
-bind = $mainMod SHIFT, F, togglefloating, # Toggle floating
-bind = $mainMod ALT, F, exec, hyprctl dispatch workspace allfloat
-bind = $mainMod, space, exec, $menu # Launch menu
-bind = $mainMod, F, fullscreen # Toggle fullscreen
-bind = $mainMod ALT, L, exec, $HOME/.config/hypr/scripts/ChangeLayout.sh # Toggle Master of Dwindle Layout
-
-# Dwindle Layout
-bind = $mainMod SHIFT, I, togglesplit # only works on dwingle layout
-bind = $mainMod, P, pseudo, # dwindle
-
-# Master Layout
-bind  = $mainMod CTRL, D, layoutmsg, removemaster
-bind  = $mainMod, I, layoutmsg, addmaster
-bind  = $mainMod, J, layoutmsg, cyclenext
-bind  = $mainMod, K, layoutmsg, cycleprev
-bind  = $mainMod CTRL, Return, layoutmsg, swapwithmaster
-
-# Works on either layout (Master of Dwindle)
-bind  = $mainMod, M, exec, hyprctl dispatch splitration 0.25
-
-
-bind = $mainMod, period, exec, $emoji # Emoji selector
-bind = $mainMod, S, exec, autoscriptmenu # Launch menu to modify/create script
-
-##bindd = $mainMod, V, Clipboard History, exec, "$HOME/.config/rofi/clipboard.sh"
-bind = $mainMod, V, exec, "$HOME/.config/hypr/scripts/ClipManager.sh" # Clipboard History
-bind = $mainMod, R, exec, [floating] remmina # Launch Remmina
-
-# Move focus with mainMod + arrow keys
-bind  = $mainMod, left, movefocus, l
-bind  = $mainMod, right, movefocus, r
-bind  = $mainMod, up, movefocus, u
-bind  = $mainMod, down, movefocus, d
-
-# Switch workspaces with mainMod + [0-9]
-bind  = $mainMod, 1, workspace, 1
-bind  = $mainMod, 2, workspace, 2
-bind  = $mainMod, 3, workspace, 3
-bind  = $mainMod, 4, workspace, 4
-bind  = $mainMod, 5, workspace, 5
-bind  = $mainMod, 6, workspace, 6
-bind  = $mainMod, 7, workspace, 7
-bind  = $mainMod, 8, workspace, 8
-bind  = $mainMod, 9, workspace, 9
-bind  = $mainMod, 0, workspace, 10
-
-# Move and follow active window to a workspace with mainMod + SHIFT + [0-9]
-bind  = $mainMod SHIFT, 1, movetoworkspace, 1
-bind  = $mainMod SHIFT, 2, movetoworkspace, 2
-bind  = $mainMod SHIFT, 3, movetoworkspace, 3
-bind  = $mainMod SHIFT, 4, movetoworkspace, 4
-bind  = $mainMod SHIFT, 5, movetoworkspace, 5
-bind  = $mainMod SHIFT, 6, movetoworkspace, 6
-bind  = $mainMod SHIFT, 7, movetoworkspace, 7
-bind  = $mainMod SHIFT, 8, movetoworkspace, 8
-bind  = $mainMod SHIFT, 9, movetoworkspace, 9
-bind  = $mainMod SHIFT, 0, movetoworkspace, 10
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind  = $mainMod CTRL, 1, movetoworkspacesilent, 1
-bind  = $mainMod CTRL, 2, movetoworkspacesilent, 2
-bind  = $mainMod CTRL, 3, movetoworkspacesilent, 3
-bind  = $mainMod CTRL, 4, movetoworkspacesilent, 4
-bind  = $mainMod CTRL, 5, movetoworkspacesilent, 5
-bind  = $mainMod CTRL, 6, movetoworkspacesilent, 6
-bind  = $mainMod CTRL, 7, movetoworkspacesilent, 7
-bind  = $mainMod CTRL, 8, movetoworkspacesilent, 8
-bind  = $mainMod CTRL, 9, movetoworkspacesilent, 9
-bind  = $mainMod CTRL, 0, movetoworkspacesilent, 10
-
-# Example special workspace (scratchpad)
-#bind  = $mainMod, S, togglespecialworkspace, magic
-bind  = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind  = $mainMod, mouse_down, workspace, e+1
-bind  = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Color picker
-#bindd = $mainMod, P, Color Picker, exec, $colorPicker | wl-copy
-
-# Screen locking
-bind = $mainMod, L, exec, pidof hyprlock || hyprlock -q # Lock the screen
-
-# Logout
-bind = $mainMod, Escape, exec, wlogout # Session logout
-bind = CTRL ALT, P, exec, "$HOME/.config/hypr/scripts/Wlogout.sh" # Session logout
-
-# Waybar
-bind = CTRL, Escape, exec, killall waybar || waybar # Toggle waybar
-
-# Screenshot
-
-bind = , Print, exec, grimblast --notify copysave screen # Screenshot entire screen
-bind = $mainMod, Print, exec, grimblast --notify copysave active # Screenshot active window
-bind = $mainMod Alt, Print, exec, grimblast --notify copysave area # Screenshot selected area
-
-# Laptop multimedia keys for volume and LCD brightness
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-#bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
-#bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
-
-# Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
-
 ##############################
 ### WINDOWS AND WORKSPACES ###
 ##############################
diff --git a/hypr/.config/hypr/keybinds.conf b/hypr/.config/hypr/keybinds.conf
new file mode 100644
index 0000000..0921c81
--- /dev/null
+++ b/hypr/.config/hypr/keybinds.conf
@@ -0,0 +1,139 @@
+# Set programs that you use
+$terminal = kitty
+$fileManager = dolphin
+$emoji = rofi -mode emoji -show emoji -kb-secondary-copy '' -kb-custom-1 Ctrl+c
+$menu = ~/.config/rofi/launcher.sh
+#$menu = ~/.config/rofi/launchers/type-2/launcher.sh
+#$menu = tofi-drun -c ~/.config/tofi/configA --drun-launch=true
+$browser = librewolf
+$editor = code
+$editor-alt = nvim
+$colorPicker = hyprpicker
+
+### KEYBINDINGS ###
+
+$mainMod = SUPER # Sets "Windows" key as main modifier
+
+bind = $mainMod, return, exec, $terminal # Launch a terminal
+bind = $mainMod, B, exec, $browser # Launch the default browser
+bind = $mainMod, C, exec, $editor # Launch Visual Studio Code
+bind = $mainMod, N, exec, $terminal $editor-alt # Launch Neovim
+bind = $mainMod, Q, killactive, # Kill active window
+bind = $mainMod SHIFT, Q, exec, "$HOME/.config/hypr/scripts/KillActiveProcess.sh # Kill active window
+bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0, # Exit Hyprland
+bind = $mainMod, E, exec, XDG_CURRENT_DESKTOP=kde $fileManager # Launch the file manager
+bind = $mainMod SHIFT, F, togglefloating, # Toggle floating
+bind = $mainMod ALT, F, exec, hyprctl dispatch workspace allfloat
+bind = $mainMod, space, exec, $menu # Launch menu
+bind = $mainMod, F, fullscreen # Toggle fullscreen
+bind = $mainMod ALT, L, exec, $HOME/.config/hypr/scripts/ChangeLayout.sh # Toggle Master of Dwindle Layout
+
+# Dwindle Layout
+bind = $mainMod SHIFT, I, togglesplit # only works on dwingle layout
+bind = $mainMod, P, pseudo, # dwindle
+
+# Master Layout
+bind  = $mainMod CTRL, D, layoutmsg, removemaster
+bind  = $mainMod, I, layoutmsg, addmaster
+bind  = $mainMod, J, layoutmsg, cyclenext
+bind  = $mainMod, K, layoutmsg, cycleprev
+bind  = $mainMod CTRL, Return, layoutmsg, swapwithmaster
+
+# Works on either layout (Master of Dwindle)
+bind  = $mainMod, M, exec, hyprctl dispatch splitration 0.25
+
+
+bind = $mainMod, period, exec, $emoji # Emoji selector
+bind = $mainMod, S, exec, autoscriptmenu # Launch menu to modify/create script
+
+##bindd = $mainMod, V, Clipboard History, exec, "$HOME/.config/rofi/clipboard.sh"
+bind = $mainMod, V, exec, "$HOME/.config/hypr/scripts/ClipManager.sh" # Clipboard History
+bind = $mainMod, R, exec, [floating] remmina # Launch Remmina
+
+# Move focus with mainMod + arrow keys
+bind  = $mainMod, left, movefocus, l
+bind  = $mainMod, right, movefocus, r
+bind  = $mainMod, up, movefocus, u
+bind  = $mainMod, down, movefocus, d
+
+# Switch workspaces with mainMod + [0-9]
+bind  = $mainMod, 1, workspace, 1
+bind  = $mainMod, 2, workspace, 2
+bind  = $mainMod, 3, workspace, 3
+bind  = $mainMod, 4, workspace, 4
+bind  = $mainMod, 5, workspace, 5
+bind  = $mainMod, 6, workspace, 6
+bind  = $mainMod, 7, workspace, 7
+bind  = $mainMod, 8, workspace, 8
+bind  = $mainMod, 9, workspace, 9
+bind  = $mainMod, 0, workspace, 10
+
+# Move and follow active window to a workspace with mainMod + SHIFT + [0-9]
+bind  = $mainMod SHIFT, 1, movetoworkspace, 1
+bind  = $mainMod SHIFT, 2, movetoworkspace, 2
+bind  = $mainMod SHIFT, 3, movetoworkspace, 3
+bind  = $mainMod SHIFT, 4, movetoworkspace, 4
+bind  = $mainMod SHIFT, 5, movetoworkspace, 5
+bind  = $mainMod SHIFT, 6, movetoworkspace, 6
+bind  = $mainMod SHIFT, 7, movetoworkspace, 7
+bind  = $mainMod SHIFT, 8, movetoworkspace, 8
+bind  = $mainMod SHIFT, 9, movetoworkspace, 9
+bind  = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind  = $mainMod CTRL, 1, movetoworkspacesilent, 1
+bind  = $mainMod CTRL, 2, movetoworkspacesilent, 2
+bind  = $mainMod CTRL, 3, movetoworkspacesilent, 3
+bind  = $mainMod CTRL, 4, movetoworkspacesilent, 4
+bind  = $mainMod CTRL, 5, movetoworkspacesilent, 5
+bind  = $mainMod CTRL, 6, movetoworkspacesilent, 6
+bind  = $mainMod CTRL, 7, movetoworkspacesilent, 7
+bind  = $mainMod CTRL, 8, movetoworkspacesilent, 8
+bind  = $mainMod CTRL, 9, movetoworkspacesilent, 9
+bind  = $mainMod CTRL, 0, movetoworkspacesilent, 10
+
+# Example special workspace (scratchpad)
+#bind  = $mainMod, S, togglespecialworkspace, magic
+bind  = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind  = $mainMod, mouse_down, workspace, e+1
+bind  = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+# Color picker
+#bindd = $mainMod, P, Color Picker, exec, $colorPicker | wl-copy
+
+# Screen locking
+bind = $mainMod, L, exec, pidof hyprlock || hyprlock -q # Lock the screen
+
+# Logout
+bind = $mainMod, Escape, exec, wlogout # Session logout
+bind = CTRL ALT, P, exec, "$HOME/.config/hypr/scripts/Wlogout.sh" # Session logout
+
+# Waybar
+bind = CTRL, Escape, exec, killall waybar || waybar # Toggle waybar
+
+# Screenshot
+
+bind = , Print, exec, grimblast --notify copysave screen # Screenshot entire screen
+bind = $mainMod, Print, exec, grimblast --notify copysave active # Screenshot active window
+bind = $mainMod Alt, Print, exec, grimblast --notify copysave area # Screenshot selected area
+
+# Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+#bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
+#bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
+
+# Requires playerctl
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
+
diff --git a/hypr/.config/hypr/scripts/Volume.sh b/hypr/.config/hypr/scripts/Volume.sh
new file mode 100755
index 0000000..19868ca
--- /dev/null
+++ b/hypr/.config/hypr/scripts/Volume.sh
@@ -0,0 +1,143 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Scripts for volume controls for audio and mic 
+
+iDIR="$HOME/.config/swaync/icons"
+sDIR="$HOME/.config/hypr/scripts"
+
+# Get Volume
+get_volume() {
+    volume=$(pamixer --get-volume)
+    if [[ "$volume" -eq "0" ]]; then
+        echo "Muted"
+    else
+        echo "$volume%"
+    fi
+}
+
+# Get icons
+get_icon() {
+    current=$(get_volume)
+    if [[ "$current" == "Muted" ]]; then
+        echo "$iDIR/volume-mute.png"
+    elif [[ "${current%\%}" -le 30 ]]; then
+        echo "$iDIR/volume-low.png"
+    elif [[ "${current%\%}" -le 60 ]]; then
+        echo "$iDIR/volume-mid.png"
+    else
+        echo "$iDIR/volume-high.png"
+    fi
+}
+
+# Notify
+notify_user() {
+    if [[ "$(get_volume)" == "Muted" ]]; then
+        notify-send -e -h string:x-canonical-private-synchronous:volume_notif -u low -i "$(get_icon)" "Volume: Muted"
+    else
+        notify-send -e -h int:value:"$(get_volume | sed 's/%//')" -h string:x-canonical-private-synchronous:volume_notif -u low -i "$(get_icon)" "Volume: $(get_volume)"
+        "$sDIR/Sounds.sh" --volume
+    fi
+}
+
+# Increase Volume
+inc_volume() {
+    if [ "$(pamixer --get-mute)" == "true" ]; then
+        toggle_mute
+    else
+        pamixer -i 5 --allow-boost --set-limit 150 && notify_user
+    fi
+}
+
+# Decrease Volume
+dec_volume() {
+    if [ "$(pamixer --get-mute)" == "true" ]; then
+        toggle_mute
+    else
+        pamixer -d 5 && notify_user
+    fi
+}
+
+# Toggle Mute
+toggle_mute() {
+	if [ "$(pamixer --get-mute)" == "false" ]; then
+		pamixer -m && notify-send -e -u low -i "$iDIR/volume-mute.png" "Volume Switched OFF"
+	elif [ "$(pamixer --get-mute)" == "true" ]; then
+		pamixer -u && notify-send -e -u low -i "$(get_icon)" "Volume Switched ON"
+	fi
+}
+
+# Toggle Mic
+toggle_mic() {
+	if [ "$(pamixer --default-source --get-mute)" == "false" ]; then
+		pamixer --default-source -m && notify-send -e -u low -i "$iDIR/microphone-mute.png" "Microphone Switched OFF"
+	elif [ "$(pamixer --default-source --get-mute)" == "true" ]; then
+		pamixer -u --default-source u && notify-send -e -u low -i "$iDIR/microphone.png" "Microphone Switched ON"
+	fi
+}
+# Get Mic Icon
+get_mic_icon() {
+    current=$(pamixer --default-source --get-volume)
+    if [[ "$current" -eq "0" ]]; then
+        echo "$iDIR/microphone-mute.png"
+    else
+        echo "$iDIR/microphone.png"
+    fi
+}
+
+# Get Microphone Volume
+get_mic_volume() {
+    volume=$(pamixer --default-source --get-volume)
+    if [[ "$volume" -eq "0" ]]; then
+        echo "Muted"
+    else
+        echo "$volume%"
+    fi
+}
+
+# Notify for Microphone
+notify_mic_user() {
+    volume=$(get_mic_volume)
+    icon=$(get_mic_icon)
+    notify-send -e -h int:value:"$volume" -h "string:x-canonical-private-synchronous:volume_notif" -u low -i "$icon" "Mic-Level: $volume"
+}
+
+# Increase MIC Volume
+inc_mic_volume() {
+    if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
+        toggle_mic
+    else
+        pamixer --default-source -i 5 && notify_mic_user
+    fi
+}
+
+# Decrease MIC Volume
+dec_mic_volume() {
+    if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
+        toggle-mic
+    else
+        pamixer --default-source -d 5 && notify_mic_user
+    fi
+}
+
+# Execute accordingly
+if [[ "$1" == "--get" ]]; then
+	get_volume
+elif [[ "$1" == "--inc" ]]; then
+	inc_volume
+elif [[ "$1" == "--dec" ]]; then
+	dec_volume
+elif [[ "$1" == "--toggle" ]]; then
+	toggle_mute
+elif [[ "$1" == "--toggle-mic" ]]; then
+	toggle_mic
+elif [[ "$1" == "--get-icon" ]]; then
+	get_icon
+elif [[ "$1" == "--get-mic-icon" ]]; then
+	get_mic_icon
+elif [[ "$1" == "--mic-inc" ]]; then
+	inc_mic_volume
+elif [[ "$1" == "--mic-dec" ]]; then
+	dec_mic_volume
+else
+	get_volume
+fi
diff --git a/hypr/.config/waybar/config.jsonc b/hypr/.config/waybar/config.jsonc
index 2988809..c9e25bf 100644
--- a/hypr/.config/waybar/config.jsonc
+++ b/hypr/.config/waybar/config.jsonc
@@ -11,9 +11,10 @@
         "custom/hostname",
         "hyprland/workspaces"
     ],
-    "modules-center": ["hyprland/window"],
+//    "modules-center": ["hyprland/window"],
     "modules-right": [
-        "tray",
+        "hyprland/language",
+//        "keyboard-state",
         "custom/updates",
         "memory",
         "cpu",
@@ -21,13 +22,20 @@
 //        "battery",
 //        "backlight",
         "idle_inhibitor",
-//        "wireplumber",
-        "pulseaudio",
-        "pulseaudio#microphone",
+        "wireplumber",
+//        "pulseaudio",
+//        "pulseaudio#microphone",
+        "tray",
         "clock"
 //        "custom/power",
     ],
 
+      "hyprland/language" :{
+    //
+        "format": "{}",
+        "format-en": "",
+        "format-fr": "󱌃"
+      },
       "custom/hostname" :{
         "format": "{}",
         "return-type":"text",
@@ -57,7 +65,7 @@
     },
 
     "tray": {
-        "icon-size": 24,
+        "icon-size": 21,
         "spacing": 10
     },
 
@@ -103,50 +111,17 @@
 //        "format-icons": ["󰂃", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
 //    },
 
-    "wireplumber": {
-        "format": "{icon} {volume}%",
-        "format-bluetooth": "󰂰",
-        "nospacing": 1,
-        "tooltip-format": "Volume : {volume}%",
-        "format-muted": "󰝟  Muted",
-        "format-icons": {
-            "headphone": "",
-            "default": ["","", "", ""]
-        },
-        "on-click": "pamixer -t",
-        "scroll-step": 1
-    },
-
-    "pulseaudio": {
-        "format": "{icon}  {volume}%",
-        "tooltip": false,
-        "format-muted": "  Muted",
-        "on-click": "pamixer -t",
-        "on-scroll-up": "pamixer -i 5",
-        "on-scroll-down": "pamixer -d 5",
-        "scroll-step": 5,
-        "max-volume": 100,
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["","", "", ""]
-        }
-    },
-
-    "pulseaudio#microphone": {
-        "format": "{format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "  Muted",
-        "on-click": "pamixer --default-source -t",
-        "on-scroll-up": "pamixer --default-source -i 5",
-        "on-scroll-down": "pamixer --default-source -d 5",
-        "scroll-step": 5,
-        "max-volume": 100,
-    },
+      "wireplumber": {
+	      "format": "{icon}  {volume} %",
+	      "format-muted": " Mute",
+	      "on-click": "$HOME/.config/hypr/scripts/Volume.sh --toggle",
+	      "on-click-right": "pavucontrol -t 3",
+	      "on-scroll-up": "$HOME/.config/hypr/scripts/Volume.sh --inc",
+	      "on-scroll-down": "$HOME/.config/hypr/scripts/Volume.sh --dec",
+	      "format-icons": [
+		      "", "", "󰕾", ""
+	      ],
+      },
 
     "memory": {
         "states": {
@@ -210,8 +185,20 @@
       "tooltip": false
     },
     "custom/power": {
-      "format": "⏻",
+      "format": " ⏻ ",
       "on-click": "nwgbar",
       "tooltip": false
     },
+    "keyboard-state": {
+	    //"numlock": true,
+	    "capslock": true,
+	    "format": {
+		    "numlock": "N {icon}",
+		    "capslock": "󰪛 {icon}",
+	      },
+	    "format-icons": {
+		    "locked": "",
+		    "unlocked": ""
+	    },
+    }
 }
diff --git a/hypr/.config/waybar/style.css b/hypr/.config/waybar/style.css
index 9d91f75..df4aa80 100644
--- a/hypr/.config/waybar/style.css
+++ b/hypr/.config/waybar/style.css
@@ -44,6 +44,7 @@ window#waybar {
 #clock,
 #battery,
 #pulseaudio,
+#wireplumber,
 #network,
 #idle_inhibitor,
 #cpu,
@@ -53,6 +54,7 @@ window#waybar {
 #custom-updates,
 #custom-launcher,
 #custom-hostname,
+#language,
 #backlight {
     background: #1e1e2e;
     padding: 0px 10px;
@@ -72,9 +74,20 @@ window#waybar {
   border-bottom-right-radius: 10px;
 }
 
-#tray {
+#language {
     border-radius: 10px;
     margin-right: 10px;
+    margin-left: 5px;
+    padding-right: 5px;
+    padding-left: 5px;
+}
+
+#tray {
+    /*border-radius: 10px*/
+    /*margin-right: 10px;*/
+    margin-left: 10px; 
+    border-top-left-radius: 10px;
+    border-bottom-left-radius: 10px;
 }
 
 #workspaces {
@@ -103,9 +116,9 @@ window#waybar {
 #clock {
     color: #a6adc8;
     /*border-radius: 10px 10px 10px 10px;*/
-    border-top-left-radius: 10px;
-    border-bottom-left-radius: 10px;
-    margin-left: 5px;
+    /*border-top-left-radius: 10px;*/
+    /*border-bottom-left-radius: 10px;*/
+    /*margin-left: 5px;*/
     border-right: 0px;
 }
 
@@ -123,18 +136,11 @@ window#waybar {
     border-radius: 10px 0px 0px 10px;
 }
 
-#pulseaudio {
+#wireplumber {
     color: #a6adc8;
     border-left: 0px;
     border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: #a6adc8;
     border-radius: 0px 10px 10px 0px;
-    border-left: 0px;
-    border-right: 0px;
-    margin-right: 5px;
 }
 
 #battery {
diff --git a/scripts/.local/bin/umountbackups b/scripts/.local/bin/umountbackups
index 38e1311..a52488d 100755
--- a/scripts/.local/bin/umountbackups
+++ b/scripts/.local/bin/umountbackups
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-umount /home/matt/backups-remote
+sudo umount "$HOME/backups-remote"
diff --git a/scripts/.local/bin/umountnas b/scripts/.local/bin/umountnas
new file mode 100755
index 0000000..88896dc
--- /dev/null
+++ b/scripts/.local/bin/umountnas
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo umount "$HOME/TCLI_Courses"