psi-jack/my-yadm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git.linux-help.org:psi-jack/my-yadm

Browse source
This commit is contained in:
Eric Renfro 2022-06-13 15:01:23 -04:00
commit 9a849f2ec8
8 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.SpaceVim.d/autoload/myspacevim.vim
View file

@ -1,5 +1,22 @@
function! myspacevim#before() abort function! myspacevim#before() abort
set clipboard=unnamedplus set clipboard=unnamedplus
<<<<<<< HEAD
#inoremap <C-a> <Home>
#inoremap <C-e> <End>
#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 <C-a> <Home>
#inoremap <C-e> <End>
call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1)
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1)
endfunction
=======
"inoremap <C-a> <Home> "inoremap <C-a> <Home>
"inoremap <C-e> <End> "inoremap <C-e> <End>
@ -16,3 +33,4 @@ function! myspacevim#after() abort
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 'sbnext', 1) call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 'sbnext', 1)
endfunction endfunction
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec

5
.SpaceVim.d/init.toml
View file

@ -104,6 +104,11 @@
[[layers]] [[layers]]
name = 'lang#vim' name = 'lang#vim'
<<<<<<< HEAD
[[custom_plugins]]
name = "saltstack/salt-vim"
=======
#[[custom_plugins]] #[[custom_plugins]]
#name = "saltstack/salt-vim" #name = "saltstack/salt-vim"
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec

3
.config/hexchat/commands.conf
View file

@ -91,6 +91,9 @@ CMD quote WHOIS %2 %2
NAME SLAP NAME SLAP
CMD me slaps a trout around a bit with a large %2 CMD me slaps a trout around a bit with a large %2
<<<<<<< HEAD
=======
NAME SHT NAME SHT
CMD msg %c %2: This channel frowns upon and discourages the use of SMS/shtspk like '%3'. See /topic for reference. CMD msg %c %2: This channel frowns upon and discourages the use of SMS/shtspk like '%3'. See /topic for reference.
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec

1
.config/yadm/bootstrap.d/gnome
View file

@ -1 +0,0 @@
gnome##os.Linux

3
.config/yadm/fedora.dconf
View file

@ -14,8 +14,11 @@ session-switch-to-terminal-down='disabled'
session-switch-to-terminal-left='disabled' session-switch-to-terminal-left='disabled'
session-switch-to-terminal-right='disabled' session-switch-to-terminal-right='disabled'
session-switch-to-terminal-up='disabled' session-switch-to-terminal-up='disabled'
<<<<<<< HEAD
=======
terminal-copy='<Alt>c' terminal-copy='<Alt>c'
terminal-paste='<Alt>v' terminal-paste='<Alt>v'
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
[com/gexperts/Tilix/profiles] [com/gexperts/Tilix/profiles]
list=['2b7c4080-0ddd-46c5-8f23-563fd3ba789d', '8b7f94c7-649c-41d6-adc7-7123a631e58e'] list=['2b7c4080-0ddd-46c5-8f23-563fd3ba789d', '8b7f94c7-649c-41d6-adc7-7123a631e58e']

3
.gitconfig##o.Darwin
View file

@ -18,3 +18,6 @@
up = !git pull --prune $@ && git submodule update --init --recursive up = !git pull --prune $@ && git submodule update --init --recursive
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[pull]
rebase = false
ff = no

2
.local/dotfiles/environment/iterm-tmux.zsh##o.Darwin Normal file
View file

@ -0,0 +1,2 @@
export ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX=YES

7
.zshrc
View file

@ -122,14 +122,21 @@ bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down bindkey -M vicmd 'j' history-substring-search-down
# }}} End configuration added by Zim install # }}} End configuration added by Zim install
<<<<<<< HEAD
=======
# Homebrew # Homebrew
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
# Set Path: # Set Path:
typeset -U PATH typeset -U PATH
PATH="$HOME/bin:$HOME/.local/bin:$PATH" PATH="$HOME/bin:$HOME/.local/bin:$PATH"
export PATH export PATH
<<<<<<< HEAD
=======
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
# Portable alternative to readlink -f # Portable alternative to readlink -f
zpath() { cd -P . || return zpath() { cd -P . || return
_out() { printf "%s$_zdlm\n" "$PWD/${1##*/}"; } _out() { printf "%s$_zdlm\n" "$PWD/${1##*/}"; }