15 files changed,
129 insertions(+),
92 deletions(-)
Author:
Smirnov Olexandr
ss2316544@gmail.com
Committed at:
2021-01-18 22:04:54 +0200
Parent:
73ebbfb
jump to
M
bin/giti
··· 25 25 } 26 26 27 27 case "$1" in 28 - add|a) shift; add "$@" ;; 29 - del|d) shift; del "$@" ;; 30 - mv) shift; edit "$@" ;; 31 - show|s) shift; show ;; 32 - help) echo "add/a - filename add to ignore" 33 - echo "del/d - filename del from ignore" 34 - echo "mv - oldname newname chage file name" 35 - echo "show/s - show ignore file" 28 + add|a) shift; add "$@" ;; 29 + del|d) shift; del "$@" ;; 30 + mv) shift; edit "$@" ;; 31 + show|s) shift; show ;; 32 + help) echo "add/a - [file name] add to ignore" 33 + echo "del/d - [file name] delete from ignore" 34 + echo "mv - [old new] change file name" 35 + echo "show/s - show ignore file" 36 36 ;; 37 37 *) echo "Command is not valid" ;; 38 38 esac
M
config/alacritty.yml
··· 27 27 x: 1 28 28 y: 0 29 29 30 +cursor: 31 + style: Underline 32 + Underline: 33 + height: 0.5 - 2 34 + 35 + 36 + 30 37 scrolling.history: 1000 31 -cursor.style: Block 32 38 debug.render_timer: false 33 39 draw_bold_text_with_bright_colors: false 34 40 background_opacity: 0.75
M
config/i3/config
··· 20 20 set $browser firefox 21 21 set $filemanager thunar 22 22 set $codeeditor alacritty -e nvim 23 +set $guicode vscodium 23 24 24 25 ############ Autostart ############ 25 26 exec --no-startup-id exec setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" ··· 73 74 bindsym $mod+Shift+w exec $browser 74 75 bindsym $mod+Shift+f exec $filemanager 75 76 bindsym $mod+Shift+e exec $codeeditor 77 +bindsym $mod+Shift+c exec $guicode 76 78 77 79 # Toogle polybar 78 80 bindsym $mod+b exec ~/.script/polybar-toggle
M
config/nvim/UltiSnips/go.snippets
→ config/nvim/snips/go.snippets
··· 1 -snippet pkg "Package" 1 +snippet pac "Package" 2 2 package ${1:main} 3 +$0 3 4 endsnippet 4 5 5 6 snippet import "Import section" ··· 24 25 ) 25 26 endsnippet 26 27 28 +snippet : "Variable" 29 +${1:v} := ${2:value} 30 +endsnippet 31 + 32 +snippet append "Append function" 33 +append(${1:slice}, ${0:value}) 34 +endsnippet 35 + 36 +snippet switch "Switch" 37 +switch ${1:var} { 38 +case ${2:value}: 39 +} 40 +endsnippet 41 + 27 42 snippet const "Constant declaration" 28 43 const ${1:name}${2/(.+)/ /}${2:type} = ${0:value} 29 44 endsnippet ··· 40 55 } 41 56 endsnippet 42 57 58 +snippet map "Map type" 59 +map[${1:keytype}]${2:valuetupe} 60 +$0 61 +endsnippet 62 + 43 63 snippet ;= ";= to :=" 44 -:= $1 64 +:= $0 45 65 endsnippet
M
config/nvim/init.vim
··· 1 1 call plug#begin('~/.vim/plugged') 2 - Plug 'Smirnov-O/nten16.vim' " Color scheme 2 + Plug 'Smirnov-O/nten16.vim' " Color scheme 3 3 Plug 'itchyny/lightline.vim' " Status line 4 4 Plug 'airblade/vim-gitgutter' " Git indicator 5 - Plug 'vimwiki/vimwiki' " Wiki in vim 6 - Plug 'ap/vim-css-color' " CSS color preview 5 + Plug 'preservim/nerdtree' " File viewer 6 + Plug 'ap/vim-css-color' " CSS color preview 7 7 Plug 'mhinz/vim-startify' " Start page 8 - Plug 'voldikss/vim-floaterm' " Terminal floating window 9 - Plug 'kassio/neoterm' " Terminal wrapper 10 - Plug 'editorconfig/editorconfig-vim' " EditorConfig 8 + Plug 'dense-analysis/ale' " Linter 9 + Plug 'editorconfig/editorconfig-vim' " EditorConfig support 11 10 12 11 " Completion & snippets 13 - Plug 'ycm-core/YouCompleteMe' 12 + Plug 'ervandew/supertab' 14 13 Plug 'jiangmiao/auto-pairs' 15 14 Plug 'SirVer/ultisnips' 16 15 17 16 " Programing 18 17 Plug 'metakirby5/codi.vim' 19 - Plug 'sheerun/vim-polyglot' 20 18 Plug 'plasticboy/vim-markdown', {'for': 'markdown'} 21 19 Plug 'vim-python/python-syntax', {'for': 'python'} 22 20 Plug 'fatih/vim-go', {'for': 'go'} 23 - Plug 'nsf/gocode', {'for': 'go'} 24 21 Plug 'PotatoesMaster/i3-vim-syntax', {'for': 'i3'} 25 22 call plug#end() 26 23 ··· 39 36 set showcmd 40 37 41 38 " Mouse 42 -set mouse=a 43 -set mousehide 39 +set mouse=a mousehide 44 40 set cursorline 45 41 46 42 " Encoding ··· 48 44 set fileencodings=utf-8 49 45 50 46 " Line wrap 51 -set nowrap 52 -set nolinebreak 47 +set nowrap nolinebreak 53 48 54 49 " Backup file & history 55 -set nobackup 56 -set noswapfile 50 +set nobackup noswapfile 57 51 set history=100 58 52 59 53 " Reload file ··· 82 76 " Disable sound 83 77 set visualbell t_vb= 84 78 85 -" == Plugins configuration 86 -let g:lightline = { 87 -\ 'colorscheme': 'nten16', 88 -\ 'active': { 89 -\ 'left': [ [ 'mode', 'paste' ], 90 -\ [ 'readonly', 'modified' ] ], 91 -\ 'right': [ [ 'lineinfo' ], 92 -\ [ 'percent' ], 93 -\ [ 'filename', 'filetype' ] ] 94 -\ }, } 95 79 96 -" Markdown 97 -let g:vim_markdown_folding_disabled = 1 98 -let g:vim_markdown_frontmatter=1 99 -let g:markdown_fenced_languages = ['go', 'python', 'bash', 'sh=bash'] 100 - 101 -" VimWiki 102 -let g:vimwiki_list = [{'path': '~/Documents/Notes', 'syntax': 'markdown', 'ext': '.md'}] 103 -"let g:vimwiki_ext2syntax = {".md": "markdown"} 104 -let g:VimWiki_markdown_link_ext = 1 80 +" == Language configuration 105 81 106 82 " Python 83 +autocmd BufWritePre *.py normal m`:%s/\s\+$//e `` 107 84 let g:python_higlight_all = 1 108 - 109 -" Floaterm 110 -let g:floaterm_title = "" 111 -let g:floaterm_wintype = "floating" 112 -let g:floaterm_position = "bottomright" 113 -let g:floaterm_height = 0.4 114 -let g:floaterm_width = 0.5 115 -let g:floaterm_autoclose = 2 116 -nmap <A-t> :FloatermNew<CR> 85 +let g:python_highlight_string_formatting = 1 86 +let g:python_highlight_string_format = 1 87 +let g:python_highlight_doctests = 1 88 +let g:python_highlight_func_calls = 1 89 +let g:python_highlight_class_vars = 1 117 90 118 -" UltiSnipts 119 -let g:UltiSnipsExpandTrigger="<C-a>" 120 -let g:UltiSnipsEditSplit="vertical" 121 -let g:UltiSnipsJumpForwardTrigger="<C-a>" 122 -let g:UltiSnipsJumpBackwardTrigger="<C-s>" 91 +" Markdown 92 +let g:vim_markdown_folding_disabled = 1 93 +let g:vim_markdown_frontmatter = 1 94 +let g:markdown_fenced_languages = ['go', 'python', 'bash', 'sh=bash'] 123 95 124 96 " Go 125 97 let g:go_template_autocreate = 0 ··· 129 101 let g:go_highlight_operators = 1 130 102 let g:go_highlight_build_constraints = 1 131 103 let g:go_snippet_engine = "" 104 +let g:go_fmt_command = "goimports" 105 +let g:go_auto_type_info = 1 106 + 107 + 108 +" == Plugins configuration 109 +let g:lightline = { 110 +\ 'colorscheme': 'nten16', 111 +\ 'active': { 112 +\ 'left': [ [ 'mode', 'paste' ], 113 +\ [ 'readonly', 'modified' ] ], 114 +\ 'right': [ [ 'lineinfo' ], 115 +\ [ 'percent' ], 116 +\ [ 'filename', 'filetype' ] ] 117 +\ }, } 118 + 119 +" UltiSnipts 120 +let g:UltiSnipsExpandTrigger = "<tab>" 121 +let g:UltiSnipsEditSplit = "vertical" 122 +let g:UltiSnipsJumpForwardTrigger = "<tab>" 123 +let g:UltiSnipsJumpBackwardTrigger = "<C-tab>" 124 +let g:UltiSnipsSnippetDirectories = ["snips"] 132 125 133 126 " Startify 134 127 let g:startify_custom_header = [ ··· 144 137 145 138 " == Mapping 146 139 let mapleader="," 140 + 141 +" exit from insert mode 142 +im jj <esc> 147 143 148 144 " window(s) 149 145 nmap <C-h> :wincmd h<CR>
M
config/polybar/scripts/weather.py
··· 9 9 10 10 11 11 try: JSON = requests.get(f"http://api.openweathermap.org/data/2.5/weather?q={CITY}&lang=EN&&units=metric&appid={API_KEY}").json() 12 -except Exception as e: print("No connection ") 12 +except Exception as a: print("No connection ") 13 13 try: 14 - if JSON['weather'][0]['main'] == "Clear": print("", int(JSON["main"]["temp"]),"°С") 14 + if JSON['weather'][0]['main'] == "Clear": print("", int(JSON["main"]["temp"]),"°С") 15 15 elif JSON['weather'][0]['main'] == "Thunderstorm": print("", int(JSON["main"]["temp"]),"°С") 16 - elif JSON['weather'][0]['main'] == "Drizzle": print("", int(JSON["main"]["temp"]),"°С") 16 + elif JSON['weather'][0]['main'] == "Drizzle": print("", int(JSON["main"]["temp"]),"°С") 17 17 elif JSON['weather'][0]['main'] == "Rain": print("", int(JSON["main"]["temp"]),"°С") 18 18 elif JSON['weather'][0]['main'] == "Snow": print("", int(JSON["main"]["temp"]),"°С") 19 19 elif JSON['weather'][0]['main'] == "Mist": print("", int(JSON["main"]["temp"]),"°С")
M
config/qtile/autostart.sh
··· 1 1 #!/bin/sh 2 2 xautolock -time 5 -locker "betterlockscreen --off 300 -t \"Computer is lockerd\" -l" & 3 3 setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" & 4 -/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & 5 4 nitrogen --restore & 6 -picom --experimental-backends -b & 5 +lxsession & 6 +picom -b &
M
config/qtile/config.py
··· 10 10 11 11 terminal = "alacritty" 12 12 browser = "firefox" 13 -filemanager = "thunar" 13 +filemanager = f"{terminal} -e ranger" 14 14 editor = "alacritty -e nvim" 15 15 16 16 color = [ ··· 53 53 Key([mod], "q", 54 54 lazy.window.kill(), 55 55 desc="Kill focused window" 56 + ), 57 + Key([mod, "shift"], "Tab", 58 + lazy.window.toggle_floating(), 59 + desc="Toggle floating mode" 56 60 ), 57 61 Key([mod], "h", 58 62 lazy.layout.left(), ··· 204 208 205 209 # Window layout(s) 206 210 layout_theme = { 207 - "border_width": 1, 211 + "border_width": 2, 208 212 "margin": 2, 209 213 "border_focus": color[2], 210 - "border_normal": color[1], 214 + "border_normal": color[3], 211 215 "font": "Jatbrains Mono" 212 216 } 213 217 layouts = [ ··· 230 234 widget_defaults = dict( 231 235 font="Jatbrains Mono", 232 236 fontsize=12, 233 - padding=5, 237 + padding=4, 234 238 foreground=color[0], 235 239 background=color[3], 236 240 )
M
config/ranger/rc.conf
··· 130 130 131 131 # Go keys 132 132 map gh cd ~ 133 -map gc cd ~/Code 134 -map gd cd ~/Documents 135 -map gb cd ~/Documents/Books 133 +map gc cd ~/code 134 +map gd cd ~/docs 135 +map gb cd ~/docs/books 136 136 map gm cd ~/.dotfiles 137 137 map gn cd ~/bin 138 -map gz cd ~/.script 138 +map gs cd ~/.script 139 +map gv cd ~/virt 140 +map gw cd ~/downl 139 141 140 142 # Console 141 143 map : console ··· 194 196 map <RIGHT> move right=1 195 197 map <HOME> move to=0 196 198 map <END> move to=-1 197 -map <PAGEDOWN> move down=1 pages=True 198 -map <PAGEUP> move up=1 pages=True 199 +map <PAGEDOWN> move down=1 pages=True 200 +map <PAGEUP> move up=1 pages=True 199 201 map <CR> move right=1 200 202 map <DELETE> console delete 201 203 map <INSERT> console touch%space ··· 290 292 map zd set sort_directories_first! 291 293 map zh set show_hidden! 292 294 map <C-h> set show_hidden! 293 -copymap <C-h> <backspace> 294 -copymap <backspace> <backspace2> 295 +copymap <C-h> <backspace> 296 +copymap <backspace> <backspace2> 295 297 map zI set flushinput! 296 298 map zi set preview_images! 297 299 map zm set mouse_enabled!
M
config/ranger/rifle.conf
··· 22 22 ext x?html?, has iceweasel, X, flag f = iceweasel -- "$@" 23 23 ext x?html?, has epiphany, X, flag f = epiphany -- "$@" 24 24 ext x?html?, has konqueror, X, flag f = konqueror -- "$@" 25 -ext x?html?, has elinks, terminal = elinks "$@" 26 -ext x?html?, has links2, terminal = links2 "$@" 27 -ext x?html?, has links, terminal = links "$@" 28 -ext x?html?, has lynx, terminal = lynx -- "$@" 29 -ext x?html?, has w3m, terminal = w3m "$@" 25 +ext x?html?, has elinks, terminal = elinks "$@" 26 +ext x?html?, has links2, terminal = links2 "$@" 27 +ext x?html?, has links, terminal = links "$@" 28 +ext x?html?, has lynx, terminal = lynx -- "$@" 29 +ext x?html?, has w3m, terminal = w3m "$@" 30 30 31 31 ######### 32 32 ### Misc ··· 47 47 ### Scripts 48 48 ############ 49 49 ext py = python -- "$1" 50 -ext pl = perl -- "$1" 51 -ext rb = ruby -- "$1" 52 -ext js = node -- "$1" 53 -ext sh = sh -- "$1" 54 -ext php = php -- "$1" 50 +ext pl = perl -- "$1" 51 +ext rb = ruby -- "$1" 52 +ext js = node -- "$1" 53 +ext go = go -- "$1" 54 +ext sh = sh -- "$1" 55 +ext php = php -- "$1" 55 56 56 57 #################### 57 58 ### Audio without X ··· 169 170 ############################## 170 171 ### Flag t fallback terminals 171 172 ############################## 173 +mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@" 172 174 mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@" 173 175 mime ^ranger/x-terminal-emulator, has xfce4-terminal = xfce4-terminal -x "$@" 174 176 mime ^ranger/x-terminal-emulator, has terminology = terminology -e "$@" ··· 177 179 mime ^ranger/x-terminal-emulator, has lxterminal = lxterminal -e "$@" 178 180 mime ^ranger/x-terminal-emulator, has gnome-terminal = gnome-terminal -- "$@" 179 181 mime ^ranger/x-terminal-emulator, has sakura = sakura -e "$@" 180 -mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@" 181 182 mime ^ranger/x-terminal-emulator, has lilyterm = lilyterm -e "$@" 182 183 mime ^ranger/x-terminal-emulator, has termite = termite -x '"$@"' 183 184 mime ^ranger/x-terminal-emulator, has yakuake = yakuake -e "$@" ··· 203 204 label open, has xdg-open = xdg-open -- "$@" 204 205 label open, has open = open -- "$@" 205 206 206 - !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ask 207 207 label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ${VISUAL:-$EDITOR} -- "$@" 208 208 label pager, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@" 209 209
M
zshrc
··· 1 1 export ZSH="$HOME/.oh-my-zsh" 2 -export PATH="$HOME/bin:$HOME/.local/bin:$PATH" 2 +export PATH="$HOME/bin:$HOME/.local/bin:$GOPATH/bin:$PATH" 3 3 source ~/.profile 4 4 5 5 ### Oh my zsh ### ··· 16 16 export UPDATE_ZSH_DAYS=7 # Change how often to auto-update. 17 17 export LANG=en_US.UTF-8 # Set locale 18 18 19 -plugins=(pip python golang pass emacs sudo heroku git taskwarrior encode64) 19 +plugins=(pip python golang pass sudo heroku vi-mode git encode64) 20 20 source $ZSH/oh-my-zsh.sh 21 21 22 22 23 +### Vim mode ### 24 +VI_MODE_RESET_PROMPT_ON_MODE_CHANGE=true 25 +VI_MODE_SET_CURSOR=true 26 +MODE_INDICATOR="%F{cyan}+%f" 27 + 23 28 ### Variables ### 24 29 export EDITOR="nvim" 25 30 export VISUAL="nvim" 26 -export GOPATH="$HOME/Go" 31 +export GOPATH="$HOME/go" 27 32 28 33 ### Function ### 29 34 function bgcolor { ··· 33 38 function codi() { 34 39 local syntax="${1:-python}" 35 40 nvim -c "let g:startify_disable_at_vimenter = 1 |\ 41 + set bt=nofile ls=0 noru nonu nornu |\ 36 42 Codi $syntax" "$@" 37 43 } 38 44 ··· 52 58 alias vi="nvim" 53 59 alias tmux="tmux -2" 54 60 alias ipython="ipython --no-banner" 61 +alias ran="ranger" 55 62 56 63 # Exit 57 64 alias :q="exit"