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

This commit is contained in:
Eric Renfro 2022-06-13 14:58:52 -04:00
commit 32bb101f14
11 changed files with 67 additions and 1 deletions

View file

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

View file

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

View file

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

View file

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

2
.config/yadm/encrypt Normal file
View file

@ -0,0 +1,2 @@
.ssh/*.key
.config/hexchat/servlist.conf

View file

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

View file

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

View file

@ -0,0 +1 @@
alias fix-yubikey='sudo systemctl restart pcscd.service'

View file

@ -0,0 +1,18 @@
function disable-gnome-extensions ()
{
case "$1" in
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
}

BIN
.local/share/yadm/archive Normal file

Binary file not shown.

8
.zshrc
View file

@ -122,13 +122,21 @@ 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##*/}"; }