From a0abeab1c719c59f0c97adc3353e832826701938 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 12:22:27 -0500 Subject: Use swaysome for more awesome scroll workspaces --- waybar/config | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) (limited to 'waybar') diff --git a/waybar/config b/waybar/config index 77e7e6d..b480559 100644 --- a/waybar/config +++ b/waybar/config @@ -18,17 +18,48 @@ "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "1": ["eDP-1"], - "2": ["eDP-1"], - "3": ["eDP-1"], - "4": ["eDP-1"], - "5": ["eDP-1"], - "6": ["eDP-1"], - "7": ["eDP-1"], - "8": ["eDP-1"], - "9": ["eDP-1"], + "11": ["DP-2"], + "12": ["DP-2"], + "13": ["DP-2"], + "14": ["DP-2"], + "15": ["DP-2"], + "16": ["DP-2"], + "17": ["DP-2"], + "18": ["DP-2"], + "19": ["DP-2"], + }, + "format": "{icon}", + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "10": "0", + "11": "1", + "12": "2", + "13": "3", + "14": "4", + "15": "5", + "16": "6", + "17": "7", + "18": "8", + "19": "9", + "20": "0", + "21": "1", + "22": "2", + "23": "3", + "24": "4", + "25": "5", + "26": "6", + "27": "7", + "28": "8", + "29": "9", }, - "format": "{value}", }, "niri/workspaces": { "format": "{value}", -- cgit v1.2.3 From 8a2c32014dc380cf9fc92e60c2ebe5f01f2930e3 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:01:03 -0500 Subject: Fix formatting in waybar cnofig --- waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waybar') diff --git a/waybar/config b/waybar/config index b480559..d9fcbda 100644 --- a/waybar/config +++ b/waybar/config @@ -5,7 +5,7 @@ //"output": "%%DISPLAY%%", "spacing": 4, //"margin-top": 5, - //"margin-bottom":5, + //"margin-bottom": 5, // Choose the order of the modules -- cgit v1.2.3 From 8bc4e11ba7d4ad30f09c376e5ba31d5563471cba Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:01:17 -0500 Subject: eDP-1 is the only display in master --- waybar/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'waybar') diff --git a/waybar/config b/waybar/config index d9fcbda..25fb4dc 100644 --- a/waybar/config +++ b/waybar/config @@ -18,15 +18,15 @@ "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "11": ["DP-2"], - "12": ["DP-2"], - "13": ["DP-2"], - "14": ["DP-2"], - "15": ["DP-2"], - "16": ["DP-2"], - "17": ["DP-2"], - "18": ["DP-2"], - "19": ["DP-2"], + "11": ["eDP-1"], + "12": ["eDP-1"], + "13": ["eDP-1"], + "14": ["eDP-1"], + "15": ["eDP-1"], + "16": ["eDP-1"], + "17": ["eDP-1"], + "18": ["eDP-1"], + "19": ["eDP-1"], }, "format": "{icon}", "format-icons": { -- cgit v1.2.3 From 0ff1806f2c2d690238c373b8f65ba40f569301d7 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 02:40:49 -0500 Subject: Use JetBrainsMono Nerd Font instead of Fira Code --- X11/xresources | 8 ++++---- alacritty/alacritty.yml | 8 ++++---- awesome/rc.lua | 2 +- awesome/themes/zachir/theme.lua | 6 +++--- dunst/dunstrc | 2 +- kitty/kitty.conf | 4 ++-- rofi/dmenu.rasi | 2 +- sxhkd/sxhkdrc | 4 ++-- tofi/cosmic | 2 +- tofi/themes/dmenu | 2 +- tofi/themes/dmenu_vertical | 2 +- waybar/style.css | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) (limited to 'waybar') diff --git a/X11/xresources b/X11/xresources index 13799fc..7d2525a 100644 --- a/X11/xresources +++ b/X11/xresources @@ -1,6 +1,6 @@ !! dmenu -dmenu.font: FiraCode Nerd Font Mono:size=24 +dmenu.font: JetBrainsMono Nerd Font:size=24 !! dwm @@ -30,7 +30,7 @@ st.termname: st-256color st.shell: /usr/bin/tmux ! The following options options can be reloaded via USR1 signal. -!st.font: FiraCode Nerd Font Mono:pixelsize=12:antialias=true:autohint=true; +!st.font: JetBrainsMono Nerd Font:pixelsize=12:antialias=true:autohint=true; !st.font2: Symbola:pixelsize=12:antialias=true:autohint=true; st.borderpx: 3 ! st alpha @@ -76,7 +76,7 @@ URxvt.secondaryScreen: 1 URxvt.secondaryScroll: 0 URxvt.secondaryWheel: 1 ! URxvt font -URxvt.font: xft:FiraCode:regular:size=8,xft:symbola:regular:size=9 +URxvt.font: xft:JetBrainsMono:regular:size=8,xft:symbola:regular:size=9 ! fix font spacing URxvt.letterSpace: -1 ! Disable printing @@ -119,7 +119,7 @@ rofi.width: 1366 ! "Number of columns" Set from: Default ! rofi.columns: 1 ! "Font to use" Set from: Default -rofi.font: FiraCode 9 +rofi.font: JetBrainsMono 9 ! "Border width" Set from: Default ! rofi.bw: 1 ! "Location on screen" Set from: Default diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 1bd8532..0b30805 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -115,7 +115,7 @@ font: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas - family: FiraCode Nerd Font Mono + family: JetBrainsMono Nerd Font # The `style` can be specified to pick a specific face. style: Regular @@ -126,7 +126,7 @@ font: # # If the bold family is not specified, it will fall back to the # value specified for the normal font. - family: FiraCode Nerd Font Mono + family: JetBrainsMono Nerd Font # The `style` can be specified to pick a specific face. style: Bold @@ -137,7 +137,7 @@ font: # # If the italic family is not specified, it will fall back to the # value specified for the normal font. - family: FiraCode Nerd Font Mono + family: JetBrainsMono Nerd Font # The `style` can be specified to pick a specific face. style: Italic @@ -148,7 +148,7 @@ font: # # If the bold italic family is not specified, it will fall back to the # value specified for the normal font. - family: FiraCode Nerd Font Mono + family: JetBrainsMono Nerd Font # The `style` can be specified to pick a specific face. style: Bold Italic diff --git a/awesome/rc.lua b/awesome/rc.lua index fda4f16..7fa49ef 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -58,7 +58,7 @@ awesome_config_folder = config_dir .. "awesome" theme.dir = string.format("%s/awesome/themes/%s", config_dir, theme.name) beautiful.init(theme.dir .. "/theme.lua") beautiful.useless_gap = 5 -font = beautiful.font or "FiraCode Nerd Font Mono 18" +font = beautiful.font or "JetBrainsMono Nerd Font 18" -- Library I'm using for swallowing, but it does much more diff --git a/awesome/themes/zachir/theme.lua b/awesome/themes/zachir/theme.lua index b54c3c6..30a575a 100644 --- a/awesome/themes/zachir/theme.lua +++ b/awesome/themes/zachir/theme.lua @@ -12,8 +12,8 @@ local themes_path = gfs.get_themes_dir() local theme = {} -theme.font = "FiraCode Nerd Font Mono 18" -theme.font2 = "FiraCode Nerd Font Mono 12" +theme.font = "JetBrainsMono Nerd Font 18" +theme.font2 = "JetBrainsMono Nerd Font 12" theme.bg_normal = xrdb.background theme.bg_focus = xrdb.color2 @@ -162,7 +162,7 @@ theme.tabbar_disable = false -- disable the tab bar entirely theme.tabbar_ontop = false theme.tabbar_radius = 0 -- border radius of the tabbar theme.tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern") -theme.tabbar_font = "FiraCode Nerd Font Mono 24" -- font of the tabbar +theme.tabbar_font = "JetBrainsMono Nerd Font 24" -- font of the tabbar theme.tabbar_size = 40 -- size of the tabbar theme.tabbar_position = "top" -- position of the tabbar theme.tabbar_bg_normal = "#000000" -- background color of the focused client on the tabbar diff --git a/dunst/dunstrc b/dunst/dunstrc index 4bdcfba..6377f26 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -86,7 +86,7 @@ ### Text ### - font = FiraCode Nerd Font Mono 18 + font = JetBrainsMono Nerd Font 18 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 095607b..7afcb30 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -6,7 +6,7 @@ #: individual font faces and even specify special fonts for particular #: characters. -font_family FiraCode Nerd Font Mono +font_family JetBrainsMono Nerd Font bold_font auto italic_font auto bold_italic_font auto @@ -24,7 +24,7 @@ bold_italic_font auto #: italic_font Operator Mono Book Italic #: bold_italic_font Operator Mono Medium Italic -font_size 11.0 +font_size 15.0 #: Font size (in pts) diff --git a/rofi/dmenu.rasi b/rofi/dmenu.rasi index 6fd198a..2ac7745 100644 --- a/rofi/dmenu.rasi +++ b/rofi/dmenu.rasi @@ -8,7 +8,7 @@ background-color: Black; border-color: White; text-color: White; - font: "FiraCode Nerd Font Mono 12"; + font: "JetBrainsMono Nerd Font 12"; } window { anchor: north; diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index a38f356..96ca393 100755 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -12,11 +12,11 @@ super + Escape # program launcher super + d - dmenu_run -i -l 15 -h 36 -fn 'FiraCode Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000' + dmenu_run -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000' # desktop application launcher super + r - j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'FiraCode Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'" + j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'" # dmenu prompt for recording super + control + r diff --git a/tofi/cosmic b/tofi/cosmic index 8be1a31..b339f73 100644 --- a/tofi/cosmic +++ b/tofi/cosmic @@ -7,7 +7,7 @@ height = 32 horizontal = true font-size = 18 prompt-text = "" -font = FiraCode Nerd Font Mono +font = JetBrainsMono Nerd Font outline-width = 0 border-width = 0 min-input-width = 424 diff --git a/tofi/themes/dmenu b/tofi/themes/dmenu index 82cff1d..8af8c80 100644 --- a/tofi/themes/dmenu +++ b/tofi/themes/dmenu @@ -7,7 +7,7 @@ height = 36 horizontal = true font-size = 18 prompt-text = "" -font = FiraCode Nerd Font Mono +font = JetBrainsMono Nerd Font outline-width = 0 border-width = 0 min-input-width = 424 diff --git a/tofi/themes/dmenu_vertical b/tofi/themes/dmenu_vertical index 6357b5a..2e95559 100644 --- a/tofi/themes/dmenu_vertical +++ b/tofi/themes/dmenu_vertical @@ -8,7 +8,7 @@ horizontal = false font-size = 18 prompt-text = "" prompt-padding = 18 -font = FiraCode Nerd Font Mono +font = JetBrainsMono Nerd Font outline-width = 0 border-width = 0 min-input-width = 424 diff --git a/waybar/style.css b/waybar/style.css index 9398381..0a4431c 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -3,7 +3,7 @@ margin: 0px; border-radius: 0px; /* `otf-font-awesome` is required to be installed for icons */ - font-family: FiraCode Nerd Font Mono; + font-family: JetBrainsMono Nerd Font; font-size: 18px; min-height: 0px; min-width: 0px; -- cgit v1.2.3 From ec330589a41b423950fe49449248edb546961383 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 02:44:19 -0500 Subject: Add json syntax highlighting to waybar config --- waybar/config | 1 + 1 file changed, 1 insertion(+) (limited to 'waybar') diff --git a/waybar/config b/waybar/config index 25fb4dc..5807b92 100644 --- a/waybar/config +++ b/waybar/config @@ -1,3 +1,4 @@ +// vim: set filetype=json5 : { "layer": "bottom", "position": "top", -- cgit v1.2.3 From 66a55d31d6cfa115c99a7fe3c93fbbed7901fe8e Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 04:23:51 -0500 Subject: Add custom/battery for while battery is broken --- waybar/config | 9 +++++++-- waybar/style.css | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'waybar') diff --git a/waybar/config b/waybar/config index 5807b92..9246fa2 100644 --- a/waybar/config +++ b/waybar/config @@ -160,8 +160,8 @@ "format": "{}% " }, "battery": { - "bat": "BAT0", - "interval": 60, + //"bat": "BAT0", + //"interval": 60, "state": { "warning": 30, "critical": 15 @@ -214,6 +214,11 @@ "on-click": "rofi -show drun", //"on-click-right": "killall rofi" }, + "custom/battery":{ + "interval": 60, + "format": "{}%", + "exec": "cat /sys/class/power_supply/BAT0/capacity", + }, "custom/power":{ "format": "", "on-click": "rofi -show p -modi p:rofi-power-menu", diff --git a/waybar/style.css b/waybar/style.css index 0a4431c..865e806 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -89,6 +89,7 @@ window#waybar.hidden { #custom-media, #custom-launcher, #custom-power, +#custom-battery, #custom-layout, #custom-updater, #custom-snip, @@ -215,7 +216,11 @@ label:focus { background-color: #1b1d1c; font-size: 18px; margin-right: 5px; +} +#custom-battery{ + background-color: #1b1d1c; + font-size: 18px; } #custom-launcher{ -- cgit v1.2.3 From d1412fdffa7388d04c01a26ab89cef8151efde6e Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 05:06:22 -0500 Subject: Restore battery waybar settings in case it starts working again --- waybar/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'waybar') diff --git a/waybar/config b/waybar/config index 9246fa2..7775078 100644 --- a/waybar/config +++ b/waybar/config @@ -160,8 +160,8 @@ "format": "{}% " }, "battery": { - //"bat": "BAT0", - //"interval": 60, + "bat": "BAT0", + "interval": 60, "state": { "warning": 30, "critical": 15 -- cgit v1.2.3 From 218e54aa900ba4e469a405f3e81bf00e024b228d Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 05:06:51 -0500 Subject: Expand custom/battery module --- waybar/config | 8 +++++--- waybar/style.css | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'waybar') diff --git a/waybar/config b/waybar/config index 7775078..933dedc 100644 --- a/waybar/config +++ b/waybar/config @@ -215,9 +215,11 @@ //"on-click-right": "killall rofi" }, "custom/battery":{ - "interval": 60, - "format": "{}%", - "exec": "cat /sys/class/power_supply/BAT0/capacity", + "interval": 15, + "format": "{percentage}%", + "return-type": "json", + "exec": "custom-battery", + "tooltip": true, }, "custom/power":{ "format": "", diff --git a/waybar/style.css b/waybar/style.css index 865e806..ff6dc9a 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -223,6 +223,21 @@ label:focus { font-size: 18px; } +#custom-battery.battery_low{ + background-color: yellow; + color: #1b1d1c; +} + +#custom-battery.battery_crit{ + background-color: red; + color: #1b1d1c; +} + +#custom-battery.battery_charging{ + background-color: #1d1b1c; + color: #198844; +} + #custom-launcher{ background-color: #1b1d1c; font-size: 20px; -- cgit v1.2.3