From 6882f885666718471a414d3830d915c34d2ee491 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 5 Jun 2017 22:15:32 -0500 Subject: [PATCH 1/3] XDG user directories, work on vim setup --- apps/neovim/init.vim | 20 +++++++++++++++++++- readme.md | 8 ++++---- setup | 3 +++ shell/user-dirs | 8 ++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 shell/user-dirs diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 78003fd..557e431 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -119,11 +119,26 @@ let g:indent_guides_auto_color = 1 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " autocomplete let g:deoplete#enable_at_startup = 1 +Plug 'SirVer/ultisnips' +Plug 'honza/vim-snippets' +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsEditSplit="vertical" + +Plug 'vimwiki/vimwiki' +let wiki1 = {} +let wiki1.path = "~/../doc/wiki/" +let wiki1.syntax = "markdown" +let wiki1.ext = ".md" +let g:vimwiki_list = [wiki1] + Plug 'scrooloose/syntastic' " syntax checker Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements Plug 'vim-scripts/LargeFile' " gracefully handle very large files Plug 'tpope/vim-commentary' " toggle comments in code easily Plug 'tpope/vim-repeat' " toggle comments in code easily +Plug 'vim-scripts/SyntaxRange' " defined different syntax ranges in a file for highlighting Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions within tmux Plug 'christoomey/vim-tmux-navigator' " allow transitions within tmux Plug 'godlygeek/tabular' " align text lines together @@ -164,7 +179,10 @@ Plug 'mattn/emmet-vim', {'for': ['html']} 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']} +Plug 'plasticboy/vim-markdown', {'for': ['md', 'markdown', 'vimwiki']} +Plug 'vim-scripts/utl.vim' +let g:utl_cfg_hdl_scm_http_system = "silent !$BROWSER '%u#%f' &" + " Plug 'euclio/vim-markdown-composer', { 'do': function('BuildComposer'), 'for': ['md', 'markdown'] } Plug 'digitaltoad/vim-jade', {'for': ['pug', 'jade', 'vue']} Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} diff --git a/readme.md b/readme.md index f0c90ac..683d01a 100644 --- a/readme.md +++ b/readme.md @@ -78,12 +78,12 @@ Here are some bullet points on my workflow as a Web Developer: * Unify all the common variables... somehow? * Dunst and notifications -* Vimux -* urxvt reizing -* urxvt fontawesome +* Vimux? +* terminal on-the-fly font resizing? +* terminal fontawesome/icons? * Alacritty as terminal? * Cloud IRC -* XDG Directories (see [here][xdg-user-dirs]) +* Some kind of notes wiki? (vimwiki with perfect markdown support?) [xdg-user-dirs]: https://wiki.archlinux.org/index.php/XDG_user_directories diff --git a/setup b/setup index 81bb167..148a544 100755 --- a/setup +++ b/setup @@ -82,6 +82,9 @@ links=( # fontconfig "$dfp/de/fontconfig/" "$XDG_CONFIG_HOME/fontconfig" + + # XDG user directories + "$dfp/shell/user-dirs" "$XDG_CONFIG_HOME/user-dirs.dirs" ) source="" diff --git a/shell/user-dirs b/shell/user-dirs new file mode 100644 index 0000000..5cdb600 --- /dev/null +++ b/shell/user-dirs @@ -0,0 +1,8 @@ +XDG_DESKTOP_DIR="$HOME/Destop" +XDG_DOCUMENTS_DIR="$HOME/../doc" +XDG_DOWNLOAD_DIR="$HOME/../dl" +XDG_MUSIC_DIR="$HOME/Music" +XDG_PICTURES_DIR="$HOME/../img" +XDG_PUBLICSHARE_DIR="$HOME/Public" +XDG_TEMPLATES_DIR="$HOME/Templates" +XDG_VIDEOS_DIR="$HOME/Videos" From 80d84aaf23f731bc79f4b94aba0c77788e8d0ca2 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 5 Jun 2017 22:17:31 -0500 Subject: [PATCH 2/3] Remove vimwiki vimwiki doesn't quite flawlessly support markdown (issue #15) --- apps/neovim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 557e431..f6896c5 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -126,7 +126,7 @@ let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" let g:UltiSnipsEditSplit="vertical" -Plug 'vimwiki/vimwiki' +" Plug 'vimwiki/vimwiki' let wiki1 = {} let wiki1.path = "~/../doc/wiki/" let wiki1.syntax = "markdown" From 9c28e4a08016e448644b14454fc81ee453bff9fe Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 5 Jun 2017 22:36:35 -0500 Subject: [PATCH 3/3] Update make_args to run the 'default' job by default --- apps/neovim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index f6896c5..1448bf0 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -227,7 +227,7 @@ endfun autocmd BufWritePre,FileWritePre * :call AutoMakeDirectory() if !exists("g:make_args") - let g:make_args="run" + let g:make_args="default" endif fun! RunMake() split