From 18ac682f98f86443b1da75a08a44f92fce1cecf5 Mon Sep 17 00:00:00 2001 From: Uyanide Date: Sat, 4 Apr 2026 06:25:34 +0200 Subject: [PATCH] update --- config/nwg-look/.config/gtk-3.0/bookmarks | 3 +++ config/nwg-look/.config/gtk-3.0/settings.ini | 24 ++++++++++++------- config/nwg-look/.config/gtk-4.0/settings.ini | 15 ++++++++---- config/shell/.bashrc | 20 ++++++++-------- config/shell/.config/fish/conf.d/10-sshs.fish | 2 +- .../.config/zsh/conf.d/02-completions.zsh | 8 ++++++- config/shell/.config/zsh/conf.d/10-env.zsh | 6 +++++ config/shell/.config/zsh/funcs.d/.gitignore | 2 -- config/shell/.zshrc | 12 ---------- config/yazi/.config/yazi/package.toml | 4 ++-- 10 files changed, 56 insertions(+), 40 deletions(-) delete mode 100644 config/shell/.config/zsh/funcs.d/.gitignore diff --git a/config/nwg-look/.config/gtk-3.0/bookmarks b/config/nwg-look/.config/gtk-3.0/bookmarks index 6c40a30..60cf93f 100644 --- a/config/nwg-look/.config/gtk-3.0/bookmarks +++ b/config/nwg-look/.config/gtk-3.0/bookmarks @@ -1 +1,4 @@ +file:///home/kolkas/Videos Videos +file:///home/kolkas/Repositories Repositories +file:///home/kolkas/Pictures Pictures file:///home/kolkas/Desktop diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index a2e43ec..17f5189 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -1,17 +1,25 @@ [Settings] -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-icon-theme-name=Papirus -gtk-font-name=Sarasa UI SC 10 +gtk-application-prefer-dark-theme=true +gtk-button-images=true +gtk-cursor-blink=true +gtk-cursor-blink-time=1000 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 +gtk-font-name=Sarasa UI SC, 10 +gtk-icon-theme-name=Papirus +gtk-menu-images=true +gtk-modules=colorreload-gtk-module +gtk-primary-button-warps-slider=true +gtk-sound-theme-name=ocean +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-toolbar-style=3 gtk-xft-antialias=1 +gtk-xft-dpi=122880 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=1 diff --git a/config/nwg-look/.config/gtk-4.0/settings.ini b/config/nwg-look/.config/gtk-4.0/settings.ini index af17726..4139029 100644 --- a/config/nwg-look/.config/gtk-4.0/settings.ini +++ b/config/nwg-look/.config/gtk-4.0/settings.ini @@ -1,7 +1,14 @@ [Settings] -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-icon-theme-name=Papirus -gtk-font-name=Sarasa UI SC 10 +gtk-application-prefer-dark-theme=true +gtk-cursor-blink=true +gtk-cursor-blink-time=1000 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-application-prefer-dark-theme=1 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true +gtk-font-name=Sarasa UI SC, 10 +gtk-icon-theme-name=Papirus +gtk-primary-button-warps-slider=true +gtk-sound-theme-name=ocean +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-xft-dpi=122880 diff --git a/config/shell/.bashrc b/config/shell/.bashrc index 90a937f..ed55905 100644 --- a/config/shell/.bashrc +++ b/config/shell/.bashrc @@ -2,6 +2,16 @@ [[ $- == *i* ]] || return +if type fish &>/dev/null; then + alias f="exec fish" + + if [[ ${UY_ENABLE_FISH_AUTO_LOGIN:-0} == 1 ]] && + [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' + exec fish $LOGIN_OPTION + fi +fi + HISTCONTROL=ignoreboth HISTSIZE=16384 HISTFILESIZE=32768 @@ -52,16 +62,6 @@ if [[ ${UY_USING_SSH_AGENT:-0} == 1 ]]; then } fi -if type fish &>/dev/null; then - alias f="exec fish" - - if [[ ${UY_ENABLE_FISH_AUTO_LOGIN:-0} == 1 ]] && - [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' - exec fish $LOGIN_OPTION - fi -fi - if type starship &>/dev/null; then eval $(starship init bash) fi diff --git a/config/shell/.config/fish/conf.d/10-sshs.fish b/config/shell/.config/fish/conf.d/10-sshs.fish index 0cd1220..bda0ead 100644 --- a/config/shell/.config/fish/conf.d/10-sshs.fish +++ b/config/shell/.config/fish/conf.d/10-sshs.fish @@ -1,7 +1,7 @@ # ssh with encrypted private keys # $ssh_keys should be set in advance or left empty to use the default keys -if set -q ENABLE_GPG_AGENT_SSH; and test $ENABLE_GPG_AGENT_SSH != "0";\ +if set -q UY_ENABLE_GPG_AGENT_SSH; and test $UY_ENABLE_GPG_AGENT_SSH != "0";\ and type -q gpg-init; and type -q gpgconf true # do nothing diff --git a/config/shell/.config/zsh/conf.d/02-completions.zsh b/config/shell/.config/zsh/conf.d/02-completions.zsh index 02fadfb..ad26881 100644 --- a/config/shell/.config/zsh/conf.d/02-completions.zsh +++ b/config/shell/.config/zsh/conf.d/02-completions.zsh @@ -1,4 +1,10 @@ -fpath=(~/.zfunc $fpath) +if [ -d "$HOME/.zfunc" ]; then + fpath=($HOME/.zfunc $fpath) +fi + +if [ -d "$HOME/.zsh/completions" ]; then + fpath=($HOME/.zsh/completions $fpath) +fi # Cache compinit: only regenerate dump once daily autoload -Uz compinit diff --git a/config/shell/.config/zsh/conf.d/10-env.zsh b/config/shell/.config/zsh/conf.d/10-env.zsh index c2e97f1..9da3168 100644 --- a/config/shell/.config/zsh/conf.d/10-env.zsh +++ b/config/shell/.config/zsh/conf.d/10-env.zsh @@ -29,3 +29,9 @@ fi # Catppuccin Mocha — autosuggestions color ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#6c7086" + +# Vscode shell integration + +if (( $+commands[code] )) && [[ "$TERM_PROGRAM" == "vscode" ]]; then + source "$(code --locate-shell-integration-path zsh)" +fi diff --git a/config/shell/.config/zsh/funcs.d/.gitignore b/config/shell/.config/zsh/funcs.d/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/config/shell/.config/zsh/funcs.d/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/config/shell/.zshrc b/config/shell/.zshrc index a83511a..6a7c8e8 100644 --- a/config/shell/.zshrc +++ b/config/shell/.zshrc @@ -1,21 +1,9 @@ -# lrx completions -fpath=(/home/kolkas/.zsh/completions $fpath) #!/hint/zsh [[ $- != *i* ]] && return - for _f in "${XDG_CONFIG_HOME:-$HOME/.config}"/zsh/conf.d/*.zsh(N); do source "$_f" done -for _f in "${XDG_CONFIG_HOME:-$HOME/.config}"/zsh/funcs.d/*.zsh(N); do - source "$_f" -done - -for _f in "${XDG_CONFIG_HOME:-$HOME/.config}"/zsh/funcs.d/_*(N); do - source "$_f" -done - - unset _f diff --git a/config/yazi/.config/yazi/package.toml b/config/yazi/.config/yazi/package.toml index aed53f1..71c9545 100644 --- a/config/yazi/.config/yazi/package.toml +++ b/config/yazi/.config/yazi/package.toml @@ -1,11 +1,11 @@ [[plugin.deps]] use = "yazi-rs/plugins:git" -rev = "1962818" +rev = "e84f4fe" hash = "26db011a778f261d730d4f5f8bf24b3f" [[plugin.deps]] use = "yazi-rs/plugins:smart-enter" -rev = "1962818" +rev = "e84f4fe" hash = "187cc58ba7ac3befd49c342129e6f1b6" [[plugin.deps]]