Update waybar style.css

.config/atuin/config.toml

@@ -36,12 +36,12 @@ search_mode = "fuzzy"
 
 ## which filter mode to use
 ## possible values: global, host, session, directory
-# filter_mode = "global"
+filter_mode = "global"
 
 ## which filter mode to use when atuin is invoked from a shell up-key binding
 ## the accepted values are identical to those of "filter_mode"
 ## leave unspecified to use same mode set in "filter_mode"
-# filter_mode_shell_up_key_binding = "global"
+filter_mode_shell_up_key_binding = "session"
 
 ## which style to use
 ## possible values: auto, full, compact

.config/btop/btop.conf

@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.2.13
+#? Config file for btop v. 1.4.5
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@@ -37,6 +37,9 @@ graph_symbol = "braille"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_cpu = "default"
 
+# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
+graph_symbol_gpu = "default"
+
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_mem = "default"
 
@@ -46,7 +49,7 @@ graph_symbol_net = "default"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_proc = "default"
 
-#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
+#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
 shown_boxes = "proc cpu mem net"
 
 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
@@ -86,6 +89,9 @@ proc_left = False
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
 proc_filter_kernel = False
 
+#* In tree-view, always accumulate child process resources in the parent process.
+proc_aggregate = False
+
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_upper = "total"
@@ -94,6 +100,9 @@ cpu_graph_upper = "total"
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_lower = "total"
 
+#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
+show_gpu_info = "Auto"
+
 #* Toggles if the lower CPU graph should be inverted.
 cpu_invert_lower = True
 
@@ -106,6 +115,9 @@ cpu_bottom = False
 #* Shows the system uptime in the CPU box.
 show_uptime = True
 
+#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
+show_cpu_watts = True
+
 #* Show cpu temperature.
 check_temp = True
 
@@ -141,7 +153,7 @@ background_update = True
 custom_cpu_name = ""
 
 #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
-#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user".
+#* Only disks matching the filter will be shown. Prepend exclude= to only show disks not matching the filter. Examples: disk_filter="/boot /home/user", disks_filter="exclude=/boot /home/user"
 disks_filter = ""
 
 #* Show graphs instead of meters for memory values.
@@ -201,12 +213,45 @@ net_sync = True
 #* Starts with the Network Interface specified here.
 net_iface = ""
 
+#* "True" shows bitrates in base 10 (Kbps, Mbps). "False" shows bitrates in binary sizes (Kibps, Mibps, etc.). "Auto" uses base_10_sizes.
+base_10_bitrate = "Auto"
+
 #* Show battery stats in top right if battery is present.
 show_battery = False
 
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"
 
+#* Show power stats of battery next to charge indicator.
+show_battery_watts = True
+
 #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-log_level = "WARNING"
+log_level = "WARNING"
+
+#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
+nvml_measure_pcie_speeds = True
+
+#* Measure PCIe throughput on AMD cards, may impact performance on certain cards.
+rsmi_measure_pcie_speeds = True
+
+#* Horizontally mirror the GPU graph.
+gpu_mirror_graph = True
+
+#* Custom gpu0 model name, empty string to disable.
+custom_gpu_name0 = ""
+
+#* Custom gpu1 model name, empty string to disable.
+custom_gpu_name1 = ""
+
+#* Custom gpu2 model name, empty string to disable.
+custom_gpu_name2 = ""
+
+#* Custom gpu3 model name, empty string to disable.
+custom_gpu_name3 = ""
+
+#* Custom gpu4 model name, empty string to disable.
+custom_gpu_name4 = ""
+
+#* Custom gpu5 model name, empty string to disable.
+custom_gpu_name5 = ""

.config/hypr/UserConfigs/UserSettings.conf

@@ -8,3 +8,39 @@
 #
 # Look on ~/.config/hypr/configs/SystemSettings.conf to know how to modify this
 
+input {
+  kb_layout = us,rs,rs,de
+  kb_variant = ,latinyz,yz,qwerty
+  kb_model =
+  kb_options = caps:swapescape
+  kb_rules =
+  repeat_rate = 50
+  repeat_delay = 300
+
+  sensitivity = 0 #mouse sensitivity
+  #accel_profile =     # flat or adaptive or blank or EMPTY means libinput’s default mode
+  numlock_by_default = true
+  left_handed = false
+  follow_mouse = 1
+  float_switch_override_focus = false
+
+  touchpad {
+    disable_while_typing = true
+    natural_scroll = true
+    clickfinger_behavior = false
+    middle_button_emulation = false
+    tap-to-click = true
+    drag_lock = false
+  }
+
+  # below for devices with touchdevice ie. touchscreen
+	touchdevice {
+		enabled = true
+	}
+
+	# below is for table see link above for proper variables
+	tablet {
+		transform = 0
+		left_handed = 0
+	}
+}

.config/hypr/configs/Keybinds.conf

@@ -62,7 +62,7 @@ bindd = $mainMod CTRL, O, toggle active window opacity, exec, hyprctl setprop ac
 bindd = $mainMod SHIFT, K, search keybinds, exec, $scriptsDir/KeyBinds.sh
 bindd = $mainMod SHIFT, A, animations menu, exec, $scriptsDir/Animations.sh
 bindd = $mainMod SHIFT, O, change oh-my-zsh theme, exec, $UserScripts/ZshChangeTheme.sh
-bindlnd = ALT_L, SHIFT_L, switch keyboard layout globally, exec, $scriptsDir/SwitchKeyboardLayout.sh
+bindlnd = ALT_L, SHIFT_L, switch keyboard layout globally, exec, $scriptsDir/KeyboardLayout.sh switch
 bindlnd = SHIFT_L, ALT_L, switch keyboard layout per-window, exec, $scriptsDir/Tak0-Per-Window-Switch.sh
 bindd = $mainMod ALT, C, calculator, exec, $UserScripts/RofiCalc.sh
 

.config/hypr/scripts/KeyboardLayout.sh

@@ -0,0 +1,119 @@
+#!/usr/bin/env bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# This is for changing kb_layouts. Set kb_layouts in "$HOME/.config/hypr/UserConfigs/UserSettings.conf"
+
+notif_icon="$HOME/.config/swaync/images/ja.png"
+SCRIPTSDIR="$HOME/.config/hypr/scripts"
+
+# Refined ignore list with patterns or specific device names
+ignore_patterns=(
+  "--(avrcp)"
+  "Bluetooth Speaker"
+  "Other Device
+  Name"
+  )
+
+
+# Function to get keyboard names
+get_keyboard_names() {
+    hyprctl devices -j | jq -r '.keyboards[].name'
+}
+
+# Function to check if a device matches any ignore pattern
+is_ignored() {
+    local device_name=$1
+    for pattern in "${ignore_patterns[@]}"; do
+        if [[ "$device_name" == *"$pattern"* ]]; then
+            return 0 # Device matches ignore pattern
+        fi
+    done
+    return 1 # Device does not match any ignore pattern
+}
+
+# Function to get current layout info
+get_current_layout_info() {
+    local found_kb=false
+
+    # Read from the first non-ignored layout
+    while read -r name; do
+        if ! is_ignored "$name"; then
+            found_kb=true
+            local layout_mapping_str=$(hyprctl devices -j |
+                jq -r ".keyboards[] | select(.name==\"$name\").layout")
+            IFS="," read -r -a layout_mapping <<<"$layout_mapping_str"
+
+            local variant_mapping_str=$(hyprctl devices -j |
+                jq -r ".keyboards[] | select(.name==\"$name\").variant")
+            IFS="," read -r -a variant_mapping <<<"$variant_mapping_str"
+
+            layout_index=$(hyprctl devices -j |
+                jq -r ".keyboards[] | select(.name==\"$name\").active_layout_index")
+            break
+        fi
+    done <<< "$(get_keyboard_names)"
+
+    $found_kb && return 0
+    return 1
+}
+
+# Function to change keyboard layout
+change_layout() {
+    local error_found=false
+
+    while read -r name; do
+        if is_ignored "$name"; then
+            echo "Skipping ignored device: $name"
+            continue
+        fi
+
+        echo "Switching layout for $name to $new_layout..."
+              hyprctl switchxkblayout "$name" "$next_index"
+        if [ $? -ne 0 ]; then
+            echo "Error while switching layout for $name." >&2
+            error_found=true
+        fi
+    done <<< "$(get_keyboard_names)"
+
+    $error_found && return 1
+    return 0
+}
+
+
+# Stores values in layout_mapping, variant_mapping and layout_index
+if ! get_current_layout_info; then
+    echo "Could not get current layout information." >&2
+    echo "There might not be any keyboards available, \
+        or some were unnecessarily set as ignored." >&2
+    notify-send -u low -t 2000 'kb_layout' " Error:" " Layout change failed"
+    echo "Exiting $0 $@" >&2
+    exit 1
+fi
+
+current_layout=${layout_mapping[layout_index]}
+current_variant=${variant_mapping[layout_index]}
+
+if [[ "$1" == "status" ]]; then
+    echo "$current_layout${current_variant:+($current_variant)}"
+elif [[ "$1" == "switch" ]]; then
+    echo "Current layout: $current_layout($current_variant)"
+
+    layout_count=${#layout_mapping[@]}
+    echo "Number of layouts: $layout_count"
+
+    next_index=$(( (layout_index + 1) % layout_count ))
+    new_layout="${layout_mapping[next_index]}"
+    new_variant="${variant_mapping[next_index]}"
+    echo "Next layout: $new_layout"
+
+    # Execute layout change and notify
+    if ! change_layout; then
+        notify-send -u low -t 2000 'kb_layout' " Error:" " Layout change failed"
+        echo "Layout change failed." >&2
+        exit 1
+    else
+        notify-send -u low -i "$notif_icon" " kb_layout: $new_layout${new_variant:+($new_variant)}"
+        echo "Layout change notification sent."
+    fi
+else
+    echo "Usage: $0 {status|switch}"
+fi

.config/hypr/scripts/SwitchKeyboardLayout.sh

@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# This is for changing kb_layouts. Set kb_layouts in $settings_file
-
-layout_file="$HOME/.cache/kb_layout"
-settings_file="$HOME/.config/hypr/UserConfigs/UserSettings.conf"
-notif_icon="$HOME/.config/swaync/images/ja.png"
-
-# Refined ignore list with patterns or specific device names
-ignore_patterns=(
-  "--(avrcp)" 
-  "Bluetooth Speaker" 
-  "Other Device 
-  Name"
-  )
-
-
-# Create layout file with default layout if it does not exist
-if [ ! -f "$layout_file" ]; then
-  echo "Creating layout file..."
-  default_layout=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2 | tr -d '[:space:]' | cut -d ',' -f 1 2>/dev/null)
-  default_layout=${default_layout:-"us"} # Default to 'us' layout
-  echo "$default_layout" > "$layout_file"
-  echo "Default layout set to $default_layout"
-fi
-
-current_layout=$(cat "$layout_file")
-echo "Current layout: $current_layout"
-
-# Read available layouts from settings file
-if [ -f "$settings_file" ]; then
-  kb_layout_line=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2)
-  # Remove leading and trailing spaces around each layout
-  kb_layout_line=$(echo "$kb_layout_line" | tr -d '[:space:]')
-  IFS=',' read -r -a layout_mapping <<< "$kb_layout_line"
-else
-  echo "Settings file not found!"
-  exit 1
-fi
-
-layout_count=${#layout_mapping[@]}
-echo "Number of layouts: $layout_count"
-
-# Find current layout index and calculate next layout
-for ((i = 0; i < layout_count; i++)); do
-  if [ "$current_layout" == "${layout_mapping[i]}" ]; then
-    current_index=$i
-    break
-  fi
-done
-
-next_index=$(( (current_index + 1) % layout_count ))
-new_layout="${layout_mapping[next_index]}"
-echo "Next layout: $new_layout"
-
-# Function to get keyboard names
-get_keyboard_names() {
-    hyprctl devices -j | jq -r '.keyboards[].name'
-}
-
-# Function to check if a device matches any ignore pattern
-is_ignored() {
-    local device_name=$1
-    for pattern in "${ignore_patterns[@]}"; do
-        if [[ "$device_name" == *"$pattern"* ]]; then
-            return 0 # Device matches ignore pattern
-        fi
-    done
-    return 1 # Device does not match any ignore pattern
-}
-
-# Function to change keyboard layout
-change_layout() {
-    local error_found=false
-
-    while read -r name; do
-        if is_ignored "$name"; then
-            echo "Skipping ignored device: $name"
-            continue
-        fi
-        
-        echo "Switching layout for $name to $new_layout..."
-	      hyprctl switchxkblayout "$name" "$next_index"
-        if [ $? -ne 0 ]; then
-            echo "Error while switching layout for $name." >&2
-            error_found=true
-        fi
-    done <<< "$(get_keyboard_names)"
-
-    $error_found && return 1
-    return 0
-}
-
-# Execute layout change and notify
-if ! change_layout; then
-    notify-send -u low -t 2000 'kb_layout' " Error:" " Layout change failed"
-    echo "Layout change failed." >&2
-    exit 1
-else
-    notify-send -u low -i "$notif_icon" " kb_layout: $new_layout"
-    echo "Layout change notification sent."
-fi
-
-echo "$new_layout" > "$layout_file"

.config/waybar/ModulesCustom

@@ -90,10 +90,10 @@
 },
 
 "custom/keyboard": {
-	"exec": "cat $HOME/.cache/kb_layout",
+	"exec": "$HOME/.config/hypr/scripts/KeyboardLayout.sh status",
 	"interval": 1,
 	"format": " {}",
-	"on-click": "$HOME/.config/hypr/scripts/SwitchKeyboardLayout.sh",
+	"on-click": "$HOME/.config/hypr/scripts/KeyboardLayout.sh switch",
 },
 
 "custom/light_dark": {

.config/waybar/config

@@ -1 +1 @@
-/home/ja/.config/waybar/configs/[TOP] Simple
+/home/kappa/.config/waybar/configs/[TOP] Default Laptop

.config/waybar/style.css

@@ -1 +1 @@
-/home/ja/.config/waybar/style/[Colored] Translucent.css
+/home/kappa/.config/waybar/style/[Extra] Modern-Combined - Transparent.css