This commit is contained in:
Michael Zhang 2021-03-20 02:40:04 -05:00
parent a00899a44b
commit aabb1aa1cb
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
8 changed files with 53 additions and 30 deletions

View file

@ -1,44 +1,44 @@
call plug#begin(stdpath('data') . '/plugged')
Plug 'vim-airline/vim-airline'
exe 'source' (stdpath('config') . '/airline.vim')
" Plug 'vim-airline/vim-airline'
" exe 'source' (stdpath('config') . '/airline.vim')
Plug 'neoclide/coc.nvim', {'branch': 'release'}
exe 'source' (stdpath('config') . '/coc.vim')
" Plug 'neoclide/coc.nvim', {'branch': 'release'}
" exe 'source' (stdpath('config') . '/coc.vim')
" Plug 'file://'.expand('~/Projects/coc-nvim-rs/')
Plug 'preservim/nerdtree'
exe 'source' (stdpath('config') . '/nerdtree.vim')
Plug 'ctrlpvim/ctrlp.vim'
" Plug 'ctrlpvim/ctrlp.vim'
let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
Plug 'jiangmiao/auto-pairs', { 'for': 'rust' }
Plug 'kovisoft/slimv', { 'for': 'lisp' }
Plug 'leafOfTree/vim-svelte-plugin'
Plug 'JuliaEditorSupport/julia-vim'
" Plug 'jiangmiao/auto-pairs', { 'for': 'rust' }
" Plug 'kovisoft/slimv', { 'for': 'lisp' }
" Plug 'leafOfTree/vim-svelte-plugin'
" Plug 'JuliaEditorSupport/julia-vim'
Plug 'mhinz/vim-startify'
Plug 'tomasiser/vim-code-dark'
Plug 'tpope/vim-sleuth'
" Plug 'mhinz/vim-startify'
" Plug 'tomasiser/vim-code-dark'
" Plug 'tpope/vim-sleuth'
" Language plugins
Plug 'kovisoft/slimv'
Plug 'leafOfTree/vim-svelte-plugin'
Plug 'vmchale/dhall-vim'
Plug 'qnighy/lalrpop.vim'
Plug 'cespare/vim-toml'
Plug 'GutenYe/json5.vim'
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
Plug 'pest-parser/pest.vim', { 'for': 'pest' }
Plug 'zah/nim.vim'
" Plug 'kovisoft/slimv'
" Plug 'leafOfTree/vim-svelte-plugin'
" Plug 'vmchale/dhall-vim'
" Plug 'qnighy/lalrpop.vim'
" Plug 'cespare/vim-toml'
" Plug 'GutenYe/json5.vim'
" Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
" Plug 'pest-parser/pest.vim', { 'for': 'pest' }
" Plug 'zah/nim.vim'
Plug 'godlygeek/tabular'
Plug 'plasticboy/vim-markdown'
" Plug 'godlygeek/tabular'
" Plug 'plasticboy/vim-markdown'
Plug 'wakatime/vim-wakatime'
Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'}
Plug 'wakatime/vim-wakatime'
" Plug 'wakatime/vim-wakatime'
" Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'}
" Plug 'wakatime/vim-wakatime'
let g:go_fmt_command = 'goimports'
@ -51,7 +51,7 @@ call plug#end()
" General config
colorscheme codedark
" colorscheme codedark
set splitright
set number
@ -72,6 +72,7 @@ filetype plugin indent on
" Binds
let mapleader = ";"
nnoremap ; :
nnoremap T :vsplit<BAR>vertical resize 54<BAR>terminal<CR>i

View file

View file

@ -7,6 +7,9 @@
lg = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
pushpr = "!f() { git push origin master;git commit --allow-empty -m 'push to execute post-receive';git push origin master; }; f"
[init]
defaultBranch = "master"
[pull]
rebase = true

View file

View file

@ -30,7 +30,7 @@ source_if_exists $HOME/.ghcup/env
export PATH="$HOME/.local/bin:$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin:$HOME/.idris2/bin:$HOME/.opam/default/bin"
[ -f "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" ] && source "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env"
[[ -s /home/michael/.autojump/etc/profile.d/autojump.sh ]] && source /home/michael/.autojump/etc/profile.d/autojump.sh
[[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh
autoload -U compinit && compinit -u
# opam configuration
@ -50,4 +50,5 @@ fi
source_if_exists $HOME/.local/scripts/zsh/aliases.zsh
[ -f "$HOME/.zsh/extras" ] && source $HOME/.zsh/extras/*.zsh
source <(chezmoi completion zsh)
# vim: set filetype=zsh:

View file

@ -3,4 +3,9 @@
xrandr --setprovideroutputsource modesetting NVIDIA-0
xrandr --auto
eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
export SSH_AUTH_SOCK
eval $(ssh-agent)
exec i3

View file

@ -2,5 +2,20 @@ Host osutech
User root
HostName 192.81.210.64
Host hlab
User michael
HostName 142.93.75.170
# sift
Host l0
User mzhang
HostName lambda0.sift.net
Host achilles
User mzhang
HostName achilles.sift.net
Host r0
User mzhang
HostName rhimes0.sift.net
# vim: set ft=sshconfig :

View file

@ -1,3 +1 @@
#!/bin/bash
echo "source <(chezmoi completion zsh)" >> $HOME/.zshrc