From 7d7677b72c5d1996ddebb593544bbc95655944c2 Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Thu, 2 Jul 2020 21:56:22 -0400 Subject: [PATCH] update --- .zshrc | 7 +++++++ config/i3/config | 5 +++-- config/nvim/.netrwhist | 3 ++- config/nvim/init.vim | 5 +++++ zsh/aliases.zsh | 14 ++++++++++++++ zsh/path-exports-options.zsh | 3 +++ 6 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.zshrc b/.zshrc index 80ac2b4..ee3d7c0 100644 --- a/.zshrc +++ b/.zshrc @@ -12,4 +12,11 @@ export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND" bindkey -v bindkey -e +autoload -U up-line-or-beginning-search +autoload -U down-line-or-beginning-search +zle -N up-line-or-beginning-search +zle -N down-line-or-beginning-search +bindkey "^[[A" up-line-or-beginning-search # Up +bindkey "^[[B" down-line-or-beginning-search # Down + [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh diff --git a/config/i3/config b/config/i3/config index ccb1bf7..dfed7af 100644 --- a/config/i3/config +++ b/config/i3/config @@ -19,12 +19,13 @@ set $work8 "Neptune" set $work9 "Pluto" # default workspaces to each monitor -workspace $work1 output DVI-I-1 +workspace $work1 output DP-2 workspace $work2 output HDMI-0 +workspace $work3 output DVI-I-1 # startup applications exec_always --no-startup-id $HOME/.config/i3/polybar.sh -exec_always feh --bg-scale ~/sync/general/wallpapers/doom.png ~/sync/general/wallpapers/doom.png +exec_always feh --bg-scale ~/sync/general/wallpapers/doom1.jpg ~/sync/general/wallpapers/doom1.jpg ## i3 Opts default_border pixel 2 diff --git a/config/nvim/.netrwhist b/config/nvim/.netrwhist index d103452..750121b 100644 --- a/config/nvim/.netrwhist +++ b/config/nvim/.netrwhist @@ -1,3 +1,4 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =1 +let g:netrw_dirhist_cnt =2 let g:netrw_dirhist_1='/home/andrew/work/platform/rust/chunk-rebuilder/src/handlers' +let g:netrw_dirhist_2='/home/andrew/work/platform/rust/api/src/handlers' diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 4f5bd7e..b904d89 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -26,6 +26,7 @@ Plug 'slim-template/vim-slim', { 'for': 'slim' } Plug 'LnL7/vim-nix', { 'for': 'nix' } Plug 'wlangstroth/vim-racket', { 'for': 'racket' } Plug 'evanleck/vim-svelte', { 'for': 'svelte' } +Plug 'summivox/vim-pawn', { 'for': 'spice' } """ Vim Behavior/Functionality Plug 'alok/notational-fzf-vim' @@ -228,6 +229,8 @@ let g:grepper.tools = ['rg', 'git', 'grep'] let test#strategy = "dispatch" +let g:go_version_warning = 0 + """ """ Key remapping """ @@ -315,6 +318,8 @@ au BufRead,BufNewFile *.slang set filetype=slang " Autoset ecr -> erb syntax highlighting au BufRead,BufNewFile *.ecr set filetype=erb +" sourcepawn +au FileType sourcepawn setlocal makeprg=/home/andrew/programming/sourcemod/sourcemod/addons/sourcemod/scripting/spcomp " Automatically make the dir if it doesn't exist on the machine. silent !mkdir -p ~/.nvim/tmp >/dev/null 2>&1 diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 5b1aedc..ebb6012 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1,9 +1,22 @@ +# copy/paste alias copy='xclip -selection c' alias paste='xclip -selection p' +# rbenv +alias rbenve='eval "$(rbenv init -)"' + +# ls alias ll='exa -al' alias ls="exa" +# git +alias gp="git push" +alias gpo="git push origin" +alias gpom='git push origin master' +alias gpomr='git pull origin master --rebase' +alias gcm="git checkout master" + + # pubkey alias pubkey="cat ~/.ssh/id_rsa.pub|copy" @@ -26,3 +39,4 @@ alias cda='cd ~/work/afml' alias cdp='cd ~/programming' alias cds='cd ~/Website' alias cdw='cd ~/work' +alias cdwp='cd ~/work/platform' diff --git a/zsh/path-exports-options.zsh b/zsh/path-exports-options.zsh index c916bab..1a4f7a2 100644 --- a/zsh/path-exports-options.zsh +++ b/zsh/path-exports-options.zsh @@ -21,6 +21,9 @@ export GOROOT="/usr/local/go" export GOPATH="$HOME/.go" export PATH="$GOROOT/bin:$GOPATH/bin:$PATH" +# steam runtime +#export PATH="/opt/steam-runtime/bin:$PATH" + # java 12 #export PATH=/usr/lib/jdk/12/bin:$PATH #export JAVA_HOME=/usr/lib/jdk/12/bin -- 2.45.2