Merge remote-tracking branch 'origin/main'

common/wezterm/wezterm.lua

@@ -7,16 +7,35 @@ if wezterm.config_builder then
   config = wezterm.config_builder()
 end
 
+local hostname = io.popen("/bin/hostname"):read("*a"):gsub("%s", "")
+local font_spec = { family = 'IosevkaLyteTerm', weight = 'Regular', italic = false }
+local font_size = 12.0
+
+if hostname == "laptop" then
+  font_size = 13
+end
+
+local font = wezterm.font_with_fallback{
+  font_spec,
+  { family = 'Symbols Nerd Font Mono', weight = 'Regular', italic = false },
+  'Noto Color Emoji',
+}
+
+if hostname == "laptop" then
+  config.font_rules = {
+    -- no italics
+    {
+      font = font
+    },
+  }
+end
+
 config.default_cursor_style = 'BlinkingBar'
 
 catpuccin.apply_to_config(config)
 
-config.font = wezterm.font_with_fallback{
+config.font = font
-  { family = 'IosevkaLyteTerm', weight = 'Regular', italic = false },
+config.font_size = font_size
-  { family = 'Symbols Nerd Font Mono', weight = 'Regular', italic = false },
-  'Noto Color Emoji',
-}
-config.font_size = 12.0
 
 config.hide_tab_bar_if_only_one_tab = true
 config.use_fancy_tab_bar = false
@@ -26,7 +45,7 @@ config.window_background_opacity = 1.0
 config.color_scheme = "Catppuccin Mocha"
 
 config.window_frame.font = config.font
-config.window_frame.font_size = 12.0
+config.window_frame.font_size = font_size
 
 config.inactive_pane_hsb = {
   saturation = 0.8,

os/linux/arch/provision.d/optional/ui-packages.bash

@@ -13,32 +13,30 @@
 paru -Sy --needed \
 	xf86-input-libinput libinput libinput-gestures `# Trackpad Settings and Customizations` \
 	bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \
-	arc-gtk-theme elementary-icon-theme `# GUI Theme Stuff` \
+	catppuccin-gtk-theme-mocha elementary-icon-theme `# GUI Theme` \
-	thunar thunar-volman gvfs `# File Manager` \
+	thunar thunar-volman gvfs `# GUI File Manager` \
 	ttf-iosevka-lyte ttf-nerd-fonts-symbols-mono ttf-opensans `# Fonts` \
+	noto-fonts noto-fonts-emoji `# Emoji Fonts` \
 	avr-libc avr-gcc dfu-programmer dfu-util `# MCU Programming Utilities` \
-	gimp inkscape krita `# Image/Vector Editing Applications` \
+	gimp inkscape krita `# Image and Vector Editing Applications` \
-	audacity `# Audio Editing Application` \
-	cmake `# Cross-Platform Make` \
 	caddy `# Web Server` \
-	noto-fonts noto-fonts-emoji `# Emoji` \
 	vlc `# Video Viewer` \
 	zathura zathura-pdf-mupdf `# Document Viewer` \
 	gammastep `# Screen Color Temp Adjuster` \
-	firefox `# Default Web Browser` \
+	firefox `# Web Browser` \
 	hunspell-en_US `# Firefox Spell Checking` \
-	passff-host `# Pass integration in Firefox` \
+	passff-host `# `pass` integration in Firefox` \
-	kitty-git `# Terminal Emulator` \
+	kitty `# Terminal Emulator` \
 	wezterm `# Terminal Emulator` \
-	pavucontrol pamixer pactl `# Pulseaudio Controls` \
+	pavucontrol pamixer libpulse `# Pulseaudio Controls` \
 	playerctl `# Media Keys Controls` \
-	feh `# Image Viewer and Wallpaper Manager` \
+	feh `# Image Viewer` \
-	hyprland hyprpaper `# Wayland Compositor` \
+	hyprland hyprpaper `# Window Manager and Wallpaper` \
-	polkit-kde-agent `# Privilege Escalation` \
+	polkit-kde-agent `# Privilege Escalation Prompts` \
 	swaylock swayidle `# Locking and Idling` \
-	waybar mako `# Bar and Notifications` \
+	mako `# Notification Daemon` \
 	slurp grim wl-clipboard `# Screenshots and Clipboard Utilities` \
-	pipewire pipewire-pulse wireplumber `# Audio System` \
+	pipewire pipewire-pulse wireplumber `# Audio` \
-	xdg-desktop-portal xdg-desktop-portal-wlr `# Screensharing` \
+	xdg-desktop-portal xdg-desktop-portal-hyprland-git `# Screensharing` \
-	obs-studio `# Audio and Video Streaming` \
+	obs-studio `# Live Streaming` \
-	eww-wayland `# Wayland Widgets`
+	eww-wayland `# Bar & Widgets`

os/linux/eww/eww.scss

@@ -69,10 +69,12 @@ $rosewater: #f5e0dc;
   padding-right: 10px;
 }
 
+.vol .muted,
 .mic .live {
   color: #f38ba8;
 }
 
+.vol .live,
 .mic .muted {
   color: #74c7ec;
 }

os/linux/eww/eww.yuck

@@ -26,7 +26,10 @@
       box :class {micMuted == "false" ? "live" : "muted"} {micMuted == "false" ? " " : " "}
       ) {micVolume + "%"}
     )
-    {"󰕾 " + volume + "%"}
+    (box :class "vol" (
+      box :class {muted == "false" ? "live" : "muted"} {muted == "false" ? "󰕾 " : "󰖁 "}
+      ) {volume + "%"}
+    )
     {" " + round(EWW_CPU["avg"], 0) + "%"}
     {" " + round(EWW_RAM["used_mem_perc"], 0) + "%"}
     {isDesktop == "true" ? "" : " " + brightness + "%"}
@@ -46,6 +49,9 @@
 (deflisten volume :initial "0"
   "pamixer --get-volume; pactl subscribe | grep sink --line-buffered | while read i; do pamixer --get-volume; done")
 
+(deflisten muted :initial "false"
+  "pamixer --get-mute; pactl subscribe | grep sink --line-buffered | while read i; do pamixer --get-mute; done")
+
 (deflisten micVolume :initial "0"
   "pamixer --default-source --get-volume; pactl subscribe | grep source --line-buffered | while read i; do pamixer --default-source --get-volume; done")
 

os/linux/gtk/2rc

@@ -1,3 +1,3 @@
 gtk-icon-theme-name = "elementary"
-gtk-theme-name = "Arc-Dark"
+gtk-theme-name = "Catppuccin-Mocha-Standard-Sapphire-Dark"
 gtk-font-name = "IosevkaLyteTerm 12"

os/linux/gtk/3settings.ini

@@ -1,5 +1,5 @@
 [Settings]
 gtk-icon-theme-name = elementary
-gtk-theme-name = Arc-Dark
+gtk-theme-name = Catppuccin-Mocha-Standard-Sapphire-Dark
 gtk-font-name = IosevkaLyteTerm 10
 gtk-application-prefer-dark-theme = true

os/linux/hypr/hyprland.conf

@@ -132,7 +132,7 @@ bind = $mainMod, M, exit,
 bind = $mainMod, E, exec, dolphin
 bind = $mainMod, F, togglefloating, 
 bind = $mainMod SHIFT, F, fullscreen, 
-bind = $mainMod, R, exec, wofi --show drun
+bind = $mainMod, R, exec, anyrun
 bind = $mainMod, S, pseudo, # dwindle
 bind = $mainMod, P, togglesplit, # dwindle
 

os/linux/hypr/hyprpaper.conf

@@ -1,4 +1,5 @@
-preload = ~/../img/walls/orange-blue-cube.jpg
+preload = ~/../img/walls/wallpaper.png
-wallpaper = DP-1,~/../img/walls/orange-blue-cube.jpg
+wallpaper = eDP-1,~/../img/walls/wallpaper.png
-wallpaper = DP-2,~/../img/walls/orange-blue-cube.jpg
+wallpaper = DP-1,~/../img/walls/wallpaper.png
-wallpaper = DP-3,~/../img/walls/orange-blue-cube.jpg
+wallpaper = DP-2,~/../img/walls/wallpaper.png
+wallpaper = DP-3,~/../img/walls/wallpaper.png