14 files changed,
100 insertions(+),
128 deletions(-)
Author:
Smirnov Alexander
ss2316544@gmail.com
Committed at:
2021-06-07 15:34:40 +0300
Parent:
eb4f1a5
jump to
M
config/bspwm/bspwmrc
··· 42 42 C urgent_border_color "#FF6C6B" 43 43 44 44 #== BSPWM Rules 45 -R kitty desktop='^1' focus=on follow=on 46 -R Google-chrome desktop='^2' focus=on follow=on 47 -R LibreWolf desktop='^2' focus=on follow=on 48 -R Code desktop='^3' focus=on follow=on 49 -R Joplin desktop='^4' focus=on follow=on 50 -R Todoist desktop='^4' focus=on follow=on 51 -R Simplenote desktop='^4' focus=on follow=on 52 -R Nemo desktop='^5' focus=on follow=on 53 -R Zathura desktop='^5' focus=on follow=on state=tiled 54 -R discord desktop='^6' focus=on follow=off 55 -R TelegramDesktop desktop='^6' focus=off follow=on 45 +R kitty desktop='^1' focus=on follow=on 46 +R Google-chrome desktop='^2' focus=on follow=on 47 +R Code desktop='^3' focus=on follow=on 48 +R Simplenote desktop='^4' focus=on follow=on 49 +R Nemo desktop='^5' focus=on follow=on 50 +R Zathura desktop='^5' focus=on follow=on state=tiled 51 +R discord desktop='^6' focus=on follow=off 52 +R TelegramDesktop desktop='^6' focus=off follow=on 56 53 R KeePassXC desktop='^7' focus=on follow=on
M
config/nvim/init.vim
··· 11 11 Plug 'lewis6991/gitsigns.nvim' 12 12 " Theme 13 13 Plug 'Smirnov-O/nten.vim' 14 - " Status line & Buffer line 14 + " Status line && Tab line 15 15 Plug 'hoob3rt/lualine.nvim' 16 16 Plug 'romgrk/barbar.nvim' 17 17 " Better syntax hl 18 18 Plug 'sheerun/vim-polyglot' 19 19 Plug 'norcalli/nvim-colorizer.lua' 20 - " Editor config 21 - Plug 'editorconfig/editorconfig-vim' 22 20 " Other 23 - Plug 'vimwiki/vimwiki' 24 21 Plug 'nvim-lua/plenary.nvim' 25 22 call plug#end() 26 23 27 -colo nvcode 24 +colo codedark 28 25 let mapleader=";" 29 26 30 27 "== Tab(or spaces) 31 28 set ts=4 sw=4 sts=4 32 29 set sta et ai 33 30 34 -"== Vim config 31 +"== Custom commands 32 +com! Prettier :sil !prettier -w % 33 +com! Term :vs|winc L|se nonu nornu|start|term 34 +com! Notes :Files ~/notes 35 +com! GoFmt :sil !gofmt -w % 36 + 37 +"== Configs 35 38 source $HOME/.config/nvim/vimscript/config.vim 36 - 37 -"== Tab line 38 39 source $HOME/.config/nvim/vimscript/barbar.vim 39 - 40 -"== Status line 40 +source $HOME/.config/nvim/vimscript/emmet.vim 41 +source /home/sasha/.config/nvim/vimscript/compe.vim 42 +source $HOME/.config/nvim/vimscript/mappings.vim 43 +luafile $HOME/.config/nvim/lua/n-compe.lua 41 44 luafile $HOME/.config/nvim/lua/n-lualine.lua 42 - 43 -"== File explorer 44 45 luafile $HOME/.config/nvim/lua/n-nvimtree.lua 45 - 46 -"== Git 47 46 luafile $HOME/.config/nvim/lua/n-gitsigns.lua 48 - 49 -"== Emmet 50 -source $HOME/.config/nvim/vimscript/emmet.vim 51 - 52 -"== Colorizer 53 47 luafile $HOME/.config/nvim/lua/n-colorizer.lua 54 48 55 -"== Notes 56 -let g:vimwiki_list = [{'path': '~/notes', 'syntax': 'markdown', 'ext': '.md'}] 57 - 58 -"== Completion(LSP) 59 -ino <expr> <tab> pumvisible() ? "\<C-n>" : "\<tab>" 60 -ino <expr> <s-tab> pumvisible() ? "\<C-p>" : "\<tab>" 61 -ino <expr> <cr> compe#confirm('<CR>') 62 -nno sr :lua vim.lsp.buf.rename()<cr> 63 -nno sh :lua vim.lsp.buf.hover()<cr> 64 -nno si :lua vim.lsp.buf.definition()<cr> 65 -nno sa :lua vim.lsp.buf.code_action()<cr> 66 - 67 -lua << EOF 68 -require'lspconfig'.tsserver.setup{} 69 -require'lspconfig'.gopls.setup{} 70 -require'compe'.setup{ 71 - enabled = true, 72 - autocomplete = true, 73 - source = { 74 - path = true, 75 - buffer = true, 76 - nvim_lsp = true, 77 - } 78 -} 79 -EOF 80 - 81 - 82 49 "== Custom setting for another files 83 -au FileType python,elm setl sw=4 ts=4 84 -au FileType javascript,json,yaml,lua setl sw=2 ts=2 85 -au FileType javascript,vue,html,css,scss :EmmetInstall 86 -au FileType go setl noet sw=4 ts=4 87 - 88 -"== Custom commands 89 -com! Prettier :sil !prettier -w % 90 -com! Term :vs|winc L|se nonu nornu|start|term 91 -com! GoFmt :sil !gofmt -w % 92 - 93 -"== Mapping 94 -source $HOME/.config/nvim/vimscript/mappings.vim 50 +au FileType python,elm setl sw=4 ts=4 sts=2 51 +au FileType javascript,html,vue,jst,pug,css,less,scss,json,yaml,lua setl sw=2 ts=2 sts=2 52 +au FileType go setl noet sw=4 ts=4 sts=2
A
config/nvim/lua/n-compe.lua
··· 1 +require'lspconfig'.tsserver.setup {} 2 +require'lspconfig'.gopls.setup {} 3 +require'lspconfig'.pyls.setup {} 4 + 5 +require'compe'.setup { 6 + enabled = true, 7 + autocomplete = true, 8 + source = { 9 + path = true, 10 + buffer = true, 11 + nvim_lsp = true, 12 + }; 13 +}
M
config/nvim/lua/n-nvimtree.lua
··· 1 1 local S = vim.g 2 2 3 3 -- Settings 4 -S.nvim_tree_side = "right" 5 -S.nvim_tree_ignore = {".git", "node_modules", "venv"} 4 +S.nvim_tree_side = "left" 5 +S.nvim_tree_ignore = {".git", ".cache", "node_modules", "venv"} 6 6 S.nvim_tree_auto_close = 0 7 7 S.nvim_tree_quit_on_open = 0 8 8 S.nvim_tree_width = 24
A
config/nvim/vimscript/compe.vim
··· 1 +" Settings 2 +set completeopt=menuone,noselect 3 + 4 +" Mappings 5 +ino <expr> <tab> pumvisible() ? "\<C-n>" : "\<tab>" 6 +ino <expr> <s-tab> pumvisible() ? "\<C-p>" : "\<tab>" 7 +ino <expr> <cr> compe#confirm('<CR>') 8 +nno sr :lua vim.lsp.buf.rename()<cr> 9 +nno sh :lua vim.lsp.buf.hover()<cr> 10 +nno si :lua vim.lsp.buf.definition()<cr> 11 +nno sa :lua vim.lsp.buf.code_action()<cr>
M
config/nvim/vimscript/emmet.vim
··· 1 -let g:user_emmet_mode = "in" 2 -let g:user_emmet_leader_key=',' 1 +"== Config 2 +let g:user_emmet_mode = "i" 3 +let g:user_emmet_expandabbr_key ='<c-j>' 4 +let g:user_emmet_leader = "," 3 5 let g:user_emmet_settings = { 4 -\ 'javascript': { 5 -\ 'extends': 'jsx' 6 -\ }} 6 +\ 'javascript': {'extends': 'jsx'}} 7 + 8 +"== Auto load 9 +au FileType html,jst,pug,vue,css,less,scss :EmmetInstall
M
config/nvim/vimscript/mappings.vim
··· 1 -nno <C-s> :w<cr> 1 +nno <C-s> :w<cr> 2 2 nno <space> :noh<cr> 3 3 nno <leader>t :Term<cr> 4 4 nno <leader>e :NvimTreeToggle<cr> ··· 8 8 nno <leader>j :bn<cr> 9 9 nno <leader>k :bp<cr> 10 10 11 -" Terminal 12 -tno <esc> <c-\><c-n> 13 -tno <C-h> <c-\><cmd>:winc h<cr> 14 -tno <C-j> <c-\><cmd>:winc j<cr> 15 -tno <C-k> <c-\><cmd>:winc k<cr> 16 -tno <C-l> <c-\><cmd>:winc k<cr> 17 - 18 11 " Split 19 12 nno <C-h> :winc h<cr> 20 13 nno <C-j> :winc j<cr> ··· 25 18 nno sph :sp<cr> 26 19 nno spk :winc K<cr> 27 20 nno spl :winc L<cr> 21 + 22 +" Terminal 23 +tno <esc> <c-\><c-n> 24 +tno <C-h> <c-\><cmd>winc h<cr> 25 +tno <C-j> <c-\><cmd>winc j<cr> 26 +tno <C-k> <c-\><cmd>winc k<cr> 27 +tno <C-l> <c-\><cmd>winc k<cr>
M
tmux.conf
··· 1 -###== General 2 -set -sg escape-time 0 1 +set -sg escape-time 0 # ESC time out 2 +set -g prefix C-a # Prefix 3 +set -g mouse on # Mouse support 3 4 4 -## Set prefix 5 -set -g prefix C-d 6 - 7 -## Set base index 5 +# Set base index 8 6 set -g base-index 1 9 7 set -g pane-base-index 1 10 8 11 -## Mouse support 12 -set -g mouse on 13 -setw -g mouse on 14 - 15 -## 256 color support 16 -set -g default-terminal "screen-256color" 9 +# Colors 17 10 set-option -sa terminal-overrides ",*:Tc" 18 11 19 -###== Keybindongs 20 -## HOME/END key support 21 -bind-key -n Home send Escape "OH" 22 -bind-key -n End send Escape "OF" 23 12 24 -## Reload config 13 +#== Keys 25 14 bind r source-file ~/.tmux.conf \; display 'Reloaded tmux config' 26 15 27 -## Vim keys for change window 16 + 17 +# Change pane 28 18 bind -r h select-pane -L 29 19 bind -r j select-pane -D 30 20 bind -r k select-pane -U 31 21 bind -r l select-pane -R 32 22 33 -## Vim keys for resize window 23 +# Resize pane 34 24 bind -r H resize-pane -L 2 35 25 bind -r J resize-pane -D 2 36 26 bind -r K resize-pane -U 2 37 27 bind -r L resize-pane -R 2 38 28 39 -## Alternative window move 29 +# Window move 40 30 bind-key i swap-window -t -1 41 31 bind-key o swap-window -t +1 42 32 43 -## Alternative keys for create window 33 +## Create window 44 34 bind _ split-window -v 45 35 bind - split-window -h 46 36 47 -## Change focus on last panel 37 +## Change focus on last window 48 38 bind Tab last-window 49 39 50 -###== Status bar 51 -## Items 40 +#== Status bar 52 41 set -g status-right ' #{?client_prefix,*,} #S ' 53 42 set -g status-left ' ' 54 - 55 -## Colors 56 43 set -g status-bg default 57 44 set -g status-fg black 58 45 set -g status-style fg=colour110 59 46 60 -###== Pane border colors 47 +#== Pane border colors 61 48 set -g pane-border-style fg=colour240 62 49 set -g pane-active-border-style fg=colour39 63 50 set-window-option -g window-status-current-style fg=colour39
M
vscode/settings.json
··· 4 4 5 5 "workbench.sideBar.location": "right", 6 6 "workbench.editor.untitled.hint": "hidden", 7 - "workbench.iconTheme": "vs-minimal", 8 7 "workbench.startupEditor": "none", 9 8 10 9 "explorer.compactFolders": false, 11 10 "explorer.confirmDragAndDrop": false, 12 11 "explorer.confirmDelete": false, 13 12 14 - "editor.cursorSmoothCaretAnimation": true, 13 + // "editor.cursorSmoothCaretAnimation": true, 15 14 "editor.fontFamily": "'Jetbrains Mono', monospace", 16 15 "editor.hover.enabled": false, 17 - "editor.lightbulb.enabled": false, 16 + // "editor.lightbulb.enabled": false, 18 17 "editor.minimap.enabled": false, 19 18 "editor.smoothScrolling": true, 20 19 "editor.mouseWheelZoom": true, ··· 28 27 "files.insertFinalNewline": true, 29 28 "files.trimFinalNewlines": true, 30 29 "files.trimTrailingWhitespace": true, 30 + "search.quickOpen.includeHistory": false, 31 31 32 32 "gitlens.codeLens.enabled": true, 33 33 "git.autofetch": true, ··· 35 35 "git.enableSmartCommit": true, 36 36 37 37 "extensions.ignoreRecommendations": true, 38 - 38 + "docker.showStartPage": false, 39 39 "prettier.semi": false, 40 40 41 41 "emmet.includeLanguages": {"javascript": "javascriptreact"}, ··· 47 47 "editor.defaultFormatter": "esbenp.prettier-vscode", 48 48 "editor.tabSize": 2, 49 49 }, 50 + "files.exclude": { 51 + "**/.cache": true, 52 + "**/node_modules": true 53 + }, 54 + 50 55 }
M
zshrc
··· 1 1 ## StartShip 2 -eval "$(starship init zsh)" 2 +#eval "$(starship init zsh)" 3 3 4 4 ## Variables 5 5 export GOPATH="$HOME/go" 6 -export EDITOR="nvim" 7 6 export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$PATH" 7 +export EDITOR="nvim" 8 + 9 +## FZF 10 +export FZF_DEFAULT_COMMAND="fd -t f -E node_modules" 8 11 9 12 ## Oh my zsh 10 -plugins=(dotenv z) 13 +plugins=(dotenv) 11 14 ZSH_THEME="simple" 12 15 source "$HOME/.oh-my-zsh/oh-my-zsh.sh" 13 16 14 17 ## HotKets 15 18 bindkey -s "^o" "ranger\n" 16 -bindkey -s "^e" 'nvim $(fzf)\n' 17 -bindkey -s "^f" 'cd $(fd -t directory | fzf)\n' 18 19 bindkey -s "^g" "lazygit\n" 19 20 20 21 ## FNM 21 22 eval $(fnm env) 23 +eval $(fnm completions) 22 24 23 25 ## Aliases 24 26 alias cls="clear" cp="cp -r" mkdir="mkdir -p"