From 2fc4d242ddce3125eb1b5c7e5f4245744bb2c41b Mon Sep 17 00:00:00 2001 From: Uyanide Date: Sun, 4 Jan 2026 19:11:27 +0100 Subject: [PATCH] fish: standardize config structure --- config/niri/.config/niri/config/misc.kdl | 2 +- config/niri/.config/niri/config/monitors.kdl | 2 +- .../Modules/Bar/Components/RecordIndicator.qml | 2 +- config/shell/.config/fish/conf.d/00.fish | 11 +++++++++++ .../fish/{prev.d/env.fish => conf.d/10-env.fish} | 2 +- .../niri-env.fish => conf.d/10-niri-env.fish} | 2 +- .../{post.d/sshs.fish => conf.d/10-sshs.fish} | 2 +- .../prompt.fish => conf.d/50-prompt.fish} | 2 +- .../{prev.d/theme.fish => conf.d/50-theme.fish} | 0 .../{post.d/alias.fish => conf.d/60-alias.fish} | 0 .../{post.d/fetch.fish => conf.d/60-fetch.fish} | 0 config/shell/.config/fish/config.fish | 16 ---------------- config/shell/.config/fish/post.d/.gitignore | 6 ------ config/shell/.config/fish/prev.d/.gitignore | 6 ------ 14 files changed, 18 insertions(+), 35 deletions(-) create mode 100644 config/shell/.config/fish/conf.d/00.fish rename config/shell/.config/fish/{prev.d/env.fish => conf.d/10-env.fish} (95%) rename config/shell/.config/fish/{prev.d/niri-env.fish => conf.d/10-niri-env.fish} (99%) rename config/shell/.config/fish/{post.d/sshs.fish => conf.d/10-sshs.fish} (98%) rename config/shell/.config/fish/{prev.d/prompt.fish => conf.d/50-prompt.fish} (99%) rename config/shell/.config/fish/{prev.d/theme.fish => conf.d/50-theme.fish} (100%) rename config/shell/.config/fish/{post.d/alias.fish => conf.d/60-alias.fish} (100%) rename config/shell/.config/fish/{post.d/fetch.fish => conf.d/60-fetch.fish} (100%) delete mode 100644 config/shell/.config/fish/post.d/.gitignore delete mode 100644 config/shell/.config/fish/prev.d/.gitignore diff --git a/config/niri/.config/niri/config/misc.kdl b/config/niri/.config/niri/config/misc.kdl index cccfe86..b6a5dca 100644 --- a/config/niri/.config/niri/config/misc.kdl +++ b/config/niri/.config/niri/config/misc.kdl @@ -1,7 +1,7 @@ screenshot-path "~/Pictures/Screenshots/niri_screenshot_%Y-%m-%d_%H-%M-%S.png" debug { - render-drm-device "/dev/dri/card0" + render-drm-device "/dev/dri/card2" } // gestures { diff --git a/config/niri/.config/niri/config/monitors.kdl b/config/niri/.config/niri/config/monitors.kdl index 47a8903..f2f9ddb 100644 --- a/config/niri/.config/niri/config/monitors.kdl +++ b/config/niri/.config/niri/config/monitors.kdl @@ -15,7 +15,7 @@ output "eDP-2" { output "DP-1" { mode "2560x1440@179.845" - scale 1.0 + scale 1 background-color "#1e1e2e" backdrop-color "#1e1e2e" // transform "90" diff --git a/config/quickshell/.config/quickshell/Modules/Bar/Components/RecordIndicator.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/RecordIndicator.qml index ed141b5..639b0c6 100644 --- a/config/quickshell/.config/quickshell/Modules/Bar/Components/RecordIndicator.qml +++ b/config/quickshell/.config/quickshell/Modules/Bar/Components/RecordIndicator.qml @@ -47,7 +47,7 @@ Item { Text { text: Icons.record - font.pointSize: Fonts.icon + 6 + font.pointSize: 18 color: _actualColor } diff --git a/config/shell/.config/fish/conf.d/00.fish b/config/shell/.config/fish/conf.d/00.fish new file mode 100644 index 0000000..a1850c9 --- /dev/null +++ b/config/shell/.config/fish/conf.d/00.fish @@ -0,0 +1,11 @@ +if not set -q fetch_logo_type + set -g fetch_logo_type kitty +end + +if test $(pgrep -u $USER -x kitty | wc -l) -ge 2 + set -g no_fetch +end + +spotify-lyrics completion fish | source + +alias gduu "sudo gdu -i /media/Alpha -i /media/Beta -i /media/Gamma -i /.snapshots -i /home/.snapshots /" diff --git a/config/shell/.config/fish/prev.d/env.fish b/config/shell/.config/fish/conf.d/10-env.fish similarity index 95% rename from config/shell/.config/fish/prev.d/env.fish rename to config/shell/.config/fish/conf.d/10-env.fish index 9366544..01b1d5f 100644 --- a/config/shell/.config/fish/prev.d/env.fish +++ b/config/shell/.config/fish/conf.d/10-env.fish @@ -25,4 +25,4 @@ if type -q helix; and not type -q hx end # gpg -set -x -g GPG_TTY (tty) \ No newline at end of file +set -x -g GPG_TTY (tty) diff --git a/config/shell/.config/fish/prev.d/niri-env.fish b/config/shell/.config/fish/conf.d/10-niri-env.fish similarity index 99% rename from config/shell/.config/fish/prev.d/niri-env.fish rename to config/shell/.config/fish/conf.d/10-niri-env.fish index 2d5080a..6f28fad 100644 --- a/config/shell/.config/fish/prev.d/niri-env.fish +++ b/config/shell/.config/fish/conf.d/10-niri-env.fish @@ -19,4 +19,4 @@ if test -n "$XDG_CURRENT_DESKTOP"; and test "$XDG_CURRENT_DESKTOP" = "niri" end end < "$env_config" end -end \ No newline at end of file +end diff --git a/config/shell/.config/fish/post.d/sshs.fish b/config/shell/.config/fish/conf.d/10-sshs.fish similarity index 98% rename from config/shell/.config/fish/post.d/sshs.fish rename to config/shell/.config/fish/conf.d/10-sshs.fish index 89dced3..e7349f5 100644 --- a/config/shell/.config/fish/post.d/sshs.fish +++ b/config/shell/.config/fish/conf.d/10-sshs.fish @@ -11,4 +11,4 @@ if type -q ssh end ssh $argv end -end \ No newline at end of file +end diff --git a/config/shell/.config/fish/prev.d/prompt.fish b/config/shell/.config/fish/conf.d/50-prompt.fish similarity index 99% rename from config/shell/.config/fish/prev.d/prompt.fish rename to config/shell/.config/fish/conf.d/50-prompt.fish index b0da92f..f9c4ff8 100644 --- a/config/shell/.config/fish/prev.d/prompt.fish +++ b/config/shell/.config/fish/conf.d/50-prompt.fish @@ -9,4 +9,4 @@ end # oh-my-posh if test -f $HOME/.config/posh_theme.omp.json; and type -q oh-my-posh oh-my-posh init fish --config $HOME/.config/posh_theme.omp.json | source -end \ No newline at end of file +end diff --git a/config/shell/.config/fish/prev.d/theme.fish b/config/shell/.config/fish/conf.d/50-theme.fish similarity index 100% rename from config/shell/.config/fish/prev.d/theme.fish rename to config/shell/.config/fish/conf.d/50-theme.fish diff --git a/config/shell/.config/fish/post.d/alias.fish b/config/shell/.config/fish/conf.d/60-alias.fish similarity index 100% rename from config/shell/.config/fish/post.d/alias.fish rename to config/shell/.config/fish/conf.d/60-alias.fish diff --git a/config/shell/.config/fish/post.d/fetch.fish b/config/shell/.config/fish/conf.d/60-fetch.fish similarity index 100% rename from config/shell/.config/fish/post.d/fetch.fish rename to config/shell/.config/fish/conf.d/60-fetch.fish diff --git a/config/shell/.config/fish/config.fish b/config/shell/.config/fish/config.fish index 7093af4..7289962 100755 --- a/config/shell/.config/fish/config.fish +++ b/config/shell/.config/fish/config.fish @@ -4,19 +4,3 @@ end # no greeting set fish_greeting - -if test -d $HOME/.config/fish/prev.d - for file in $HOME/.config/fish/prev.d/*.fish - if test -f $file - source $file - end - end -end - -if test -d $HOME/.config/fish/post.d - for file in $HOME/.config/fish/post.d/*.fish - if test -f $file - source $file - end - end -end diff --git a/config/shell/.config/fish/post.d/.gitignore b/config/shell/.config/fish/post.d/.gitignore deleted file mode 100644 index 0210448..0000000 --- a/config/shell/.config/fish/post.d/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -* -!.gitignore -!fetch.fish -!sshs.fish -!alias.fish -!ghostty.fish \ No newline at end of file diff --git a/config/shell/.config/fish/prev.d/.gitignore b/config/shell/.config/fish/prev.d/.gitignore deleted file mode 100644 index 43c738a..0000000 --- a/config/shell/.config/fish/prev.d/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -* -!.gitignore -!prompt.fish -!theme.fish -!env.fish -!niri-env.fish \ No newline at end of file