Merge branch 'master' of github.com:lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2017-11-14 17:32:58 -06:00
commit c4ba6889a6
8 changed files with 39 additions and 11 deletions

View File

@ -79,7 +79,7 @@ else
let g:prosession_dir = '~/.config/nvim/session/'
endif
" Plug 'vim-airline/vim-airline' " statusline
Plug 'vim-airline/vim-airline' " statusline
let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1 " automatically displays all buffers when there's only one tab open
let g:airline#extensions#tabline#fnamemod = ':t'
@ -116,8 +116,7 @@ Plug 'nathanaelkane/vim-indent-guides' " indentation guides (NOTE: doesn't seem
let g:indent_guides_start_level = 0
let g:indent_guides_auto_color = 1
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " autocomplete
let g:deoplete#enable_at_startup = 1
Plug 'roxma/nvim-completion-manager'
Plug 'SirVer/ultisnips'
Plug 'honza/vim-snippets'
@ -157,7 +156,7 @@ Plug 'tpope/vim-fugitive' " vim git commands
Plug 'michaeljsmith/vim-indent-object' " adds an indentation level text object
Plug 'wellle/targets.vim' " adds some more handy text objects
Plug 'dbakker/vim-projectroot' " adds helper functions for getting to a project's root directory
Plug 'ternjs/tern_for_vim', { 'do': 'npm install' } " javascript helpful things
Plug 'roxma/nvim-cm-tern', { 'do': 'npm install' } " javascript helpful things
Plug 'mikewest/vimroom' " distraction-free editing
Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings
let g:vimroom_sidebar_height = 0
@ -181,6 +180,7 @@ Plug 'quabug/vim-gdscript', {'for': ['gd', 'gdscript']}
Plug 'rust-lang/rust.vim', {'for': ['rs', 'rust']}
Plug 'mustache/vim-mustache-handlebars', {'for': ['html.handlebars', 'handlebars', 'hbs']}
Plug 'plasticboy/vim-markdown', {'for': ['md', 'markdown', 'vimwiki']}
Plug 'lifepillar/pgsql.vim', {'for': ['psql', 'sql']}
Plug 'vim-scripts/utl.vim'
let g:utl_cfg_hdl_scm_http_system = "silent !$BROWSER '%u#%f' &"
@ -199,6 +199,8 @@ filetype on
filetype indent on
filetype plugin on
let $NVIM_TUI_ENABLE_CURSOR_SHAPE = 1
" language specific configuration
" C
@ -427,7 +429,6 @@ set wrapscan
set foldmethod=syntax
set foldlevel=99
set foldnestmax=10
set nofoldenable
set foldlevelstart=0
set autowrite
@ -448,6 +449,9 @@ augroup vimrc
au BufWinEnter * if &fdm == 'indent' | setlocal foldmethod=manual | endif
augroup END
set nofoldenable
setlocal nofoldenable
" jump to last opened position in file except in git commits
let jump_to_pos_blacklist = ['gitcommit']
if has("autocmd")

View File

@ -72,6 +72,9 @@ super + {_,shift + }{1-9,0}
~button1
bspc node -f pointed
super + shift + alt + ctrl + s
wres1080
# # mouse controls for node movement and resizing
# super + button{1-3}
# bspc pointer -g {move,resize_side,resize_corner}

View File

@ -37,10 +37,11 @@ pacaur -S \
ttf-font-awesome `# Icon Font` \
curl `# HTTP Utility` \
w3m w3m-img `# Viewing Images in Terminals` \
jq `# CLI for Interacting with JSON` \
--noconfirm --noedit
# install text editor utilities
sudo pip3 install neovim
# install text editor utilities and other python packages
sudo pip3 install neovim jedi mistune psutil setproctitle
sudo pip2 install neovim
# shortcut for browser

View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
urxvtc -fn "xft:Monaco:pixelsize=16" -letsp -2
font="xft:Monaco:pixelsize=16"
urxvtc -fb "$font" -fi "$font" -fn "$font" -letsp "-1"

12
scripts/bin/wres1080 Executable file
View File

@ -0,0 +1,12 @@
#!/usr/bin/env bash
targetwidth="1920"
targetheight="1080"
dimensions="$(bspc query -T -n | jq '.client.tiledRectangle | .width, .height')"
width=$(echo "$dimensions" | head -n 1)
height=$(echo "$dimensions" | tail -n 1)
diffwidth=$((targetwidth - width))
diffheight=$((targetheight - height))
# bspc node -d
echo "width: ${width}, height ${height}, dw ${diffwidth}, dh ${diffheight}"
bspc node focused --resize bottom_right "$diffwidth" "$diffheight"

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
WIN_STEAM="/storage/games/wine/Program Files (x86)/Steam/Steam.exe"
wine "$WIN_STEAM"
WIN_STEAM="/storage/network/public/Games/wine/Program Files (x86)/Steam/Steam.exe"
wine "$WIN_STEAM" -no-dwrite

View File

@ -43,6 +43,9 @@ source "$DOTFILES_PATH/shell/autocompletions"
# load our key binds
bind -f "$DOTFILES_PATH/shell/inputrc"
# less tab size of 2 spaces
LESS="-x2"
# prevents binds or commands pulling from history from insta-sending, and
# instead places them in the readline for editing
shopt -s histverify

View File

@ -93,7 +93,10 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum'
# highlight with Prefix+[, yank to clipboard with y
# prefix+[ for select mode
# v for visual mode
# yank to clipboard with y
# paste with prefix+]
set -g @plugin 'tmux-plugins/tmux-yank'
set -g @plugin 'tmux-plugins/tmux-copycat'