Merge branch 'dev' into 'main'

Minor Bugfixes

See merge request stephan-raabe/dotfiles!5

hypr/hyprland.conf

@@ -46,6 +46,7 @@ env = XCURSOR_SIZE,24
 # ----------------------------------------------------- 
 input {
     kb_layout = de
+    # kb_layout = en
     kb_variant =
     kb_model =
     kb_options =

rofi/config.rasi

@@ -15,6 +15,7 @@ configuration {
   drun-display-format: "{name}";
   font: "Fira Sans SemiBold 11";
   modi: "window,run,drun";
+  /* show-icons: true; */
 }
 
 /* Dark theme. */

scripts/updates.sh

@@ -32,22 +32,31 @@ fi
 
 updates=$(("$updates_arch" + "$updates_aur"))
 
+# ----------------------------------------------------- 
+# Testing
+# ----------------------------------------------------- 
+
+# Overwrite updates with numbers for testing
+# updates=100
+
+# test JSON output
+# printf '{"text": "0", "alt": "0", "tooltip": "0 Updates", "class": "red"}'
+# exit
+
 # ----------------------------------------------------- 
 # Output in JSON format for Waybar Module custom-updates
 # ----------------------------------------------------- 
 
 css_class="green"
 
-# test classes
-# printf '{"text": "0", "alt": "0", "tooltip": "0 Updates", "class": "red"}'
-# exit
-
 if [ "$updates" -gt $threshhold_yellow ]; then
     css_class="yellow"
 fi
+
 if [ "$updates" -gt $threshhold_red ]; then
     css_class="red"
 fi
+
 if [ "$updates" -gt $threshhold_green ]; then
     printf '{"text": "%s", "alt": "%s", "tooltip": "%s Updates", "class": "%s"}' "$updates" "$updates" "$updates" "$css_class"
 else

waybar/config

@@ -10,10 +10,19 @@
 //
 {
     // General Settings
+
+    // Position TOP
     "layer": "top",
-    "height": 16,
     "margin-top": 14,
     "margin-bottom": 0,
+
+    // Position BOTTOM
+    // "position": "bottom",
+    // "margin-top": 0,
+    // "margin-bottom": 14,
+    
+    "layer": "top",
+    "height": 16,
     "margin-left": 0,
     "margin-right": 0,    
     "spacing": 0,

waybar/launch.sh

@@ -16,7 +16,7 @@ killall waybar
 # ----------------------------------------------------- 
 # Loading the configuration based on the username
 # ----------------------------------------------------- 
-if [[ $USER = "raabe" ]]
+if [[ $USER = "raabe2" ]]
 then
     waybar -c ~/dotfiles/waybar/myconfig & -s ~/dotfiles/waybar/style.css  
 else