waybar: actually update config

oops

programs

@@ -7,6 +7,7 @@ ttf-roboto
 inter-font
 noto-fonts
 noto-fonts-emoji
+ttf-font-awesome
 gsfonts
 git
 xwallpaper
@@ -80,6 +81,10 @@ tinyxxd
 fcitx5
 fcitx5-chinese-addons
 fcitx5-configtool
+# calendaring/todo management
+khal
+todoman
+vdirsyncer
 
 # in the aur
 tmsu

src/dot_config/fuzzel/fuzzel.ini

@@ -1,4 +1,4 @@
-font="Roboto"
+font="Inter Display"
 icons-enabled=no
 prompt=""
 

src/dot_config/private_khal/config

@@ -0,0 +1,15 @@
+[calendars]
+
+[[calendar_local]]
+path = ~/.local/share/vdirsyncer/cal/*
+type = discover
+
+[locale]
+timeformat = %H:%M
+dateformat = %Y-%m-%d
+longdateformat = %Y-%m-%d
+datetimeformat = %Y-%m-%d %H:%M
+longdatetimeformat = %Y-%m-%d %H:%M
+
+[default]
+default_calendar = Personal

src/dot_config/private_waybar/private_config

@@ -3,17 +3,20 @@
 	"reload_style_on_change": true,
 	"modules-left": ["niri/workspaces"],
 	"modules-center": ["niri/window"],
-	"modules-right": ["mpris", "network", "battery", "clock"],
+	"modules-right": ["mpris", "pulseaudio", "network", "battery", "clock"],
 	"niri/window": {
 		 "max-length": 50
 	},
 	"niri/workspaces": {
 		"format": "{icon}",
 		"format-icons": {
+			"active": "",
+			"default": ""
 		}
 	},
 	"battery": {
-		 "format": "{capacity}% {icon}",
+		 "format": "{icon}",
+		 "tooltip-format": "{capacity}%",
 		 "format-icons": ["", "", "", "", ""],
 		 "states": {
 		 	"warning": 40,
@@ -21,12 +24,13 @@
 		 }
 	},
 	"clock": {
-		"format": "{:%H:%M}",
+		"format": "{:%a %d %b  %H:%M}",
 		"tooltip-format": "{:%a %b %d, %Y (%Z / UTC%z)}",
 		"tooltip": true,
 	},
 	"network": {
-		"format-wifi": "{signalStrength}% ",
+		"format-wifi": "",
+		"tooltip-format": "{essid} {signalStrength}%",
 		"format-disconnected": "⚠",
 		"max-length": 20
 	},
@@ -43,7 +47,16 @@
 		"album-len": 0,
 		"dynamic-len": 65,
 		"dynamic-order": ["artist", "title"],
-		"format": "{dynamic} ♫",
+		"tooltip-format": "{dynamic}",
-		"format-paused": "{dynamic}",
+		"format": "",
-	}
+		"format-paused": "",
+	},
+	"pulseaudio": {
+		"format": "{icon}",
+		"tooltip-format": "{volume}%",
+		"format-muted": "",
+		"format-icons": {
+			"default": ["", ""]
+		},
+	},
 }

src/dot_config/private_waybar/style.css

@@ -1,11 +1,12 @@
 @import url("file:///etc/xdg/waybar/style.css");
 
+* {
+	font-family: FontAwesome, Inter Display
+}
+
 .modules-left {
 	padding-left: 0.5em;
 }
-.modules-right {
-	padding-right: 0.5em;
-}
 
 #network,
 #battery,
@@ -25,3 +26,29 @@
 window#waybar.chromium {
 	background-color: rgba(43, 48, 59, 0.5);
 }
+
+#pulseaudio, #pulseaudio.muted, #pulseaudio:hover {
+    background-color: inherit;
+    color: inherit;
+}
+
+#workspaces * {
+	font-size: 0.8em;
+}
+
+#workspaces button:hover {
+	box-shadow: inherit;
+}
+
+#workspaces button.focused {
+	background-color: inherit;
+	box-shadow: inherit;
+}
+
+window#waybar {
+	border-bottom: none;
+}
+
+#window, #workspaces {
+	margin: 0;
+}

src/dot_config/todoman/config.py

@@ -0,0 +1,5 @@
+path = "~/.local/share/vdirsyncer/cal/*"
+date_format = "%Y-%m-%d"
+time_format = "%H:%M"
+default_list = "Personal"
+default_due = 48

src/dot_config/vdirsyncer/create_private_config

@@ -0,0 +1,21 @@
+[general]
+status_path = "~/.local/share/vdirsyncer/status"
+
+[pair calendar]
+a = "calendar_local"
+b = "calendar_remote"
+conflict_resolution = "b wins"
+collections = ["from a", "from b"]
+metadata = ["color", "displayname"]
+
+[storage calendar_local]
+type = "filesystem"
+path = "~/.local/share/vdirsyncer/cal/"
+fileext=".ics"
+
+[storage calendar_remote]
+type = "caldav"
+
+url = ""
+username = "user"
+password = ""