From 00f2b4fd3c5b7662712c678aa11a08c0519141a5 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 15 Nov 2018 09:51:47 -0600 Subject: [PATCH] C# support and slight tmux modifications --- apps/neovim/bindings.vim | 3 +++ apps/neovim/commands.vim | 5 +++++ apps/neovim/plugins.vim | 2 ++ apps/neovim/settings.vim | 2 ++ scripts/bin/cdp | 4 ++++ shell/bash/aliases | 3 --- shell/tmux/tmux.conf | 10 +++++----- 7 files changed, 21 insertions(+), 8 deletions(-) create mode 100755 scripts/bin/cdp diff --git a/apps/neovim/bindings.vim b/apps/neovim/bindings.vim index 042ad10..79f40ba 100644 --- a/apps/neovim/bindings.vim +++ b/apps/neovim/bindings.vim @@ -82,6 +82,9 @@ onoremap ]L :call NextIndent(1, 1, 1, 1) " run make with leader,m nnoremap m :call RunMake() +" show project viewer with leader,n +nnoremap n :call OpenProjectViewer() + " change buffers with leader,tab nnoremap :bnext nnoremap :bprevious diff --git a/apps/neovim/commands.vim b/apps/neovim/commands.vim index e7f67da..ff3921c 100644 --- a/apps/neovim/commands.vim +++ b/apps/neovim/commands.vim @@ -68,6 +68,11 @@ endfun " kill the terminal buffer when the process exits autocmd TermClose * call feedkeys('') +fun! OpenProjectViewer() + let path = system("git rev-parse --show-toplevel | tr -d '\\n'") + execute 'NERDTree' path +endfun + " a toggle-able minimalistic distraction-free text editing mode let s:distractionFreeMode = 0 fun! DistractionFreeModeFunc() diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index 992ac10..5583845 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -51,5 +51,7 @@ Plug 'junegunn/goyo.vim' " better distraction-free editing Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} +Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} Plug 'junegunn/vim-peekaboo' +Plug 'scrooloose/nerdtree' Plug 'tpope/vim-eunuch' diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim index 056ba9b..f30c39b 100644 --- a/apps/neovim/settings.vim +++ b/apps/neovim/settings.vim @@ -39,6 +39,8 @@ highlight clear ALEWarningSign let g:fzf_layout = { 'window': 'enew' } +let g:OmniSharp_server_use_mono = 1 + set completeopt=noinsert,menuone,noselect " fix neovim cursor diff --git a/scripts/bin/cdp b/scripts/bin/cdp new file mode 100755 index 0000000..9dc398d --- /dev/null +++ b/scripts/bin/cdp @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +[ -f "$HOME/.fzf.bash" ] && source "$HOME/.fzf.bash" +$(__fzf_cd__) diff --git a/shell/bash/aliases b/shell/bash/aliases index 4dd17af..fd43712 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -29,9 +29,6 @@ alias cd..="cd .." alias cdd="cd \"\$DOTFILES_PATH\"" # go to dotfiles alias cdc="cd \"\$XDG_CONFIG_HOME\"" # go to alias cdn="cd \"\$NOTES_PATH\"" -function cdp() { - cd "$(dirname "$(fzf)")" || return -} # quick parent-directory aliases alias ..="cd .." diff --git a/shell/tmux/tmux.conf b/shell/tmux/tmux.conf index a65b326..078473c 100644 --- a/shell/tmux/tmux.conf +++ b/shell/tmux/tmux.conf @@ -41,7 +41,7 @@ set -g message-bg colour0 set -g message-fg colour7 # status bar configuration -set-option -g status-position top +set-option -g status-position bottom # set -g status-utf8 on # set -g status-justify right @@ -55,10 +55,10 @@ setw -g window-status-current-bg colour2 setw -g window-status-current-format '' set -g status-interval 5 -set -g status-left-length 80 -set -g status-left "#[fg=colour4]#W#[fg=default]#[bg=default]" -set -g status-right-length 200 -set -g status-right "#[fg=colour7] #(~/.config/dotfiles/scripts/bin/tmux-session-list #S)" +set -g status-right-length 80 +set -g status-right "#[fg=colour4]#W#[fg=default]#[bg=default]" +set -g status-left-length 200 +set -g status-left "#[fg=colour7]#(~/.config/dotfiles/scripts/bin/tmux-session-list #S)" # vim copying setw -g mode-keys vi