From 86811e06ab6d2225777b0f4a301b8849d64efcae Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Thu, 30 Dec 2021 13:13:00 -0500 Subject: [PATCH 01/24] Encrypted files --- .config/yadm/encrypt | 2 ++ .local/share/yadm/archive | Bin 0 -> 10272 bytes 2 files changed, 2 insertions(+) create mode 100644 .config/yadm/encrypt create mode 100644 .local/share/yadm/archive diff --git a/.config/yadm/encrypt b/.config/yadm/encrypt new file mode 100644 index 0000000..b928e3b --- /dev/null +++ b/.config/yadm/encrypt @@ -0,0 +1,2 @@ +.ssh/*.key +.config/hexchat/servlist.conf diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive new file mode 100644 index 0000000000000000000000000000000000000000..5edfcab005922dfc09fea43090d284f0b6c1a53a GIT binary patch literal 10272 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 literal 0 HcmV?d00001 From 275218685a82183a38ba35b60a684aec3441b84b Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Thu, 24 Feb 2022 15:55:05 -0500 Subject: [PATCH 02/24] Added fix-yubikey alias --- .local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora | 1 + 1 file changed, 1 insertion(+) create mode 100644 .local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora diff --git a/.local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora b/.local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora new file mode 100644 index 0000000..40da392 --- /dev/null +++ b/.local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora @@ -0,0 +1 @@ +alias fix-yubikey='sudo systemctl restart pcsdc.service' From 0b945bc00394c26baca31b29d98d6dcd750ebb0b Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Thu, 24 Feb 2022 15:57:07 -0500 Subject: [PATCH 03/24] Added fix-yubikey alias-typo1 --- .local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora b/.local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora index 40da392..93e8ea7 100644 --- a/.local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora +++ b/.local/dotfiles/aliases/fix-yubikey.zsh##d.Fedora @@ -1 +1 @@ -alias fix-yubikey='sudo systemctl restart pcsdc.service' +alias fix-yubikey='sudo systemctl restart pcscd.service' From 55548b8133b8f50d5b7da69086d5101f520290c6 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Thu, 24 Feb 2022 21:20:39 -0500 Subject: [PATCH 04/24] Added gnome-extensions function --- .../functions/gnome-extensions.zsh##o.Linux | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .local/dotfiles/functions/gnome-extensions.zsh##o.Linux diff --git a/.local/dotfiles/functions/gnome-extensions.zsh##o.Linux b/.local/dotfiles/functions/gnome-extensions.zsh##o.Linux new file mode 100644 index 0000000..94b5ed3 --- /dev/null +++ b/.local/dotfiles/functions/gnome-extensions.zsh##o.Linux @@ -0,0 +1,17 @@ +function gnome-extensions () +{ + case "$1" in + true) + echo "Enabling Gnome User Extensions" + gsettings set org.gnome.shell disable-user-extensions false + ;; + false) + echo "Disabling Gnome User Extenions" + gsettings set org.gnome.shell disable-user-extensions true + ;; + *) + echo "Usage: $0 true|false" + ;; + esac +} + From dffbe5a702d13326055bd10127b04ec7f30b106b Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Thu, 24 Feb 2022 21:32:21 -0500 Subject: [PATCH 05/24] Renamed gnome-extensions to disable-gnome-extensions and adjusted parameters --- ...inux => disable-gnome-extensions.zsh##o.Linux} | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) rename .local/dotfiles/functions/{gnome-extensions.zsh##o.Linux => disable-gnome-extensions.zsh##o.Linux} (60%) diff --git a/.local/dotfiles/functions/gnome-extensions.zsh##o.Linux b/.local/dotfiles/functions/disable-gnome-extensions.zsh##o.Linux similarity index 60% rename from .local/dotfiles/functions/gnome-extensions.zsh##o.Linux rename to .local/dotfiles/functions/disable-gnome-extensions.zsh##o.Linux index 94b5ed3..4517d9c 100644 --- a/.local/dotfiles/functions/gnome-extensions.zsh##o.Linux +++ b/.local/dotfiles/functions/disable-gnome-extensions.zsh##o.Linux @@ -1,15 +1,16 @@ -function gnome-extensions () +function disable-gnome-extensions () { case "$1" in - true) - echo "Enabling Gnome User Extensions" - gsettings set org.gnome.shell disable-user-extensions false - ;; - false) - echo "Disabling Gnome User Extenions" + true|on|yes) + echo "Disabling Gnome User Extensions" gsettings set org.gnome.shell disable-user-extensions true ;; + false|off|no) + echo "Disabling Gnome User Extenions" + gsettings set org.gnome.shell disable-user-extensions false + ;; *) + echo "Disables GNOME Extensions - In case of emergency" echo "Usage: $0 true|false" ;; esac From c41e0f25c80f1c04f99f0d491135c1566d4d55eb Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Thu, 24 Feb 2022 21:32:54 -0500 Subject: [PATCH 06/24] Updated HexChat replacement strings --- .config/hexchat/replace.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/hexchat/replace.conf b/.config/hexchat/replace.conf index 748d1e8..e37498c 100644 --- a/.config/hexchat/replace.conf +++ b/.config/hexchat/replace.conf @@ -97,3 +97,6 @@ CMD 🙄 NAME :rolleyes: CMD 🙄 +NAME B) +CMD 😎 + From 9241bfad0570d582e4302dd2dcad7029429d89e0 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Mon, 13 Jun 2022 14:52:52 -0400 Subject: [PATCH 07/24] Added iTerm environment for tmux --- .local/dotfiles/environment/iterm-tmux.zsh##o.Darwin | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .local/dotfiles/environment/iterm-tmux.zsh##o.Darwin diff --git a/.local/dotfiles/environment/iterm-tmux.zsh##o.Darwin b/.local/dotfiles/environment/iterm-tmux.zsh##o.Darwin new file mode 100644 index 0000000..15086b3 --- /dev/null +++ b/.local/dotfiles/environment/iterm-tmux.zsh##o.Darwin @@ -0,0 +1,2 @@ +export ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX=YES + From 20f036cff3689b4816fa2e5787eb5c53af2d9bad Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Mon, 13 Jun 2022 15:03:09 -0400 Subject: [PATCH 08/24] Updated gitconfig for Fedora --- .gitconfig##d.Fedora | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitconfig##d.Fedora b/.gitconfig##d.Fedora index 39b8323..8245a05 100644 --- a/.gitconfig##d.Fedora +++ b/.gitconfig##d.Fedora @@ -23,3 +23,7 @@ #helper = libsecret [gpg] program = gpg2 +[init] + defaultBranch = master +[pull] + rebase = false From d57238221cef4f6b6ad228e1664ed38c7678931a Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Mon, 13 Jun 2022 15:11:33 -0400 Subject: [PATCH 09/24] Updated gitconfig for macOS --- .gitconfig##o.Darwin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig##o.Darwin b/.gitconfig##o.Darwin index 75b7871..8f2c380 100644 --- a/.gitconfig##o.Darwin +++ b/.gitconfig##o.Darwin @@ -20,4 +20,4 @@ helper = osxkeychain [pull] rebase = false - ff = no + ff = only From e190aa023508bb4e1d9849d1e134a85cd612b4d1 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Tue, 14 Jun 2022 13:17:23 -0400 Subject: [PATCH 10/24] Fixed myspacevim merge bugs --- .SpaceVim.d/autoload/myspacevim.vim | 32 +++++++---------------------- .SpaceVim.d/init.toml | 5 ----- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/.SpaceVim.d/autoload/myspacevim.vim b/.SpaceVim.d/autoload/myspacevim.vim index 5b7d413..38cc131 100644 --- a/.SpaceVim.d/autoload/myspacevim.vim +++ b/.SpaceVim.d/autoload/myspacevim.vim @@ -1,36 +1,18 @@ function! myspacevim#before() abort set clipboard=unnamedplus -<<<<<<< HEAD - #inoremap - #inoremap + " inoremap + " inoremap - #call SpaceVim#custom#SPCGroupName(['b'], '+MyCustom') - #call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1) - #call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1) + " call SpaceVim#custom#SPCGroupName(['b'], '+MyCustom') + " call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1) + " call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1) endfunction function! myspacevim#after() abort set clipboard=unnamedplus - #inoremap - #inoremap + " inoremap + " inoremap call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1) call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1) endfunction -======= - "inoremap - "inoremap - "call SpaceVim#custom#SPCGroupName(['b'], '+MyCustom') - "call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1) - "call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1) -endfunction - -function! myspacevim#after() abort - "set clipboard=unnamedplus - "inoremap - "inoremap - call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 'sbprevious', 1) - call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 'sbnext', 1) -endfunction - ->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec diff --git a/.SpaceVim.d/init.toml b/.SpaceVim.d/init.toml index f3eedd8..c1f0192 100644 --- a/.SpaceVim.d/init.toml +++ b/.SpaceVim.d/init.toml @@ -104,11 +104,6 @@ [[layers]] name = 'lang#vim' -<<<<<<< HEAD [[custom_plugins]] name = "saltstack/salt-vim" -======= -#[[custom_plugins]] -#name = "saltstack/salt-vim" ->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec From 721eb8cbd2286a95aee37d89b63a2181cc08a91a Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 26 Jun 2022 09:38:46 -0400 Subject: [PATCH 11/24] Updated zsh and hexchat --- .profile | 1 + .zshenv | 1 + .zshrc | 7 ------- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.profile b/.profile index 8b892e2..6fa0100 100644 --- a/.profile +++ b/.profile @@ -6,3 +6,4 @@ export EDITOR=vim export PATH=$PATH:$HOME/bin:$HOME/go/bin #export QT_QPA_PLATFORMTHEME=qgnomeplatform +. "$HOME/.cargo/env" diff --git a/.zshenv b/.zshenv index 121400e..e767314 100644 --- a/.zshenv +++ b/.zshenv @@ -7,3 +7,4 @@ : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim} # }}} End configuration added by Zim install +. "$HOME/.cargo/env" diff --git a/.zshrc b/.zshrc index 47374a8..d420a76 100644 --- a/.zshrc +++ b/.zshrc @@ -122,21 +122,14 @@ bindkey -M vicmd 'k' history-substring-search-up bindkey -M vicmd 'j' history-substring-search-down # }}} End configuration added by Zim install -<<<<<<< HEAD -======= # Homebrew eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" ->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec # Set Path: typeset -U PATH PATH="$HOME/bin:$HOME/.local/bin:$PATH" export PATH -<<<<<<< HEAD - -======= ->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec # Portable alternative to readlink -f zpath() { cd -P . || return _out() { printf "%s$_zdlm\n" "$PWD/${1##*/}"; } From 7a872d7bb3be85b9b737343ea9e0524f737a6ea6 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 26 Jun 2022 09:51:44 -0400 Subject: [PATCH 12/24] Added checks for if-exists for cargo and linuxbrew --- .zshenv | 5 ++++- .zshrc | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.zshenv b/.zshenv index e767314..c72e285 100644 --- a/.zshenv +++ b/.zshenv @@ -7,4 +7,7 @@ : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim} # }}} End configuration added by Zim install -. "$HOME/.cargo/env" +if [[ -d "$HOME/.cargo" ]]; then + . "$HOME/.cargo/env" +fi + diff --git a/.zshrc b/.zshrc index d420a76..f612c75 100644 --- a/.zshrc +++ b/.zshrc @@ -123,7 +123,9 @@ bindkey -M vicmd 'j' history-substring-search-down # }}} End configuration added by Zim install # Homebrew -eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +if [[ -d "/home/linuxbrew/.linuxbrew" ]]; then + eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +fi # Set Path: typeset -U PATH From 10534c1f8a8e0b4293190ce65fcd96f2c18ccf4c Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 26 Jun 2022 09:54:17 -0400 Subject: [PATCH 13/24] Added iTerm2 shell integration --- .zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.zshrc b/.zshrc index f612c75..cf34dda 100644 --- a/.zshrc +++ b/.zshrc @@ -162,3 +162,6 @@ done < <(find "${HOME}/.local/dotfiles/" -name '*.zsh') # Disable Ctrl+S Scroll-Locking stty -ixon +# iTerm2 Shell Integration +test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" + From eb87864551bfb5347a5ad9ebd83eb1a26e3c02b5 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 24 Jul 2022 10:51:20 -0400 Subject: [PATCH 14/24] Adjusted vscode to Fedora-specific and added sublime-text and sublime-merge, all disabled but available --- .local/dotfiles/aliases/smerge.zsh##d.Fedora | 1 + .local/dotfiles/aliases/subl##d.Fedora | 1 + .local/dotfiles/aliases/{vscode.zsh => vscode.zsh##d.Fedora} | 0 3 files changed, 2 insertions(+) create mode 100644 .local/dotfiles/aliases/smerge.zsh##d.Fedora create mode 100644 .local/dotfiles/aliases/subl##d.Fedora rename .local/dotfiles/aliases/{vscode.zsh => vscode.zsh##d.Fedora} (100%) diff --git a/.local/dotfiles/aliases/smerge.zsh##d.Fedora b/.local/dotfiles/aliases/smerge.zsh##d.Fedora new file mode 100644 index 0000000..30b7941 --- /dev/null +++ b/.local/dotfiles/aliases/smerge.zsh##d.Fedora @@ -0,0 +1 @@ +#alias smerge="flatpak run com.sublimemerge.App" diff --git a/.local/dotfiles/aliases/subl##d.Fedora b/.local/dotfiles/aliases/subl##d.Fedora new file mode 100644 index 0000000..4014afc --- /dev/null +++ b/.local/dotfiles/aliases/subl##d.Fedora @@ -0,0 +1 @@ +#alias subl="flatpak run com.sublimetext.three" diff --git a/.local/dotfiles/aliases/vscode.zsh b/.local/dotfiles/aliases/vscode.zsh##d.Fedora similarity index 100% rename from .local/dotfiles/aliases/vscode.zsh rename to .local/dotfiles/aliases/vscode.zsh##d.Fedora From 2865c4f4529a6f9ab6a88fa4db7b230b93e09ca8 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 24 Jul 2022 11:02:09 -0400 Subject: [PATCH 15/24] Corrected subl alias filename --- .local/dotfiles/aliases/{subl##d.Fedora => subl.zsh##d.Fedora} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .local/dotfiles/aliases/{subl##d.Fedora => subl.zsh##d.Fedora} (100%) diff --git a/.local/dotfiles/aliases/subl##d.Fedora b/.local/dotfiles/aliases/subl.zsh##d.Fedora similarity index 100% rename from .local/dotfiles/aliases/subl##d.Fedora rename to .local/dotfiles/aliases/subl.zsh##d.Fedora From 5fe7ce414249da2c468da53be85f9876093fc1c1 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 24 Jul 2022 19:13:11 -0400 Subject: [PATCH 16/24] Activated vscode flatpak alias --- .local/dotfiles/aliases/vscode.zsh##d.Fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/dotfiles/aliases/vscode.zsh##d.Fedora b/.local/dotfiles/aliases/vscode.zsh##d.Fedora index 4969d21..a6810a7 100644 --- a/.local/dotfiles/aliases/vscode.zsh##d.Fedora +++ b/.local/dotfiles/aliases/vscode.zsh##d.Fedora @@ -1 +1 @@ -#alias code="flatpak run com.visualstudio.code" +alias code="flatpak run com.visualstudio.code" From 8d12b8c9505a379acc8a4c2cb3904244a487e17f Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 24 Jul 2022 19:21:07 -0400 Subject: [PATCH 17/24] Added Sdk Extensions to vscode --- .local/dotfiles/aliases/vscode.zsh##d.Fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/dotfiles/aliases/vscode.zsh##d.Fedora b/.local/dotfiles/aliases/vscode.zsh##d.Fedora index a6810a7..a24e04e 100644 --- a/.local/dotfiles/aliases/vscode.zsh##d.Fedora +++ b/.local/dotfiles/aliases/vscode.zsh##d.Fedora @@ -1 +1 @@ -alias code="flatpak run com.visualstudio.code" +alias code="FLATPAK_ENABLE_SDK_EXT=golang,rust-stable,php74 flatpak run com.visualstudio.code" From 23dbb55f14b737cbaee502f0399a8f7fdbb9df9a Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 24 Jul 2022 19:44:07 -0400 Subject: [PATCH 18/24] Updated zsh dotfiles loader --- .local/dotfiles/aliases/vscode.zsh##d.Fedora | 2 +- .local/dotfiles/functions/reload_dotfiles.zsh | 2 +- .zshrc | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.local/dotfiles/aliases/vscode.zsh##d.Fedora b/.local/dotfiles/aliases/vscode.zsh##d.Fedora index a24e04e..7ff4307 100644 --- a/.local/dotfiles/aliases/vscode.zsh##d.Fedora +++ b/.local/dotfiles/aliases/vscode.zsh##d.Fedora @@ -1 +1 @@ -alias code="FLATPAK_ENABLE_SDK_EXT=golang,rust-stable,php74 flatpak run com.visualstudio.code" +alias code='FLATPAK_ENABLE_SDK_EXT="golang,rust-stable,php74" flatpak run com.visualstudio.code' diff --git a/.local/dotfiles/functions/reload_dotfiles.zsh b/.local/dotfiles/functions/reload_dotfiles.zsh index 2b9f441..70d19a7 100644 --- a/.local/dotfiles/functions/reload_dotfiles.zsh +++ b/.local/dotfiles/functions/reload_dotfiles.zsh @@ -3,6 +3,6 @@ function reload_dotfiles () while read f do source "$f" - done < <(find "${HOME}/.local/dotfiles" -type f -name '*.zsh') + done < <(find "${HOME}/.local/dotfiles" \( -type l -o -type f \) -name '*.zsh') } diff --git a/.zshrc b/.zshrc index cf34dda..cc971a8 100644 --- a/.zshrc +++ b/.zshrc @@ -154,10 +154,11 @@ zpath() { cd -P . || return # Include local functions/aliases/environments: while read f do - if [[ -f "$(zpath "$f")" ]]; then - source "$f" - fi -done < <(find "${HOME}/.local/dotfiles/" -name '*.zsh') + #if [[ -f "$(zpath "$f")" ]]; then + # source "$f" + #fi + source "$f" +done < <(find "${HOME}/.local/dotfiles/" \( -type l -o -type f \) -name '*.zsh') # Disable Ctrl+S Scroll-Locking stty -ixon From 4840ff04f7ba1383b73a7257ed36e71347c02978 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Wed, 17 Aug 2022 21:45:03 -0400 Subject: [PATCH 19/24] Fixed bindings in SpaceVim --- .SpaceVim.d/autoload/myspacevim.vim | 18 ------------------ .SpaceVim.d/init.toml | 8 ++++---- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 .SpaceVim.d/autoload/myspacevim.vim diff --git a/.SpaceVim.d/autoload/myspacevim.vim b/.SpaceVim.d/autoload/myspacevim.vim deleted file mode 100644 index 38cc131..0000000 --- a/.SpaceVim.d/autoload/myspacevim.vim +++ /dev/null @@ -1,18 +0,0 @@ -function! myspacevim#before() abort - set clipboard=unnamedplus - " inoremap - " inoremap - - " call SpaceVim#custom#SPCGroupName(['b'], '+MyCustom') - " call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1) - " call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1) -endfunction - -function! myspacevim#after() abort - set clipboard=unnamedplus - " inoremap - " inoremap - call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1) - call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1) -endfunction - diff --git a/.SpaceVim.d/init.toml b/.SpaceVim.d/init.toml index c1f0192..65dcfe0 100644 --- a/.SpaceVim.d/init.toml +++ b/.SpaceVim.d/init.toml @@ -32,8 +32,8 @@ disabled_plugins = ["fcitx.vim"] automatic_update = true filemanager = "nerdtree" - bootstrap_before = 'myspacevim#before' - bootstrap_after = 'myspacevim#after' + #bootstrap_before = 'myspacevim#before' + #bootstrap_after = 'myspacevim#after' # Enable autocomplete layer [[layers]] @@ -104,6 +104,6 @@ [[layers]] name = 'lang#vim' -[[custom_plugins]] -name = "saltstack/salt-vim" +#[[custom_plugins]] +#name = "saltstack/salt-vim" From 860137726edd5910a94196687f846df4ccf1a1a3 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Wed, 17 Aug 2022 21:46:09 -0400 Subject: [PATCH 21/24] Updated gvim alias to use nvim --- .local/dotfiles/aliases/gvim.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.local/dotfiles/aliases/gvim.zsh b/.local/dotfiles/aliases/gvim.zsh index 1ab6378..2915149 100644 --- a/.local/dotfiles/aliases/gvim.zsh +++ b/.local/dotfiles/aliases/gvim.zsh @@ -2,6 +2,8 @@ case `uname` in Linux) if whence -p nvim-gtk > /dev/null; then alias vim=nvim-gtk + elif whence -p nvim > /dev/null; then + alias vim=nvim elif whence -p gvim > /dev/null; then alias vim=gvim fi From 00fe0b0a8618e24e01e938ebc472a4290fd97e9d Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Wed, 17 Aug 2022 21:48:20 -0400 Subject: [PATCH 22/24] Removed linux homebrew, added ShellFish integration --- .shellfish | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .zshrc | 11 ++- 2 files changed, 287 insertions(+), 3 deletions(-) create mode 100644 .shellfish diff --git a/.shellfish b/.shellfish new file mode 100644 index 0000000..305c17e --- /dev/null +++ b/.shellfish @@ -0,0 +1,279 @@ +# include this from .bashrc, .zshrc or +# another shell startup file with: +# source $HOME/.shellfishrc + +# this script does nothing outside ShellFish +if [[ "$LC_TERMINAL" = "ShellFish" ]]; then + ios_printURIComponent() { + awk 'BEGIN {while (y++ < 125) z[sprintf("%c", y)] = y + while (y = substr(ARGV[1], ++j, 1)) + q = y ~ /[a-zA-Z0-9]/ ? q y : q sprintf("%%%02X", z[y]) + printf("%s", q)}' "$1" + } + + ios_printBase64Component() { + echo -n "$1" | base64 + } + + which printf > /dev/null + ios_hasPrintf=$? + ios_printf() { + if [ $ios_hasPrintf ]; then + printf "$1" + else + awk "BEGIN {printf \"$1\"}" + fi + } + + ios_sequence() { + if [[ -n "$TMUX" ]]; then + OUTPUT=$( + ios_printf '\033Ptmux;\033\033]' + echo -n "$1" | tr -d '[:space:]' + ios_printf '\a\033\\' ) + else + OUTPUT=$( + ios_printf '\033]' + echo -n "$1" | tr -d '[:space:]' + ios_printf '\a' ) + fi + if [ -t 1 ] ; then + echo -n $OUTPUT + elif [[ -n "$SSH_TTY" ]]; then + echo -n $OUTPUT > $SSH_TTY + else + echo >&2 'Standard output is not tty and there is no $SSH_TTY' + fi + } + + # prepare fifo for communicating result back to shell + ios_prepareResult() { + FIFO=$(mktemp) + rm -f $FIFO + mkfifo $FIFO + echo $FIFO + } + + # wait for terminal to complete action + ios_handleResult() { + FIFO=$1 + if [ -n "$FIFO" ]; then + read <$FIFO -s + rm -f $FIFO + + if [[ $REPLY = error* ]]; then + echo "${REPLY#error=}" | base64 >&2 -d + return 1 + fi + + if [[ $REPLY = result* ]]; then + echo "${REPLY#result=}" | base64 -d + fi + fi + } + + sharesheet() { + if [[ $# -eq 0 ]]; then + if tty -s; then + cat < + +Open in Textastic 9.5 or later. +File must be in directory represented in the Files app to allow writing back edits. +EOF + else + if [ ! -e "$1" ]; then + touch "$1" + fi + OUTPUT=$( + awk 'BEGIN {printf "6;textastic://?ver=2&pwd="}' + ios_printBase64Component "$PWD" + awk 'BEGIN {printf "&home="}' + ios_printBase64Component "$HOME" + awk 'BEGIN {printf "&path="}' + ios_printBase64Component "$1" + ) + ios_sequence "$OUTPUT" + fi + } + + openUrl() { + if [[ $# -eq 0 ]]; then + cat < + +Open URL on iOS. +EOF + else + FIFO=$(ios_prepareResult) + OUTPUT=$( + awk 'BEGIN {printf "6;open://?ver=2&respond="}' + ios_printBase64Component "$FIFO" + awk 'BEGIN {printf "&url="}' + ios_printBase64Component "$1" + ) + ios_sequence "$OUTPUT" + ios_handleResult "$FIFO" + fi + } + + runShortcut() { + local baseUrl="shortcuts://run-shortcut" + if [[ $1 == "--x-callback" ]]; then + local baseUrl="shortcuts://x-callback-url/run-shortcut" + shift + fi + + if [[ $# -eq 0 ]]; then + cat < [input-for-shortcut] + +Run in Shortcuts app bringing back results if --x-callback is included. +EOF + else + local name=$(ios_printURIComponent "$1") + shift + local input=$(ios_printURIComponent "$*") + openUrl "$baseUrl?name=$name&input=$input" + fi + } + + notify() { + if [[ $# -eq 0 ]]; then + cat < [body] + +Show notification on iOS device. +Title cannot contain semicolon. +EOF + else + local title="${1-}" body="${2-}" + OUTPUT=$( + echo $title | awk -F";" 'BEGIN {printf "777;notify;"} {printf "%s;", $1}' + echo $body + ) + ios_sequence "$OUTPUT" + fi + } + + # copy standard input or arguments to iOS clipboard + pbcopy() { + OUTPUT=$( + awk 'BEGIN {printf "52;c;"} ' + if [ $# -eq 0 ]; then + base64 | tr -d '\n' + else + echo -n "$@" | base64 | tr -d '\n' + fi + ) + ios_sequence "$OUTPUT" + } + + # paste from iOS device clipboard to standard output + pbpaste() { + FIFO=$(ios_prepareResult) + OUTPUT=$( + awk 'BEGIN {printf "6;pbpaste://?ver=2&respond="}' + ios_printBase64Component "$FIFO" + ) + ios_sequence "$OUTPUT" + ios_handleResult "$FIFO" + } + + # Secure ShellFish supports 24-bit colors + export COLORTERM=truecolor + + if [[ -z "$INSIDE_EMACS" && $- = *i* ]]; then + # tmux mouse mode enables scrolling with + # swipe and mouse wheel + if [[ -n "$TMUX" ]]; then + tmux set -g mouse on + fi + + # send the current directory using OSC 7 when showing prompt to + # make filename detection work better for interactive shell + update_terminal_cwd() { + ios_sequence $( + awk "BEGIN {printf \"7;%s\", \"file://$HOSTNAME\"}" + ios_printURIComponent "$PWD" + ) + } + if [ -n "$ZSH_VERSION" ]; then + precmd() { update_terminal_cwd; } + elif [[ $PROMPT_COMMAND != *"update_terminal_cwd"* ]]; then + PROMPT_COMMAND="update_terminal_cwd${PROMPT_COMMAND:+; $PROMPT_COMMAND}" + fi + fi +fi + diff --git a/.zshrc b/.zshrc index cc971a8..f914f72 100644 --- a/.zshrc +++ b/.zshrc @@ -123,9 +123,9 @@ bindkey -M vicmd 'j' history-substring-search-down # }}} End configuration added by Zim install # Homebrew -if [[ -d "/home/linuxbrew/.linuxbrew" ]]; then - eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" -fi +#if [[ -d "/home/linuxbrew/.linuxbrew" ]]; then +# eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +#fi # Set Path: typeset -U PATH @@ -166,3 +166,8 @@ stty -ixon # iTerm2 Shell Integration test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" +# ShellFish Integration +if [[ -r "${HOME}/.shellfish" ]]; then + source "${HOME}/.shellfish" +fi + From ea0b8e5120223d1487a5db9c63b0080e33110121 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sat, 27 Aug 2022 14:39:11 -0400 Subject: [PATCH 23/24] Moved rust cargo env loader and added conditions and added gitconfig for arch --- .gitconfig##d.arch | 30 ++++++++++++++++++++++++++++++ .profile | 2 +- .zshenv | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 .gitconfig##d.arch diff --git a/.gitconfig##d.arch b/.gitconfig##d.arch new file mode 100644 index 0000000..848653e --- /dev/null +++ b/.gitconfig##d.arch @@ -0,0 +1,30 @@ +[user] + name = Eric Renfro + email = psi-jack@linux-help.org + signingkey = 25787986B19167B89BFF55CF3159FF4CB13EBFB4 +[sendemail] + smtpencryption = tls + smtpserver = mx.linux-help.org + smtpuser = eric.renfro@linux-help.org + smtpserverport = 587 +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[commit] + gpgsign = true +[alias] + up = !git pull --prune $@ && git submodule update --init --recursive +[credential] + #helper = /usr/lib/git/git-core/git-credential-store + #helper = /usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring + #helper = /usr/libexec/git-core/git-credential-libsecret + helper = /usr/lib/git-core/git-credential-libsecret + #helper = libsecret +[gpg] + program = gpg2 +[init] + defaultBranch = master +[pull] + rebase = false diff --git a/.profile b/.profile index 6fa0100..72c35c3 100644 --- a/.profile +++ b/.profile @@ -6,4 +6,4 @@ export EDITOR=vim export PATH=$PATH:$HOME/bin:$HOME/go/bin #export QT_QPA_PLATFORMTHEME=qgnomeplatform -. "$HOME/.cargo/env" +#. "$HOME/.cargo/env" diff --git a/.zshenv b/.zshenv index c72e285..6482b8f 100644 --- a/.zshenv +++ b/.zshenv @@ -7,7 +7,7 @@ : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim} # }}} End configuration added by Zim install -if [[ -d "$HOME/.cargo" ]]; then +if [[ -r "$HOME/.cargo/env" ]]; then . "$HOME/.cargo/env" fi From 387c572335e072882badc55368380edc6553b3f5 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sat, 27 Aug 2022 14:53:23 -0400 Subject: [PATCH 24/24] Renamed gitconfig for arch family --- .gitconfig##d.arch => .gitconfig##f.arch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitconfig##d.arch => .gitconfig##f.arch (100%) diff --git a/.gitconfig##d.arch b/.gitconfig##f.arch similarity index 100% rename from .gitconfig##d.arch rename to .gitconfig##f.arch