Merge branch 'main' of gitlab.com:blankinator/dotfiles

.config/polybar/user_modules.ini

@@ -12,7 +12,7 @@
 [module/public_ip]
 type = custom/text
 content= 
-click-left =  curl -s ifconfig.co | while read OUTPUT; do notify-send "$OUTPUT"; done & curl -s ifconfig.co | xargs -I % sh -c "curl -s ipinfo.io/%/city" | while read OUTPUT; do notify-send "$OUTPUT"; done
+click-left = ip="$(curl -fsS --connect-timeout 3 --max-time 5 https://ifconfig.co/ip)" || exit; case "$ip" in ''|*[!0-9A-Fa-f.:]*) exit 1 ;; esac; notify-send "$ip"; city="$(curl -fsS --connect-timeout 3 --max-time 5 "https://ipinfo.io/${ip}/city")" || exit; notify-send "$city"
 
 [module/mic_status]
 type = custom/script

.config/waybar/config.jsonc

@@ -33,10 +33,10 @@
     "interval": 1,
     "tooltip-format": "\n<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
     "calendar-weeks-pos": "right",
-    "today-format": "<span color='#7645AD'><b><u>{}</u></b></span>",
-    "format-calendar": "<span color='#aeaeae'><b>{}</b></span>",
-    "format-calendar-weeks": "<span color='#aeaeae'><b>W{:%V}</b></span>",
-    "format-calendar-weekdays": "<span color='#aeaeae'><b>{}</b></span>"
+    "today-format": "<span color='#ff8800'><b><u>{}</u></b></span>",
+    "format-calendar": "<span color='#f4c7a1'><b>{}</b></span>",
+    "format-calendar-weeks": "<span color='#f4c7a1'><b>W{:%V}</b></span>",
+    "format-calendar-weekdays": "<span color='#f4c7a1'><b>{}</b></span>"
   },
 
   "disk": {

.config/waybar/scripts/amixer-toggle.sh

@@ -1,11 +1,4 @@
-#!/bin/bash
-
-# Check the current state of the speaker
-state=$(amixer -D pulse sget Master | awk '/\[on\]/{print "unmute"; exit} /\[off\]/{print "mute"; exit}')
-
-# Toggle the state of the speaker
-#
-if [ "$state" = "[on] "]; then 
-  amixer 
-# amixer -D pulse sset Master "$state" > /dev/null
+#!/usr/bin/env bash
 
+# Toggle the default PulseAudio sink's mute state.
+amixer -D pulse sset Master toggle >/dev/null

.config/waybar/scripts/myUpdates.sh

@@ -1,24 +1,24 @@
 #!/bin/bash
 format() {
-    if [ "$1" -eq 0 ]; then
-        echo '-'
-    else
-        echo "$1"
-    fi
+	if [ "$1" -eq 0 ]; then
+		echo '-'
+	else
+		echo "$1"
+	fi
 }
 
 if ! updates_arch="$(checkupdates | wc -l)"; then
-    updates_arch=0
+	updates_arch=0
 fi
 
 if ! updates_aur="$(yay -Qum 2>/dev/null | wc -l)"; then
-    updates_aur=0
+	updates_aur=0
 fi
 
 updates="$((updates_arch + updates_aur))"
 
 if [ "$updates" -gt 0 ]; then
-    echo " ($(format $updates_arch)/$(format $updates_aur))"
+	echo " ($(format $updates_arch)/$(format $updates_aur))"
 else
-    echo
-fia
+	echo
+fi

.config/waybar/style.css

@@ -1,22 +1,14 @@
+/* Noctalia Ember OLED: near-black surfaces, warm amber focus. */
 * {
-    font-family: "JetBrainsMono Nerd Font,JetBrainsMono NF" ;
-	color: white;
-}
-
-window#waybar {
-  background: black;
-}
-
-.modules-right {
-  background: #000000;
-}
-
-.modules-center {
-  background: #000000;
+	font-family: "JetBrainsMono Nerd Font,JetBrainsMono NF";
+	color: #fff1e6;
 }
 
+window#waybar,
+.modules-right,
+.modules-center,
 .modules-left {
-  background: #000000;
+	background: #050403;
 }
 
 #battery,
@@ -38,50 +30,59 @@ window#waybar {
 #window,
 #workspaces,
 #clock {
-    min-width: 1ex;
+	min-width: 1ex;
 	padding-right: 5px;
 }
+
 #tray menu * {
-      color: black;
+	color: #050403;
 }
-    
+
+#cpu {
+	/* "100% " fits in this box; fixed width prevents sibling modules shifting. */
+	min-width: 7ch;
+	max-width: 7ch;
+	text-align: right;
+}
+
 #temperature.critical,
 #pulseaudio {
-    min-width: 5ex;
-}
-#pulseaudio.muted {
-  color: #FF0000;
-}
-#pulseaudio.mic.muted {
-  color: #ffffff;
+	min-width: 5ex;
 }
+
+#pulseaudio.muted,
 #pulseaudio.mic:not(.source-muted) {
-  color: #fc0202;
+	color: #ff6b4a;
 }
-#clock{
-  color: #f9780e;
+
+#pulseaudio.mic.muted {
+	color: #6e4a31;
+}
+
+#clock {
+	color: #ff8800;
 }
 
 #battery.charging {
-    color: #ffffff;
-    background-color: #26A65B;
+	color: #1a0d00;
+	background-color: #c98a45;
 }
 
 #battery.warning:not(.charging) {
-    background-color: #ffbe61;
-    color: black;
+	background-color: #ffb05c;
+	color: #2b1600;
 }
 
 #battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: #ffffff;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	background-color: #ff6b4a;
+	color: #2b0700;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #network.speed {
-    min-width: 30ex;
+	min-width: 30ex;
 }