diff --git a/.config/Stretchly/config.json b/.config/Stretchly/config.json index fec70cc..683e39e 100644 --- a/.config/Stretchly/config.json +++ b/.config/Stretchly/config.json @@ -42,7 +42,7 @@ "monitorDnd": true, "microbreakStartSoundPlaying": false, "breakStartSoundPlaying": false, - "themeSource": "system", + "themeSource": "dark", "endBreakShortcut": "CmdOrCtrl+X", "breakWindowWidth": 0.85, "breakWindowHeight": 0.85, @@ -447,4 +447,4 @@ "pauseBreaksShortcut": "", "resumeBreaksShortcut": "", "screen": "primary" -} +} \ No newline at end of file diff --git a/.config/git/config b/.config/git/config index 73fe40a..8e1b55c 100644 --- a/.config/git/config +++ b/.config/git/config @@ -79,7 +79,7 @@ [alias] fzf = !fzf --preview='git diff HEAD --color=always -- {}' --tiebreak=end,index --multi - fzs = !cut -z -c2- | git fzf --read0 -d' ' --nth=2.. --bind='alt-enter:execute(nvim {2..})' --preview='test {1} != \\? && git diff --color HEAD -- {2..} | $(git config interactive.diffFilter) || diff --color=always -u /dev/null {2..}' | cut -c3- + fzs = !cut -z -c2- | git fzf --read0 -d' ' --nth=2.. --bind='alt-enter:execute(nvim {2..})' --preview='test {1} != \\? && git diff --color -- HEAD {2..} | $(git config interactive.diffFilter) || find {2..} -type f | xargs -I% diff --recursive --color=always -u /dev/null %' | cut -c3- # GET INFO s = !git stl && git stb diff --git a/.config/yadm/gitconfig b/.config/yadm/gitconfig index efa496b..b182aa8 100644 --- a/.config/yadm/gitconfig +++ b/.config/yadm/gitconfig @@ -1,5 +1,5 @@ [alias] - cgit = !yadm cme "config/git:" -- $XDG_CONFIG_HOME/git $CONFIG_SHELLS/git $HOME/.local/bin/scripts/git-* - cf = !yadm cme "bin:" -- $CONFIG_SHELLS/functions $HOME/.local/bin/scripts - cshell = !yadm cme "config/shell:" -- $CONFIG_SHELLS $HOME/.zprofile - cbin = !yadm cme "bin:" -- $HOME/.local/bin/scripts + cgit = !yadm cme "config/git:" $XDG_CONFIG_HOME/git $CONFIG_SHELLS/git $HOME/.local/bin/scripts/git-* + cf = !yadm cme "bin:" $CONFIG_SHELLS/functions $HOME/.local/bin/scripts + cshell = !yadm cme "config/shell:" $CONFIG_SHELLS $HOME/.zprofile + cbin = !yadm cme "bin:" $HOME/.local/bin/scripts diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 1df2f6e..8b49669 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -173,7 +173,7 @@ test -s $CONFIG_ZSH/.p10k.zsh && source $CONFIG_ZSH/.p10k.zsh test -d /usr/share/fzf && source /usr/share/fzf/key-bindings.zsh && source /usr/share/fzf/completion.zsh -eval "$(zoxide init zsh)" +which zoxide >/dev/null && eval "$(zoxide init zsh)" test -f $XDG_CONFIG_HOME/broot/launcher/bash/br && source $XDG_CONFIG_HOME/broot/launcher/bash/br diff --git a/README.org b/README.org index ae4a895..f138136 100644 --- a/README.org +++ b/README.org @@ -31,7 +31,7 @@ and configuration for ~less~ and ~fzf~. - essentials :: git zsh bat neovim man-db texinfo - basic tools :: fd ripgrep tree jrnl python-pynvim wget zsh-completions mlocate - common tools :: ffmpeg imagemagick pandoc [[https://lftp.yar.ru/][lftp]] zsh-doc glances pacman-contrib -- aur :: diffr bat-extras-git tldr++ rdictcc-git stretchly-xeruf-git +- aur :: diffr bat-extras-git tldr++ rdictcc-git stretchly-xeruf-git sc-im ** Graphical - x :: xorg-xserver xorg-xkill xorg-setxkbmap xorg-xinit xterm xclip xprintidle - music :: mpd mpc ncmpc vlc phonon-qt5-vlc