From 89b0f4df4f317a5494c95b3c8b4692f8dd109e3a Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 6 Dec 2022 14:00:19 -0600 Subject: [PATCH] Font icons --- common/helix/themes/donokai.toml | 4 +-- common/kitty/current-theme.conf | 4 +-- common/kitty/kitty.conf | 8 +++--- os/linux/mako/config | 2 +- os/linux/nix/modules/lightdm.nix | 2 +- os/linux/sway/config | 6 ++--- os/linux/waybar/config | 44 ++++++++++++++++++++------------ os/linux/waybar/style.css | 22 +++++++--------- 8 files changed, 50 insertions(+), 42 deletions(-) diff --git a/common/helix/themes/donokai.toml b/common/helix/themes/donokai.toml index d29e058..199766c 100644 --- a/common/helix/themes/donokai.toml +++ b/common/helix/themes/donokai.toml @@ -64,8 +64,8 @@ "ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } "ui.cursor.match" = { fg = "gray", bg = "white", modifiers = ["reversed"] } -"ui.selection" = { bg = "cyan", fg = "bg" } -"ui.selection.primary" = { bg = "cyan", fg = "bg" } +"ui.selection" = { bg = "black", fg = "white" } +"ui.selection.primary" = { bg = "black", fg = "white" } "ui.linenr" = { fg = "gray" } "ui.linenr.selected" = { fg = "white" } diff --git a/common/kitty/current-theme.conf b/common/kitty/current-theme.conf index b804606..47b6434 100644 --- a/common/kitty/current-theme.conf +++ b/common/kitty/current-theme.conf @@ -11,10 +11,10 @@ selection_background #4d4d4d cursor #9d9eca # a nearly imperceptible purple -foreground #b2b8c4 +#foreground #b2b8c4 # alternate, deeper shades of purple #foreground #8a8dae -#foreground #9b9ebf +foreground #9b9ebf url_color #75c8c8 selection_foreground #101010 diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index dcb20f6..f82e87f 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -1,7 +1,7 @@ -font_family IosevkaLyteTerm Nerd Font -bold_font IosevkaLyteTerm Heavy Nerd Font -italic_font IosevkaLyteTerm Italic Nerd Font -bold_italic_font IosevkaLyteTerm Heavy Italic Nerd Font +font_family IosevkaLyteTerm Nerd Font Complete +bold_font IosevkaLyteTerm Heavy Nerd Font Complete +italic_font IosevkaLyteTerm Italic Nerd Font Complete +bold_italic_font IosevkaLyteTerm Heavy Italic Nerd Font Complete font_size 12.5 # use `kitty + list-fonts --psnames` to get the font's PostScript name diff --git a/os/linux/mako/config b/os/linux/mako/config index b1e8ad5..987fd1f 100644 --- a/os/linux/mako/config +++ b/os/linux/mako/config @@ -2,7 +2,7 @@ max-visible=5 default-timeout=30000 background-color=#111111 border-color=#666666 -font=IosevkaLyteTerm Nerd Font 11 +font=IosevkaLyteTerm Nerd Font Complete 11 progress-color=source #33333388 # format="%s default-timeout=15000 diff --git a/os/linux/nix/modules/lightdm.nix b/os/linux/nix/modules/lightdm.nix index 5450d12..1606bf0 100644 --- a/os/linux/nix/modules/lightdm.nix +++ b/os/linux/nix/modules/lightdm.nix @@ -15,7 +15,7 @@ }; clock-format = "%H:%M:%S"; extraConfig = '' - font-name=IosevkaLyteTerm + font-name=IosevkaLyteTerm Nerd Font Complete ''; }; # background = ""; diff --git a/os/linux/sway/config b/os/linux/sway/config index 0aa81d6..c3479b5 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -167,9 +167,9 @@ for_window [title=".*"] floating enable for_window [app_id=$tilers] floating disable bindsym $mod+shift+alt+f for_window [class=$tilers] floating toggle -client.focused #66d9ef #66d9ef #66d9ef #66d9ef #66d9ef -client.focused_inactive #111111 #111111 #ffffff #111111 #111111 -client.unfocused #111111 #111111 #ffffff #111111 #111111 +client.focused #6c88a6 #6c88a6 #6c88a6 #6c88a6 #6c88a6 +client.focused_inactive #100814 #100814 #9b9ebf #100814 #100814 +client.unfocused #100814 #100814 #9b9ebf #100814 #100814 bar { swaybar_command waybar diff --git a/os/linux/waybar/config b/os/linux/waybar/config index a8f1cab..bff7cc7 100644 --- a/os/linux/waybar/config +++ b/os/linux/waybar/config @@ -3,10 +3,12 @@ "position": "bottom", "output": ["eDP-1", "DP-3"], "height": 32, - "modules-left": ["clock"], + "modules-left": ["clock", "sway/title"], "modules-center": ["sway/workspaces"], "modules-right": [ "idle_inhibitor", + "bluetooth", + "wireplumber", "pulseaudio", // "network", "cpu", @@ -16,6 +18,16 @@ "battery", "tray" ], + "bluetooth": { + "format": "", + "format-connected": "", + "format-connected-battery": "", + // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device + "tooltip-format": "{controller_alias}@{controller_address} ({num_connections} connected)", + "tooltip-format-connected": "{controller_alias}@{controller_address} ({num_connections} connected)\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}@{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}@{device_address} ( {device_battery_percentage}%)" + }, "sway/workspaces": { "disable-scroll": false, "persistent_workspaces": { @@ -36,8 +48,8 @@ "idle_inhibitor": { "format": "{icon}", "format-icons": { - "activated": "", - "deactivated": "" + "activated": "﯎", + "deactivated": "﯏" } }, "tray": { @@ -49,12 +61,12 @@ "format": "{:%a %b %d %H:%M:%S}" }, "cpu": { - "format": "{usage} ", + "format": "{usage} ", "tooltip": true, "interval": 3 }, "memory": { - "format": "{} " + "format": "{} " }, "temperature": { // "thermal-zone": 2, @@ -76,12 +88,12 @@ "critical": 15 }, "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ﮣ", "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] + "format-good": "", // An empty format will hide the module + "format-full": "", + "format-icons": ["", "", "", "", ""] }, "network": { "format-wifi": "{essid} ({signalStrength}%) ", @@ -92,18 +104,18 @@ }, "pulseaudio": { // "scroll-step": 1, // %, can be a float - "format": "{volume} {icon} {format_source}", + "format": "{volume} {icon} {format_source}", //"format": "{volume}% {icon} {format_source}", //"format-bluetooth": "{volume}% {icon} {format_source}", //"format-bluetooth-muted": " {icon} {format_source}", //"format-muted": " {format_source}", - "format-muted": " {format_source}", - "format-source": "", - "format-source-muted": "", + "format-muted": "ﱝ {format_source}", + "format-source": "", + "format-source-muted": "", "format-icons": { "headphones": "", - "handsfree": "", - "headset": "", + "handsfree": "", + "headset": "", "phone": "", "portable": "", "car": "", diff --git a/os/linux/waybar/style.css b/os/linux/waybar/style.css index 292bef4..4530d43 100644 --- a/os/linux/waybar/style.css +++ b/os/linux/waybar/style.css @@ -1,14 +1,14 @@ * { border: none; border-radius: 0; - font-family: "IosevkaLyteTerm Nerd Font", sans-serif; + font-family: "IosevkaLyteTerm", sans-serif; font-size: 16px; min-height: 0; } window#waybar { - background-color: #111111; - color: #ffffff; + background-color: #100814; + color: #9b9ebf; transition: none; } @@ -23,7 +23,6 @@ window#waybar.empty { #workspaces button { padding: 0 0.75em; background-color: transparent; - color: #ffffff; } #workspaces button:hover { @@ -34,12 +33,11 @@ window#waybar.empty { } #workspaces button.visible { - background-color: #333333; + background-color: #666666; } #workspaces button.focused { - background-color: #66d9ef; - color: #111111; + background-color: #6c88a6; } #workspaces button.persistent { @@ -47,11 +45,11 @@ window#waybar.empty { } #workspaces button.urgent { - background-color: #eb4d4b; + background-color: #bf7998; } #mode { - background-color: #64727D; + background-color: transparent; } #clock, @@ -68,7 +66,6 @@ window#waybar.empty { #idle_inhibitor, #mpd { padding: 0 0.75em; - color: #ffffff; } #clock { @@ -93,8 +90,7 @@ window#waybar.empty { } #battery.critical:not(.charging) { - background-color: #f53c3c; - color: #ffffff; + background-color: #bf7998; animation-name: blink; animation-duration: 0.5s; animation-timing-function: linear; @@ -103,7 +99,7 @@ window#waybar.empty { } label:focus { - background-color: #000000; + /* background-color: #000000; */ } #cpu {