From 658cdcaa7131234d0de6c9060f0cb94da988fed0 Mon Sep 17 00:00:00 2001 From: Roland Thomas Date: Tue, 12 Sep 2023 00:50:17 -0400 Subject: [PATCH] Update fish function descriptions, Add cfd --- .config/fish/config.fish | 4 ++++ .config/fish/functions/cf.fish | 2 +- .config/fish/functions/cfa.fish | 2 +- .config/fish/functions/cfc.fish | 2 +- .config/fish/functions/cfd.fish | 3 +++ .config/fish/functions/cfp.fish | 2 +- .config/fish/functions/cfs.fish | 2 +- .config/qtile/config.py | 24 +++++++++++++++++++----- 8 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 .config/fish/functions/cfd.fish diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 3f0db4a..bd2cd08 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -14,6 +14,8 @@ set --export XSECURELOCK_AUTH_FOREGROUND_COLOR "#D8DEE9" set --export XSECURELOCK_AUTH_SOUNDS 1 set --export XSECURELOCK_DIM_COLOR "#2E3440" set --export XSECURELOCK_NO_COMPOSITE 1 +# bun +set --export BUN_INSTALL "$HOME/.bun" if status is-interactive source "$HOME/.config/fish/abbreviations.fish" @@ -26,6 +28,7 @@ if status --is-login fish_add_path "$HOME/go/bin" fish_add_path "/usr/lib/xsecurelock" fish_add_path "$HOME/.local/share/gem/ruby/3.0.0/bin" + fish_add_path "$BUN_INSTALL/bin" # Check if DISPLAY is set if set -q DISPLAY xset s 300 5 @@ -40,3 +43,4 @@ if status --is-login end starship init fish | source + diff --git a/.config/fish/functions/cf.fish b/.config/fish/functions/cf.fish index 4ab3d25..d121af7 100644 --- a/.config/fish/functions/cf.fish +++ b/.config/fish/functions/cf.fish @@ -1,3 +1,3 @@ -function cf +function cf --description "git command for config-files" git --git-dir=$HOME/config-files --work-tree=$HOME $argv end diff --git a/.config/fish/functions/cfa.fish b/.config/fish/functions/cfa.fish index 32c1d8e..abbf5f2 100644 --- a/.config/fish/functions/cfa.fish +++ b/.config/fish/functions/cfa.fish @@ -1,3 +1,3 @@ -function cfa +function cfa --description "git add for config-files" git --git-dir=$HOME/config-files --work-tree=$HOME add $argv end diff --git a/.config/fish/functions/cfc.fish b/.config/fish/functions/cfc.fish index 3f1827a..13fd2db 100644 --- a/.config/fish/functions/cfc.fish +++ b/.config/fish/functions/cfc.fish @@ -1,3 +1,3 @@ -function cfc +function cfc --description "git commit -m for config-files" git --git-dir=$HOME/config-files --work-tree=$HOME commit -m $argv end diff --git a/.config/fish/functions/cfd.fish b/.config/fish/functions/cfd.fish new file mode 100644 index 0000000..0b53996 --- /dev/null +++ b/.config/fish/functions/cfd.fish @@ -0,0 +1,3 @@ +function cfd --description "git diff for config-files" + git --git-dir=$HOME/config-files --work-tree=$HOME diff $argv +end diff --git a/.config/fish/functions/cfp.fish b/.config/fish/functions/cfp.fish index e1082c4..03a2d61 100644 --- a/.config/fish/functions/cfp.fish +++ b/.config/fish/functions/cfp.fish @@ -1,3 +1,3 @@ -function cfp +function cfp --description "git push for config-files" git --git-dir=$HOME/config-files --work-tree=$HOME push $argv end diff --git a/.config/fish/functions/cfs.fish b/.config/fish/functions/cfs.fish index 608cf2e..a4b9f27 100644 --- a/.config/fish/functions/cfs.fish +++ b/.config/fish/functions/cfs.fish @@ -1,3 +1,3 @@ -function cfs +function cfs --description "git push for config-files" git --git-dir=$HOME/config-files --work-tree=$HOME status end diff --git a/.config/qtile/config.py b/.config/qtile/config.py index d8d266b..fd3c446 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -76,7 +76,7 @@ def parse_task_text(text): text = text.replace(" - qutebrowser", "") text = text.replace(" - Discord", "") text = text.replace(" - Chromium", "") - text = text.replace(" - Obsidian v1.3.5", "") + text = text.replace(" - Obsidian v1.4.5", "") return text @@ -486,12 +486,14 @@ screens = [ scroll_step=15, background=nord["nord10"], foreground=nord["nord0"], + padding=6, ), widget.PulseVolume( font="FontAwesome", fmt="\uf028 {}", background=nord["nord0"], foreground=nord["nord4"], + padding=6, ), ], ), @@ -509,24 +511,34 @@ screens = [ text_open="\uf101", padding=15, widgets=[ + widget.Pomodoro( + background=nord["nord0"], + foreground=nord["nord10"], + color_active=nord["nord10"], + color_inactive=nord["nord4"], + color_break=nord["nord11"], + padding=6, + ), widget.OpenWeather( background=nord["nord15"], foreground=nord["nord0"], cityid=OPENWEATHER_CITI_ID, app_key=OPENWEATHER_APP_KEY, metric=False, + padding=6, ), - widget.Net(background=nord["nord10"], foreground=nord["nord0"], interface="net0"), - widget.Memory(background=nord["nord14"], foreground=nord["nord0"]), - widget.CPU(background=nord["nord13"], foreground=nord["nord0"]), + widget.Net(background=nord["nord10"], foreground=nord["nord0"], interface="net0", padding=6,), + widget.Memory(background=nord["nord14"], foreground=nord["nord0"], padding=6,), + widget.CPU(background=nord["nord13"], foreground=nord["nord0"], padding=6,), widget.ThermalSensor( background=nord["nord13"], foreground=nord["nord0"], tag_sensor="Package id 0", format="{temp:.0f}{unit}", + padding=6, ), widget.DF( - background=nord["nord12"], foreground=nord["nord0"], warn_space=40, visible_on_warn=True + background=nord["nord12"], foreground=nord["nord0"], warn_space=40, visible_on_warn=True, padding=6, ), widget.DF( background=nord["nord12"], @@ -534,12 +546,14 @@ screens = [ partition="/home", warn_space=40, visible_on_warn=True, + padding=6, ), widget.ThermalSensor( background=nord["nord12"], foreground=nord["nord0"], tag_sensor="Composite", format="NVME: {temp:.0f}{unit}", + padding=6, ), widget.Spacer(background=nord["nord0"], length=8), ],