diff --git a/user-ConEmu.xml b/cmder/user-ConEmu.xml similarity index 99% rename from user-ConEmu.xml rename to cmder/user-ConEmu.xml index 5b2d2a0..bb57f62 100644 --- a/user-ConEmu.xml +++ b/cmder/user-ConEmu.xml @@ -1,7 +1,7 @@ - + @@ -124,11 +124,11 @@ - + - - + + diff --git a/user_aliases.cmd b/cmder/user_aliases.cmd similarity index 100% rename from user_aliases.cmd rename to cmder/user_aliases.cmd diff --git a/cmder/user_profile.cmd b/cmder/user_profile.cmd new file mode 100644 index 0000000..e5966e0 --- /dev/null +++ b/cmder/user_profile.cmd @@ -0,0 +1,19 @@ +:: use this file to run your own startup commands +:: use in front of the command to prevent printing the command + +:: uncomment this to have the ssh agent load when cmder starts +:: call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd" /k exit + +:: uncomment the next two lines to use pageant as the ssh authentication agent +:: SET SSH_AUTH_SOCK=/tmp/.ssh-pageant-auth-sock +:: call "%GIT_INSTALL_ROOT%/cmd/start-ssh-pageant.cmd" + +:: you can add your plugins to the cmder path like so +:: set "PATH=%CMDER_ROOT%\vendor\whatever;%PATH%" + +:: arguments in this batch are passed from init.bat, you can quickly parse them like so: +:: more useage can be seen by typing "cexec /?" + +:: %ccall% "/customOption" "command/program" + +@echo off diff --git a/cmder/user_profile.ps1 b/cmder/user_profile.ps1 new file mode 100644 index 0000000..8ed5b81 --- /dev/null +++ b/cmder/user_profile.ps1 @@ -0,0 +1,41 @@ +# Use this file to run your own startup commands + +## Prompt Customization +<# +.SYNTAX + + λ +.EXAMPLE + N:\Documents\src\cmder [master] + λ | +#> + +[ScriptBlock]$PrePrompt = { + +} + +# Replace the cmder prompt entirely with this. +# [ScriptBlock]$CmderPrompt = {} + +[ScriptBlock]$PostPrompt = { + +} + +## + +# # Delete default powershell aliases that conflict with bash commands +# if (get-command git) { +# del -force alias:cat +# del -force alias:clear +# del -force alias:cp +# del -force alias:diff +# del -force alias:echo +# del -force alias:kill +# del -force alias:ls +# del -force alias:mv +# del -force alias:ps +# del -force alias:pwd +# del -force alias:rm +# del -force alias:sleep +# del -force alias:tee +# } diff --git a/init.vim b/vim/init.vim similarity index 97% rename from init.vim rename to vim/init.vim index 0d00de9..21b893b 100644 --- a/init.vim +++ b/vim/init.vim @@ -1,188 +1,188 @@ -filetype plugin on - -" set rtp+=~/.fzf - -" disable compatability -set nocompatible - -" enable syntax highlighting -syntax enable - -" show relative line numbers -set number relativenumber - -" tabspaces = 4 -set ts=4 - -" indent to the next line -set autoindent - -" expand tabs into spaces -set expandtab - -" when using the >> or << shift lines by 4 spaces -set shiftwidth=4 - -" show visual line under the cursor's current line -set cursorline - -" show the matching part of the pair for [] {} and () -set showmatch - -" Map jk to -inoremap jk - -" Map leader to , -let mapleder = ',' - -" Splitting -" nnoremap "Split down -" nnoremap "Split up -" nnoremap "Split right -" nnoremap "Split left -set splitbelow -set splitright - -" Python Env -" enable all Python syntax highlighting features -let python_highlight_all = 1 -autocmd FileType python set sw=4 -autocmd FileType python set ts=4 -autocmd FileType python set sts=4 -let g:python_host_prog = 'C:\Python27\python' -let g:python3_host_prog = 'C:\Python37\python' - -" Spell Checking -autocmd BufRead,BufNewFile *.md set spell spelllang=en_us - -call plug#begin('~/AppData/Local/nvim/plugged') - Plug 'vim-airline/vim-airline' " Powerline/Airline Styling - Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } " File viewer - Plug 'tpope/vim-unimpaired' " Bracket mapping - Plug 'tpope/vim-scriptease', {'type': 'opt'} " Vim Script Editing - Plug 'jeffkreeftmeijer/vim-numbertoggle' " Toggles relative numbers - Plug 'vim-syntastic/syntastic' " Syntax - Plug 'tpope/vim-surround' " Surrounding pairs mapping - Plug 'ctrlpvim/ctrlp.vim' " Fuzzy File Search - " Plug 'junegunn/fzf.vim', { 'dir': '~/.fzf', 'do': './install --all' } " Fuzzy File Search - Plug 'nathanaelkane/vim-indent-guides' " Indent - Plug 'mklabs/split-term.vim' " Terminal splitting - Plug 'SirVer/ultisnips' " Snippets - Plug 'neomake/neomake' " Linting - Plug 'tpope/vim-commentary' " Comments - - " Git integration - Plug 'tpope/vim-fugitive' - Plug 'airblade/vim-gitgutter' - - " Code Completion - if has('nvim') - Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } - Plug 'zchee/deoplete-jedi' - else - Plug 'Shougo/deoplete.nvim' - Plug 'roxma/nvim-yarp' - Plug 'roxma/vim-hug-neovim-rpc' - Plug 'zchee/deoplete-jedi' - endif - - Plug 'mattn/emmet-vim' " HTML editing - - " Languages - Plug 'pangloss/vim-javascript' " javascript - Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' } " Go - Plug 'vim-ruby/vim-ruby' " Ruby - Plug 'oranget/vim-csharp' " C# - - " Compilers - Plug 'OmniSharp/omnisharp-vim' " C# - - " Frameworks - Plug 'tpope/vim-rails' - -call plug#end() - -" NERDTree -let NERDTreeShowHidden=1 -" Ctrl + f open file directory -map :NERDTreeToggle -" nnoremap :FZF - -" Airline -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#syntastic#enabled = 1 -let g:airline#extensions#syntastic#error_symbol = 'E:' -let g:airline#extensions#syntastic#stl_format_err = '%E{[%e(#%fe)]}' -let g:airline#extensions#syntastic#error_symbol = 'W:' -let g:airline#extensions#syntastic#stl_format_warn = '%W{[%w(#%fw)]}' - -" Syntastic -let g:syntastic_always_populate_loc_list = 1 -let g:syntastic_auto_loc_list = 1 -let g:syntastic_check_on_open = 1 -let g:syntastic_check_on_wq = 0 - -" Deoplete -let g:deoplete#enable_at_startup = 1 - -" OmniSharp -let g:OmniSharp_selector_ui = 'ctrlp' -let g:OmniSharp_server_type = 'roslyn' -let g:OmniSharp_prefer_global_sln = 1 -let g:OmniSharp_timeout = 10 -let g:OmniSharp_highlight_types = 1 -augroup omnisharp_commands - autocmd! - - " When Syntastic is available but not ALE, automatic syntax check on events - " (TextChanged requires Vim 7.4) - " autocmd BufEnter,TextChanged,InsertLeave *.cs SyntasticCheck - - " Show type information automatically when the cursor stops moving - autocmd CursorHold *.cs call OmniSharp#TypeLookupWithoutDocumentation() - - " Update the highlighting whenever leaving insert mode - autocmd InsertLeave *.cs call OmniSharp#HighlightBuffer() - - " Alternatively, use a mapping to refresh highlighting for the current buffer - autocmd FileType cs nnoremap th :OmniSharpHighlightTypes - - " The following commands are contextual, based on the cursor position. - autocmd FileType cs nnoremap gd :OmniSharpGotoDefinition - autocmd FileType cs nnoremap fi :OmniSharpFindImplementations - autocmd FileType cs nnoremap fs :OmniSharpFindSymbol - autocmd FileType cs nnoremap fu :OmniSharpFindUsages - - " Finds members in the current buffer - autocmd FileType cs nnoremap fm :OmniSharpFindMembers - - autocmd FileType cs nnoremap fx :OmniSharpFixUsings - autocmd FileType cs nnoremap tt :OmniSharpTypeLookup - autocmd FileType cs nnoremap dc :OmniSharpDocumentation - autocmd FileType cs nnoremap :OmniSharpSignatureHelp - autocmd FileType cs inoremap :OmniSharpSignatureHelp - - " Navigate up and down by method/property/field - autocmd FileType cs nnoremap :OmniSharpNavigateUp - autocmd FileType cs nnoremap :OmniSharpNavigateDown -augroup END - -" Contextual code actions (uses fzf, CtrlP or unite.vim when available) -nnoremap :OmniSharpGetCodeActions -" Run code actions with text selected in visual mode to extract method -xnoremap :call OmniSharp#GetCodeActions('visual') - -" Rename with dialog -nnoremap nm :OmniSharpRename -nnoremap :OmniSharpRename -" Rename without dialog - with cursor on the symbol to rename: `:Rename newname` -command! -nargs=1 Rename :call OmniSharp#RenameTo("") - -nnoremap cf :OmniSharpCodeFormat - -" Start the omnisharp server for the current solution -nnoremap ss :OmniSharpStartServer -nnoremap sp :OmniSharpStopServer - -" Enable snippet completion +filetype plugin on + +" set rtp+=~/.fzf + +" disable compatability +set nocompatible + +" enable syntax highlighting +syntax enable + +" show relative line numbers +set number relativenumber + +" tabspaces = 4 +set ts=4 + +" indent to the next line +set autoindent + +" expand tabs into spaces +set expandtab + +" when using the >> or << shift lines by 4 spaces +set shiftwidth=4 + +" show visual line under the cursor's current line +set cursorline + +" show the matching part of the pair for [] {} and () +set showmatch + +" Map jk to +inoremap jk + +" Map leader to , +let mapleder = ',' + +" Splitting +" nnoremap "Split down +" nnoremap "Split up +" nnoremap "Split right +" nnoremap "Split left +set splitbelow +set splitright + +" Python Env +" enable all Python syntax highlighting features +let python_highlight_all = 1 +autocmd FileType python set sw=4 +autocmd FileType python set ts=4 +autocmd FileType python set sts=4 +let g:python_host_prog = 'C:\Python27\python' +let g:python3_host_prog = 'C:\Python37\python' + +" Spell Checking +autocmd BufRead,BufNewFile *.md set spell spelllang=en_us + +call plug#begin('~/AppData/Local/nvim/plugged') + Plug 'vim-airline/vim-airline' " Powerline/Airline Styling + Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } " File viewer + Plug 'tpope/vim-unimpaired' " Bracket mapping + Plug 'tpope/vim-scriptease', {'type': 'opt'} " Vim Script Editing + Plug 'jeffkreeftmeijer/vim-numbertoggle' " Toggles relative numbers + Plug 'vim-syntastic/syntastic' " Syntax + Plug 'tpope/vim-surround' " Surrounding pairs mapping + Plug 'ctrlpvim/ctrlp.vim' " Fuzzy File Search + " Plug 'junegunn/fzf.vim', { 'dir': '~/.fzf', 'do': './install --all' } " Fuzzy File Search + Plug 'nathanaelkane/vim-indent-guides' " Indent + Plug 'mklabs/split-term.vim' " Terminal splitting + Plug 'SirVer/ultisnips' " Snippets + Plug 'neomake/neomake' " Linting + Plug 'tpope/vim-commentary' " Comments + + " Git integration + Plug 'tpope/vim-fugitive' + Plug 'airblade/vim-gitgutter' + + " Code Completion + if has('nvim') + Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } + Plug 'zchee/deoplete-jedi' + else + Plug 'Shougo/deoplete.nvim' + Plug 'roxma/nvim-yarp' + Plug 'roxma/vim-hug-neovim-rpc' + Plug 'zchee/deoplete-jedi' + endif + + Plug 'mattn/emmet-vim' " HTML editing + + " Languages + Plug 'pangloss/vim-javascript' " javascript + Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' } " Go + Plug 'vim-ruby/vim-ruby' " Ruby + Plug 'oranget/vim-csharp' " C# + + " Compilers + Plug 'OmniSharp/omnisharp-vim' " C# + + " Frameworks + Plug 'tpope/vim-rails' + +call plug#end() + +" NERDTree +let NERDTreeShowHidden=1 +" Ctrl + f open file directory +map :NERDTreeToggle +" nnoremap :FZF + +" Airline +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#syntastic#enabled = 1 +let g:airline#extensions#syntastic#error_symbol = 'E:' +let g:airline#extensions#syntastic#stl_format_err = '%E{[%e(#%fe)]}' +let g:airline#extensions#syntastic#error_symbol = 'W:' +let g:airline#extensions#syntastic#stl_format_warn = '%W{[%w(#%fw)]}' + +" Syntastic +let g:syntastic_always_populate_loc_list = 1 +let g:syntastic_auto_loc_list = 1 +let g:syntastic_check_on_open = 1 +let g:syntastic_check_on_wq = 0 + +" Deoplete +let g:deoplete#enable_at_startup = 1 + +" OmniSharp +let g:OmniSharp_selector_ui = 'ctrlp' +let g:OmniSharp_server_type = 'roslyn' +let g:OmniSharp_prefer_global_sln = 1 +let g:OmniSharp_timeout = 10 +let g:OmniSharp_highlight_types = 1 +augroup omnisharp_commands + autocmd! + + " When Syntastic is available but not ALE, automatic syntax check on events + " (TextChanged requires Vim 7.4) + " autocmd BufEnter,TextChanged,InsertLeave *.cs SyntasticCheck + + " Show type information automatically when the cursor stops moving + autocmd CursorHold *.cs call OmniSharp#TypeLookupWithoutDocumentation() + + " Update the highlighting whenever leaving insert mode + autocmd InsertLeave *.cs call OmniSharp#HighlightBuffer() + + " Alternatively, use a mapping to refresh highlighting for the current buffer + autocmd FileType cs nnoremap th :OmniSharpHighlightTypes + + " The following commands are contextual, based on the cursor position. + autocmd FileType cs nnoremap gd :OmniSharpGotoDefinition + autocmd FileType cs nnoremap fi :OmniSharpFindImplementations + autocmd FileType cs nnoremap fs :OmniSharpFindSymbol + autocmd FileType cs nnoremap fu :OmniSharpFindUsages + + " Finds members in the current buffer + autocmd FileType cs nnoremap fm :OmniSharpFindMembers + + autocmd FileType cs nnoremap fx :OmniSharpFixUsings + autocmd FileType cs nnoremap tt :OmniSharpTypeLookup + autocmd FileType cs nnoremap dc :OmniSharpDocumentation + autocmd FileType cs nnoremap :OmniSharpSignatureHelp + autocmd FileType cs inoremap :OmniSharpSignatureHelp + + " Navigate up and down by method/property/field + autocmd FileType cs nnoremap :OmniSharpNavigateUp + autocmd FileType cs nnoremap :OmniSharpNavigateDown +augroup END + +" Contextual code actions (uses fzf, CtrlP or unite.vim when available) +nnoremap :OmniSharpGetCodeActions +" Run code actions with text selected in visual mode to extract method +xnoremap :call OmniSharp#GetCodeActions('visual') + +" Rename with dialog +nnoremap nm :OmniSharpRename +nnoremap :OmniSharpRename +" Rename without dialog - with cursor on the symbol to rename: `:Rename newname` +command! -nargs=1 Rename :call OmniSharp#RenameTo("") + +nnoremap cf :OmniSharpCodeFormat + +" Start the omnisharp server for the current solution +nnoremap ss :OmniSharpStartServer +nnoremap sp :OmniSharpStopServer + +" Enable snippet completion " let g:OmniSharp_want_snippet=1 \ No newline at end of file diff --git a/vscode/settings.json b/vscode/settings.json new file mode 100644 index 0000000..609cea4 --- /dev/null +++ b/vscode/settings.json @@ -0,0 +1,89 @@ +{ + "workbench.iconTheme": "material-icon-theme", + "workbench.colorTheme": "Material Theme Darker", + "workbench.activityBar.visible": true, + "workbench.startupEditor": "none", + "terminal.integrated.shell.windows": "C:\\Windows\\System32\\cmd.exe", + "terminal.integrated.shellArgs.windows": [ + "/k", + "%USERPROFILE%\\cmder\\vendor\\init.bat" + ], + "terminal.explorerKind": "integrated", + "terminal.external.windowsExec": "%USERPROFILE%\\cmder\\cmder.exe", + "team.showWelcomeMessage": false, + "mssql.connections": [ + { + "server": "(localdb)\\mssqllocaldb", + "database": "master", + "authenticationType": "Integrated", + "password": "" + } + ], + "git.enableSmartCommit": true, + "git.confirmSync": false, + "git.autofetch": true, + "liveServer.settings.donotShowInfoMsg": true, + "typescript.updateImportsOnFileMove.enabled": "always", + "cSpell.userWords": [ + "AUTORESPONDER", + "Crosstab", + "GIFs", + "HEADEREDITOR", + "HTTPMETHOD", + "HTTPVERSION", + "MKCOL", + "Neovim", + "PARAMEDITOR", + "PROPFIND", + "PROPPATCH", + "Passthrough", + "RAWHEADERS", + "RAWPARAMETERS", + "RAWREQUEST", + "RAWURL", + "Roadmap", + "TRDP", + "TRDX", + "Telerik", + "URLPARAMS", + "Ungroup", + "buttongroup", + "checkmark", + "cmder", + "dropdownlist", + "endregion", + "hacky", + "hbox", + "iexplore", + "kendo", + "keypress", + "keyvalue", + "kvps", + "powerline", + "rawvalue", + "redir", + "repos", + "tabstrip", + "tilix", + "tmux", + "toggleable", + "ungrouped", + "vbox", + "whitelabeling" + ], + "[html]": { + "editor.defaultFormatter": "vscode.html-language-features" + }, + "[json]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[markdown]": { + "editor.fontFamily": "\"IA Writer Duo S\", monospace", + "editor.fontLigatures": true, + "editor.fontSize": 16, + "editor.lineHeight": 26, + "editor.wordWrap": "wordWrapColumn", + "editor.wordWrapColumn": 64, + "editor.quickSuggestions": false, + }, +} \ No newline at end of file