From 23ce47de4bc7dce677b203faa33eb788bfcde7d2 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 13 Nov 2017 15:55:11 -0600 Subject: [PATCH 1/2] Various changes --- apps/neovim/init.vim | 14 +++++++++----- de/sxhkdrc | 3 +++ scripts/arch-linux/provisioning/2-essentials.bash | 3 ++- scripts/bin/murxvt | 4 +++- scripts/bin/wres1080 | 12 ++++++++++++ scripts/bin/wsteam | 4 ++-- shell/bashrc | 3 +++ 7 files changed, 34 insertions(+), 9 deletions(-) create mode 100755 scripts/bin/wres1080 diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 88afc01..18e03a8 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -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 @@ -180,6 +179,7 @@ Plug 'wavded/vim-stylus', {'for': ['styl', 'stylus', 'vue']} 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' &" @@ -198,6 +198,8 @@ filetype on filetype indent on filetype plugin on +let $NVIM_TUI_ENABLE_CURSOR_SHAPE = 1 + " language specific configuration " C @@ -426,7 +428,6 @@ set wrapscan set foldmethod=syntax set foldlevel=99 set foldnestmax=10 -set nofoldenable set foldlevelstart=0 set autowrite @@ -447,6 +448,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") diff --git a/de/sxhkdrc b/de/sxhkdrc index ed1d0c7..49b51f2 100755 --- a/de/sxhkdrc +++ b/de/sxhkdrc @@ -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} diff --git a/scripts/arch-linux/provisioning/2-essentials.bash b/scripts/arch-linux/provisioning/2-essentials.bash index 7b8f2a6..d276c8b 100755 --- a/scripts/arch-linux/provisioning/2-essentials.bash +++ b/scripts/arch-linux/provisioning/2-essentials.bash @@ -36,9 +36,10 @@ pacaur -S \ ttf-font-awesome \ curl \ w3m w3m-img \ + jq \ --noconfirm --noedit -sudo pip3 install neovim +sudo pip3 install neovim jedi mistune psutil setproctitle sudo pip2 install neovim sudo ln -s /usr/bin/google-chrome-unstable /usr/bin/chrome diff --git a/scripts/bin/murxvt b/scripts/bin/murxvt index 43b692b..7668533 100755 --- a/scripts/bin/murxvt +++ b/scripts/bin/murxvt @@ -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" diff --git a/scripts/bin/wres1080 b/scripts/bin/wres1080 new file mode 100755 index 0000000..305ab62 --- /dev/null +++ b/scripts/bin/wres1080 @@ -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" diff --git a/scripts/bin/wsteam b/scripts/bin/wsteam index ea74977..da57a81 100755 --- a/scripts/bin/wsteam +++ b/scripts/bin/wsteam @@ -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 diff --git a/shell/bashrc b/shell/bashrc index 9beb643..b8d0c55 100644 --- a/shell/bashrc +++ b/shell/bashrc @@ -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 From 1ac4eb5de71d5180a536fa527688692f0b9c1a22 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 13 Nov 2017 15:57:25 -0600 Subject: [PATCH 2/2] Add tmux clipboard note --- shell/tmux.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shell/tmux.conf b/shell/tmux.conf index 996948a..434f01b 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -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'