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

This commit is contained in:
Eric Renfro 2022-06-13 15:01:23 -04:00
commit 4f8998433c
Signed by: psi-jack
GPG Key ID: 14977F3A50D9A5BF
9 changed files with 677 additions and 1 deletions

View File

@ -1,5 +1,22 @@
function! myspacevim#before() abort
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-e> <End>
@ -16,3 +33,4 @@ function! myspacevim#after() abort
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,6 +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

@ -0,0 +1,636 @@
v=2.14.3
N=ZNC: Gnome
P=psi-jack/Gnome:Vectron623
E=UTF-8 (Unicode)
F=26
D=2
S=irc.gnome.org/6667
S=mail1.linux-help.org/+7070
S=znc1c.linux-help.org/+7070
N=ZNC: Libera
P=psi-jack/Libera:Vectron623
E=UTF-8 (Unicode)
F=31
D=1
S=mail1.linux-help.org/7070
S=znc1c.linux-help.org/7070
N=Libera.Chat
E=UTF-8 (Unicode)
F=23
D=0
S=irc.libera.chat/6697
N=BBS
E=UTF-8 (Unicode)
F=51
D=0
S=bbs.deckersheaven.com/6667
N=ZNC: Jhlorn: Freenode
I=Jhlorn
i=Jhlorn_
U=jhlorn/freenode
R=jhlorn
P=jhlorn/freenode:Laserbeam623
L=7
E=UTF-8 (Unicode)
F=21
D=0
S=znc.linux-help.org/7070
N=ZNC: SpotChat
P=psi-jack/spotchat:Vectron623
E=UTF-8 (Unicode)
F=22
D=0
S=znc.linux-help.org/7070
N=ZNC: BBS
P=psi-jack/synchro:Vectron623
E=UTF-8 (Unicode)
F=26
D=2
S=bbs.home.ld/6667
S=mail1.linux-help.org/+7070
S=znc1c.linux-help.org/+7070
N=ZNC: OFTC
P=psi-jack/oftc:Vectron623
E=UTF-8 (Unicode)
F=63
D=1
S=mail1.linux-help.org/7070
S=znc1c.linux-help.org/7070
N=ZNC: Freenode
P=psi-jack/freenode:Vectron623
E=UTF-8 (Unicode)
F=54
D=0
S=mail1.linux-help.org/7070
N=2600net
E=UTF-8 (Unicode)
F=19
D=0
S=irc.2600.net
N=2ch
E=iso-2022-jp
F=19
D=0
S=irc.2ch.sc
S=irc.nurs.or.jp
S=irc.juggler.jp
N=AccessIRC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.accessirc.net
N=AfterNET
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.afternet.org
N=Aitvaras
E=UTF-8 (Unicode)
F=19
D=0
S=irc.data.lt/+6668
S=irc.omnitel.net/+6668
S=irc.ktu.lt/+6668
S=irc.kis.lt/+6668
S=irc.vub.lt/+6668
S=irc.data.lt
S=irc.omnitel.net
S=irc.ktu.lt
S=irc.kis.lt
S=irc.vub.lt
N=Anthrochat
E=UTF-8 (Unicode)
F=23
D=0
S=irc.anthrochat.net
N=ARCNet
E=UTF-8 (Unicode)
F=19
D=0
S=arcnet-irc.org
N=AustNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.austnet.org
N=AzzurraNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.azzurra.org
N=BetaChat
L=6
E=UTF-8 (Unicode)
F=19
D=0
S=irc.betachat.net
N=Canternet
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.canternet.org
N=Chat4all
E=UTF-8 (Unicode)
F=23
D=0
S=irc.chat4all.org
N=ChatJunkies
E=UTF-8 (Unicode)
F=19
D=0
S=irc.chatjunkies.org
N=ChatNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.chatnet.org
N=ChatSpike
L=6
E=UTF-8 (Unicode)
F=19
D=0
S=irc.chatspike.net
N=ChattingAway
E=UTF-8 (Unicode)
F=19
D=0
S=irc.chattingaway.com
N=Criten
E=UTF-8 (Unicode)
F=19
D=0
S=irc.criten.net
N=DALnet
L=2
E=UTF-8 (Unicode)
F=19
D=0
S=us.dal.net
N=DarkMyst
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.darkmyst.org
N=Dark-Tou-Net
E=UTF-8 (Unicode)
F=19
D=0
S=irc.d-t-net.de
N=DeltaAnime
E=UTF-8 (Unicode)
F=19
D=0
S=irc.deltaanime.net
N=EFnet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.choopa.net
S=irc.paraphysics.net
S=efnet.port80.se
S=irc.underworld.no
S=irc.inet.tele.dk
N=ElectroCode
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.electrocode.net
N=EnterTheGame
E=UTF-8 (Unicode)
F=19
D=0
S=irc.enterthegame.com
N=EntropyNet
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.entropynet.net
N=EsperNet
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.esper.net
N=EUIrc
E=UTF-8 (Unicode)
F=19
D=0
S=irc.euirc.net
N=EuropNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.europnet.org
N=FDFNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.fdfnet.net
N=freenode
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=chat.freenode.net
S=irc.freenode.net
N=Furnet
E=UTF-8 (Unicode)
F=23
D=0
S=irc.furnet.org
N=GalaxyNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.galaxynet.org
N=GameSurge
E=UTF-8 (Unicode)
F=19
D=0
S=irc.gamesurge.net
N=GeeksIRC
L=6
E=UTF-8 (Unicode)
F=19
D=0
S=irc.geeksirc.net
N=GeekShed
E=UTF-8 (Unicode)
F=23
D=0
S=irc.geekshed.net
N=German-Elite
E=CP1252
F=19
D=0
S=irc.german-elite.net
N=GIMPNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.gimp.org
S=irc.gnome.org
N=GlobalGamers
E=UTF-8 (Unicode)
F=19
D=0
S=irc.globalgamers.net/+6660
S=irc.globalgamers.net
N=Hashmark
E=UTF-8 (Unicode)
F=19
D=0
S=irc.hashmark.net
N=IdleMonkeys
E=UTF-8 (Unicode)
F=19
D=0
S=irc.idlemonkeys.net
N=IndirectIRC
L=6
E=UTF-8 (Unicode)
F=19
D=0
S=irc.indirectirc.com
N=Interlinked
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.interlinked.me
N=IRC4Fun
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.irc4fun.net
N=IRCHighWay
E=UTF-8 (Unicode)
F=23
D=0
S=irc.irchighway.net
N=IRCNet
E=UTF-8 (Unicode)
F=19
D=0
S=open.ircnet.net
N=Irctoo.net
E=UTF-8 (Unicode)
F=19
D=0
S=irc.irctoo.net
N=iZ-smart.net
E=CP1252
F=19
D=0
S=irc.iz-smart.net
N=KBFail
E=UTF-8 (Unicode)
F=19
D=0
S=irc.kbfail.net
N=Krstarica
E=UTF-8 (Unicode)
F=19
D=0
S=irc.krstarica.com
N=LibraIRC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.librairc.net
N=LinkNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.link-net.org/+7000
N=MindForge
L=6
E=UTF-8 (Unicode)
F=19
D=0
S=irc.mindforge.org
N=MIXXnet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.mixxnet.net
N=Moznet
E=UTF-8 (Unicode)
F=23
D=0
S=irc.mozilla.org
N=ObsidianIRC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.obsidianirc.net
N=Oceanius
L=6
E=UTF-8 (Unicode)
F=19
D=0
S=irc.oceanius.com
N=OFTC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.oftc.net
N=OtherNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.othernet.org
N=OzNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.oz.org
N=PIRC.PL
E=UTF-8 (Unicode)
F=23
D=0
S=irc.pirc.pl
N=PonyChat
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.ponychat.net
N=PTNet.org
E=UTF-8 (Unicode)
F=19
D=0
S=uevora.ptnet.org
S=vianetworks.ptnet.org
N=QuakeNet
L=8
E=UTF-8 (Unicode)
F=19
D=0
S=irc.quakenet.org
N=Rizon
E=UTF-8 (Unicode)
F=23
D=0
S=irc.rizon.net
N=RusNet
E=KOI8-R (Cyrillic)
F=19
D=0
S=irc.tomsk.net
S=irc.run.net
S=irc.ru
S=irc.lucky.net
N=SceneNet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.scene.org
N=SeilEn.de
E=CP1252
F=19
D=0
S=irc.seilen.de
N=Serenity-IRC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.serenity-irc.net
N=SlashNET
E=UTF-8 (Unicode)
F=19
D=0
S=irc.slashnet.org
N=Snoonet
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.snoonet.org
N=Sohbet.Net
E=CP1254
F=19
D=0
S=irc.sohbet.net
N=SolidIRC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.solidirc.com
N=SorceryNet
L=6
E=UTF-8 (Unicode)
F=19
D=0
S=irc.sorcery.net
N=SpotChat
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.spotchat.org
N=StarChat
E=UTF-8 (Unicode)
F=19
D=0
S=irc.starchat.net
N=Station51
E=UTF-8 (Unicode)
F=19
D=0
S=irc.station51.net
N=StormBit
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.stormbit.net
N=SwiftIRC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.swiftirc.net
N=synIRC
E=UTF-8 (Unicode)
F=19
D=0
S=irc.synirc.net
N=Techtronix
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.techtronix.net
N=TURLINet
E=UTF-8 (Unicode)
F=23
D=0
S=irc.servx.ru
N=UnderNet
L=9
E=UTF-8 (Unicode)
F=19
D=0
S=us.undernet.org
C=MSG x@channels.undernet.org login %u %p
N=UniBG
L=9
E=CP1251
F=19
D=0
S=irc.lirex.com
S=irc.naturella.com
S=irc.techno-link.com
C=MSG NS IDENTIFY %p
N=Worldnet
E=UTF-8 (Unicode)
F=19
D=0
S=irc.worldnet.net
N=Xertion
L=6
E=UTF-8 (Unicode)
F=23
D=0
S=irc.xertion.org

View File

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

View File

@ -14,8 +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,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
# }}} 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##*/}"; }