Merge branch 'master' into zsh_migration

This commit is contained in:
Wryn Wagner 2019-12-30 17:42:07 -07:00
commit fb370990fe
14 changed files with 111 additions and 19 deletions

3
bash/latex Normal file
View File

@ -0,0 +1,3 @@
#!/bin/bash
alias tekclean='rm *.aux *.log *.pdf'

17
bash/linux/dmenu_stuff Normal file
View File

@ -0,0 +1,17 @@
#!/bin/bash
# Make a new dmenu shortcut
DMENU_CUSTOM_BIN="$HOME/.local/custom_dmenu";
[ ! -d $DMENU_CUSTOM_BIN ] && mkdir $DMENU_CUSTOM_BIN;
function new_dmenu_command() {
local DMENU_BIN="$HOME/.local/custom_dmenu";
# fail withouut both arguments
[ ! $2 ] && exit 1;
echo "${@:2}"
echo "${@:2}" > $DMENU_BIN/$1 2>/dev/null
chmod +x $DMENU_BIN/$1
}

View File

@ -44,7 +44,7 @@ function rntbranchcleanup() {
rnt $dir >/dev/null 2>/dev/null;
if [ -d .git ]; then
printf " - %s\e[1;34m %s\e[0m..." "clearing repository" "$dir";
git branch -d $(git branch | sed -E "/master|\*/d") >/dev/null 2>/dev/null;
git branch -d $(git branch | sed -E "/master|\*|epic-*/d") >/dev/null 2>/dev/null;
printf "\e[1;32m%s\e[0m\n" " DONE";
else
printf " - \e[1;34m%s\e[1;31m %s\e[0m" "$dir" "is not a git repository";

View File

@ -4,16 +4,16 @@
# -------------------------------------
alias school="cd $SCHOOL_DIR";
alias classes="cat $SCHOOL_DIR/.classes";
alias classes="echo; cat $SCHOOL_DIR/.classes | lolcat; echo";
alias cs5680='school; cd cs5680__computer_vision';
alias compvis='cs5680'
#alias cs5680='school; cd cs5680__computer_vision';
#alias compvis='cs5680'
alias cs5600='school; cd cs5600__intelligent_systems';
alias intsys='cs5600'
alias engr3080='school; cd engr3080__tech_writing';
alias techwrit='engr3080'
alias phil1120='school; cd phil1120__social_ethics';
alias socioet='phil1120'
#alias engr3080='school; cd engr3080__tech_writing';
#alias techwrit='engr3080'
#alias phil1120='school; cd phil1120__social_ethics';
#alias socioet='phil1120'
HW_TEMPLATE="$DOTWRYN/latex/homework_template.tex"

View File

@ -2,8 +2,9 @@
# --- Shortcuts for quick ARANDR switch -----------------------
alias undock="$DOTWRYN/config/xserver/screenlayout/undock.sh";
alias workdock="$DOTWRYN $HOME/.wryn/config/xserver/screenlayout/workdock.sh";
alias workdock="$DOTWRYN/config/xserver/screenlayout/workdock.sh";
alias homedock="$DOTWRYN/config/xserver/screenlayout/homedock_hdmionly.sh";
alias hdmidock="$DOTWRYN/config/xserver/screenlayout/hdmidock.sh";
# --- Note-taking facilitated ---------------------------------
NOTE_PATH='/Users/w0ryn/Documents/notes';

View File

@ -2,7 +2,8 @@
xrandr --output DP-0 --off\
--output DP-1 --off\
--output HDMI-0 --off\
--output DP-3 --off --output DP-4 --off\
--output DP-3 --off\
--output DP-4 --off\
--output DP-2 --primary --mode 2880x1800 --scale 0.8x0.8 --pos 0x0 --rotate normal
ROLL=$(($RANDOM%10));

View File

@ -1,10 +1,25 @@
#!/bin/sh
xrandr --output DP-0 --off\
--output DP-4 --off\
if xrandr | grep -q "DP-0 connected"; then
xrandr \
--output DP-0 --mode 1920x1080 --pos 0x0 --rotate normal --scale 1.5x1.5 --primary\
--output DP-1 --off\
--output DP-2 --mode 2880x1800 --pos 5760x0 --rotate normal --scale 0.8x0.8\
--output DP-3 --off\
--output DP-4 --mode 1920x1080 --pos 2880x0 --rotate normal --scale 1.5x1.5\
--output HDMI-0 --off\
--output DP-1 --mode 1920x1080 --pos 0x0 --rotate normal\
--output DP-2 --mode 2880x1800 --pos 3840x0 --rotate normal --scale 0.8x0.8\
--output DP-3 --mode 1920x1080 --pos 1920x0 --rotate normal
;
else
xrandr \
--output DP-0 --off\
--output HDMI-0 --off\
--output DP-1 --mode 1920x1080 --pos 0x0 --rotate normal --scale 1.5x1.5 --primary\
--output DP-2 --mode 2880x1800 --pos 5760x0 --rotate normal --scale 0.8x0.8\
--output DP-3 --mode 1920x1080 --pos 2880x0 --rotate normal --scale 1.5x1.5\
--output DP-4 --off\
;
fi
ROLL=$(($RANDOM%4));
@ -23,13 +38,13 @@ elif [ $ROLL -eq 1 ]; then
>/dev/null 2>&1
elif [ $ROLL -eq 2 ]; then
feh --bg-fill\
$HOME/Pictures/bg/roy.jpg\
$HOME/Pictures/bg/fe8.jpg\
$HOME/Pictures/bg/micaiah.jpg\
$HOME/Pictures/bg/roy.jpg\
>/dev/null 2>&1
elif [ $ROLL -eq 3 ]; then
feh --bg-fill\
$HOME/Pictures/bg/chrom.jpg\
$HOME/Pictures/bg/chrom.png\
$HOME/Pictures/bg/byleth.jpg\
$HOME/Pictures/bg/link.jpg\
>/dev/null 2>&1

38
tmux/tmux.conf Normal file
View File

@ -0,0 +1,38 @@
# pane switch with vim-like controls
bind -n M-h select-pane -L
bind -n M-j select-pane -D
bind -n M-k select-pane -U
bind -n M-l select-pane -R
set -s escape-time 0
bind -n M-H resize-pane -L 2
bind -n M-J resize-pane -D 2
bind -n M-K resize-pane -U 2
bind -n M-L resize-pane -R 2
# alt tab for window shift
bind-key -n M-Tab next-window
bind-key -n M-BTab previous-window
# alt number for switch
bind-key -n M-1 select-window -t 0
bind-key -n M-2 select-window -t 1
bind-key -n M-3 select-window -t 2
bind-key -n M-4 select-window -t 3
bind-key -n M-5 select-window -t 4
bind-key -n M-6 select-window -t 5
bind-key -n M-7 select-window -t 6
bind-key -n M-8 select-window -t 7
bind-key -n M-9 select-window -t 8
# new window and split pane quickly
bind-key -n M-c new-window
bind-key -n M-v split-window -v
bind-key -n M-b split-window -h
bind-key -n M-q killp
# quick reload
bind-key r source-file ~/.tmux.conf\; display "TMUX CONFIG RELOADED"

View File

@ -2,5 +2,17 @@
iabbrev @@ wagner.wryn@gmail.com
iabbrev ssig <CR>-----------------------<CR>Wryn Wagner<CR>wagner.wryn@gmail.com<CR>(720)557-5443<CR>-----------------------
iabbrev asas // arrange // act // assert
iabbrev aaaa /* arrange */ /* act */ /* assert */
iabbrev apap # arrange # act # assert
iabbrev acac % arrange % act % assert
" -- JAVA -------------------------------------------- {{{
iabbrev psvm public static void main(String[] args) {<CR>}
" }}}
" -- MARKDOWN ---------------------------------------- {{{
iabbrev termdef ## Terms and Definitions<CR>Term \| Definition<CR>--- \| ---<CR>
" }}}
" }}}

View File

@ -38,3 +38,4 @@ Mixpanel
Analytica
Analytica's
backpropagation
literalized

Binary file not shown.

View File

@ -13,5 +13,6 @@ colorscheme moss " BG-Black , FONT-BlueishWhite , SYNTAX-Light
" colorscheme default
" colorscheme snow
set t_Co=256
" transparent background
highlight Normal guibg=NONE ctermbg=NONE

View File

@ -5,6 +5,8 @@ augroup rent_dynamics
autocmd BufRead,BufEnter,BufNewFile */RentDynamics/*.cs setlocal tabstop=2 softtabstop=2 shiftwidth=2
autocmd BufRead,BufEnter,BufNewFile */RentDynamics/*.ts* setlocal tabstop=2 softtabstop=2 shiftwidth=2
autocmd BufRead,BufEnter,BufNewFile */RentDynamics/*.scss setlocal tabstop=2 softtabstop=2 shiftwidth=2
autocmd BufRead,BufEnter,BufNewFile */RentDynamics/*.less setlocal tabstop=2 softtabstop=2 shiftwidth=2
autocmd BufRead,BufEnter,BufNewFile */RentDynamics/*.css setlocal tabstop=2 softtabstop=2 shiftwidth=2
autocmd BufRead,BufEnter,BufNewFile */lead-mgmt-api-v1/* setlocal expandtab
autocmd BufRead,BufEnter,BufNewFile */lead-mgmt-api-v1/*.cs setlocal tabstop=2 softtabstop=2 shiftwidth=2

View File

@ -64,7 +64,8 @@ function! ToggleYCM()
endif
endfunction
nnoremap <C-p> :call ToggleYCM()<CR>
let g:ycm_auto_trigger=0
" STARTS DEACTIVATED
" let g:ycm_auto_trigger=0
" --- ALE ---
let g:ale_linters = {