12 files changed,
95 insertions(+),
102 deletions(-)
Author:
Smirnov Alexander
ss2316544@gmail.com
Committed at:
2021-04-11 10:56:24 +0300
Parent:
a4eeb45
M
config/amfora/config.toml
··· 1 1 [a-general] 2 -home = "gemini://gus.guru/search" 3 -search = "gemini://gus.guru/search" 4 -http = "default" 2 +home = "gemini://geminispace.info" 3 +search = "gemini://geminispace.info/search" 4 +http = "librewolf" 5 5 color = true 6 6 ansi = true 7 7 bullets = true 8 -auto_redirect = false 9 -emoji_favicons = false 8 +auto_redirect = true 9 +emoji_favicons = true 10 10 left_margin = 0.15 11 11 max_width = 100 12 -downloads = "Downloads" 12 +downloads = "" 13 13 page_max_size = 2097152 14 14 page_max_time = 10 15 15 scrollbar = "auto" ··· 17 17 18 18 [keybindings] 19 19 bind_quit = "q" 20 -bind_reload = "Ctrl-R" 21 -bind_save = "Ctrl-S" 20 +bind_bottom = ["i", ":", ";"] 21 +bind_reload = ["Ctrl-R", "R"] 22 +bind_save = ["Ctrl-S", "W"] 22 23 bind_edit = "I" 23 -bind_bottom = "i" 24 24 25 25 # Navigation 26 -bind_back = "H" 27 -bind_forward = "L" 26 +bind_back = ["H", "h"] 27 +bind_forward = ["L", "l"] 28 28 29 29 # Bookmaeks 30 30 bind_bookmarks = "b" ··· 36 36 bind_next_tab = "J" 37 37 bind_prev_tab = "K" 38 38 39 +[theme] 40 +bg = "#262A2B" 41 +fg = "#dfdfdf" 42 +tab_num = "#797979" 43 +bottombar_text = "#dfdfdf" 44 +bottombar_bg = "#1F2324" 45 +scrollbar = "#1F2324" 46 +btn_bg = "#1F2324" 47 +btn_text = "#dfdfdf" 48 + 39 49 [[mediatype-handlers]] 40 -cmd = ["feh"] 41 -types = ["image"] 50 +cmd = "feh" 51 +types = "image" 42 52 no_prompt = true 43 53 44 54 [cache] ··· 51 61 workers = 3 52 62 update_interval = 1800 53 63 entries_per_page = 20 54 - 55 -[theme] 56 -bg = "#262A2B" 57 -fg = "#dfdfdf" 58 -tab_num = "#797979" 59 -bottombar_text = "#dfdfdf" 60 -bottombar_bg = "#1F2324" 61 -scrollbar = "#1F2324" 62 -btn_bg = "#1F2324" 63 -btn_text = "#dfdfdf" 64 64 65 65 [auth] 66 66 [auth.certs]
M
config/bspwm/bspwmrc
··· 1 1 #!/bin/sh 2 2 ###== Functions 3 -A() { # AutoStart 3 +A() { # AutoStart 4 4 if ! pgrep $1 5 5 then $@& fi 6 6 } 7 -C() { # BSPWM config 7 +C() { # BSPWM config 8 8 bspc config $@ 9 9 } 10 -R() { # BSPWM rule 10 +R() { # BSPWM rule 11 11 bspc rule -a $@ 12 12 } 13 13 ··· 24 24 25 25 # General 26 26 C border_width 2 27 -C window_gap 8 27 +C window_gap 2 28 28 C split_ratio 0.50 29 29 C borderless_monocle true 30 30 C gapless_monocle true ··· 41 41 ###== BSPWM Rules 42 42 R kitty desktop='^1' focus=on follow=on 43 43 R Google-chrome desktop='^2' focus=on follow=on 44 +R LibreWolf desktop='^2' focus=on follow=on 44 45 R Code desktop='^3' focus=on follow=on 45 -R '*:nvim' desktop='^3' focus=on follow=off 46 -R Todoist desktop='^4' focus=on follow=off 46 +R '*:nvim' desktop='^3' focus=on follow=on 47 +R Todoist desktop='^4' focus=on follow=on 47 48 R Joplin desktop='^4' focus=on follow=on 48 49 R Simplenote desktop='^4' focus=on follow=on 49 -R '*:ranger' desktop='^5' focus=on follow=off 50 -R discord desktop='^6' focus=off follow=off 50 +R '*:ranger' desktop='^5' focus=off follow=off 51 +R discord desktop='^6' focus=on follow=off 51 52 R TelegramDesktop desktop='^6' focus=off follow=on 52 -R KeePassXC desktop='^7' focus=on follow=off 53 -R Zathura desktop='^9' focus=on follow=on state=tiled 53 +R KeePassXC desktop='^7' focus=on follow=on 54 +R Zathura desktop='^9' focus=on follow=on state=tiled
M
config/bspwm/polybar/scripts/weather.py
··· 1 -import requests, os 1 +import requests 2 +import os 3 + 2 4 3 5 API_KEY = os.getenv("OWM_POLYBAR") 4 6 CITY = os.getenv("OWM_CITY") 7 + 8 + 5 9 try: 6 10 JSON = requests.get( 7 11 f"http://api.openweathermap.org/data/2.5/weather?q={CITY}&lang=EN&&units=metric&appid={API_KEY}" 8 12 ).json() 9 13 print("", int(JSON["main"]["temp"]), "°С") 10 -except Exception as e: 11 - print(" err") 14 +except Exception: 15 + print(" err")
M
config/kitty/kitty.conf
··· 1 1 font_family Jetbrains Mono 2 +font_size 11 2 3 repaint_delay 10 3 4 4 5 # Cursor ··· 15 16 16 17 # Keyboard Shortcuts 17 18 clear_all_shortcuts yes 18 -open_url_modifiers alt 19 +open_url_modifiers ctrl 19 20 map ctrl+shift+c copy_to_clipboard 20 21 map ctrl+shift+v paste_from_clipboard 21 22 map ctrl+shift+u kitten unicode_input
M
config/nvim/init.vim
··· 1 -call plug#begin("~/.vim/plugged") 1 +call plug#begin('~/.vim/plugged') 2 2 Plug 'Smirnov-O/nten16.vim' 3 3 Plug 'sheerun/vim-polyglot' 4 4 Plug 'jiangmiao/auto-pairs' ··· 17 17 set linebreak wrap 18 18 19 19 " Tabs 20 -set tabstop=4 21 -set shiftwidth=4 22 -set softtabstop=4 20 +set tabstop=2 21 +set shiftwidth=2 22 +set softtabstop=2 23 23 set smarttab 24 24 set expandtab 25 25 set autoindent ··· 61 61 set hidden 62 62 63 63 " Space/tab indicator 64 -set list listchars=tab:\|·,trail:~,extends:>,precedes:<,space:· 64 +set list listchars=tab:\|·,trail:~,space:· 65 65 66 66 " Disable sound 67 67 set visualbell t_vb= ··· 70 70 "== Aliases 71 71 command! W :w 72 72 command! Wq :wq 73 -command! Term :vs|wincmd L|set nonu nornu|startinsert|term 73 +command! Term :vs|wincmd L|set nonu nornu|startinsert|cd %:p:h|term 74 74 command! Prettier :silent !prettier -w % 75 -command! AutoPep8 :silent !autopep8 % --in-place 76 75 command! Black :silent !black % 77 76 command! Isort :silent !isort % 78 -command! GoFmt :silent !gofmt -w % 79 77 80 78 81 79 "== Settings for specific languages 82 80 autocmd FileType python setlocal ex sw=4 ts=4 83 -autocmd FileType go setlocal noex sw=4 ts=4 84 -autocmd FileType javascript,javascriptreact,yaml setlocal et sw=2 ts=2 81 +autocmd FileType javascript,javascriptreact setlocal et sw=2 ts=2 82 +autocmd FileType html,css,json,yaml setlocal ex sw=2 ts=2 85 83 86 84 87 85 "== ALE 88 86 let g:ale_disable_lsp = 1 89 -let g:ale_sign_info = "•" 90 -let g:ale_sign_error = "•" 91 -let g:ale_sign_warning = "•" 92 -let g:ale_sign_style_error = "•" 93 -let g:ale_sign_style_warning = "•" 94 87 let g:ale_echo_msg_format = '%severity%: %s' 95 88 let g:ale_linters = { 96 89 \ 'javascript': ['eslint'], 97 -\ 'python': ['flake8'], 98 -\ 'go': ['golint'] 90 +\ 'python': ['flake8'], 99 91 \ } 100 92 101 93 102 94 "== NERDTree 103 -let NERDTreeIgnore = ["__pycache__", "*.pyc"] 104 95 let g:NERDTreeWinPos = "right" 105 96 let g:NERDTreeMinimalUI = 1 106 97 let g:NERDTreeWinSize = 24 ··· 128 119 nnoremap <C-l> :wincmd l<CR> 129 120 130 121 " Split 131 -nnoremap spv :vsp<CR> 122 +nnoremap spv :vs<CR> 132 123 nnoremap sph :sp<CR> 133 124 nnoremap spk :wincmd K<CR> 134 125 nnoremap spl :wincmd L<CR> ··· 145 136 noremap <A-8> :tabn 8<CR> 146 137 noremap <A-9> :tabn 9<CR> 147 138 148 -" Buffer 139 +" Buffers 149 140 nnoremap <leader>j :bnext<CR> 150 141 nnoremap <leader>k :bprev<CR> 151 -nnoremap <leader>c :bdele<CR> 152 -nnoremap <leader>b :buffers<CR> 153 - 154 -" Working with system clipboard 155 -noremap <leader>c "+y<CR> 156 -noremap <leader>v "+p<CR> 142 +nnoremap <leader>w :bdele<CR> 143 +nnoremap <leader>b :buffers<CR>
M
tmux.conf
··· 17 17 set-option -sa terminal-overrides ",*:Tc" 18 18 19 19 ###== Keybindongs 20 - 21 20 ## HOME/END key support 22 21 bind-key -n Home send Escape "OH" 23 22 bind-key -n End send Escape "OF" ··· 45 44 bind Tab last-window 46 45 47 46 ###== Status bar 47 +## Position 48 +set-option -g status-position top 49 + 50 +## Items 51 +set -g status-right ' #{?client_prefix,*,} #S ' 52 +set -g status-left ' ' 53 + 54 +## Colors 48 55 set -g status-bg black 49 56 set -g status-fg white 50 -set -g status-left ' ' 51 -set -g status-right ' #{?client_prefix,*,} #S ' 52 57 set -g status-style fg=colour110 58 + 59 +###== Pane border colors 53 60 set -g pane-border-style fg=colour240 54 61 set -g pane-active-border-style fg=colour39 55 -set-window-option -g window-status-current-style fg=colour39 62 +set-window-option -g window-status-current-style fg=colour39
M
vscode/settings.json
··· 1 1 { 2 - "workbench.colorTheme": "Cobalt2", 3 - "editor.wordWrap": "off", 2 + "editor.fontFamily": "'Jetbrains Mono', 'Droid Sans Mono', 'monospace'", 3 + "workbench.colorTheme": "Brackets Light Pro", 4 + "workbench.iconTheme": "vs-minimal", 5 + "workbench.sideBar.location": "right", 6 + "editor.wordWrap": "on", 4 7 "editor.fontSize": 14, 5 - "editor.fontFamily": "'Jetbrains Mono', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'", 6 - "workbench.activityBar.visible": true, 7 - "workbench.startupEditor": "newUntitledFile", 8 - "editor.formatOnPaste": true, 8 + "editor.mouseWheelZoom": true, 9 + "editor.formatOnPaste": false, 10 + "editor.formatOnSave": false, 9 11 "editor.minimap.enabled": false, 10 - "explorer.confirmDelete": false, "explorer.confirmDragAndDrop": false, "window.menuBarVisibility": "hidden", 11 - "workbench.sideBar.location": "right", 12 - "workbench.panel.defaultLocation": "right", 13 - "terminal.external.linuxExec": "kitty", 12 + "editor.tabCompletion": "on", 13 + "editor.tabSize": 2, 14 + 15 + "explorer.confirmDelete": false, 16 + "explorer.confirmDragAndDrop": false, 14 17 15 - "editor.tabCompletion": "on", 16 - "editor.tabSize": 4, 17 - "editor.formatOnSave": true, 18 + "window.menuBarVisibility": "hidden", 18 19 20 + "gitlens.codeLens.enabled": false, 19 21 "git.autofetch": true, 20 22 "git.confirmSync": false, 21 23 "git.enableSmartCommit": true, 22 - "gitlens.codeLens.enabled": false, 23 - 24 - "vim.easymotion": true, 25 - "vim.surround": true, 26 - "vim.useSystemClipboard": true, 27 - "vim.normalModeKeyBindings": [{"before": ["f"], "after" : ["leader","leader","s"]}], 28 - 29 - "cSpell.userWords": ["getenv"], 30 24 31 25 "emmet.includeLanguages": { 32 26 "javascript": "javascriptreact" ··· 38 32 "[javascriptreact]": { 39 33 "editor.defaultFormatter": "esbenp.prettier-vscode", 40 34 "editor.tabSize": 2 41 - }, 42 - "[markdown]": { 43 - "editor.wordWrap": "on" 44 35 } 45 -} 36 +}
M
zshrc
··· 1 -export PATH="$HOME/.yarn/bin:$HOME/bin:$HOME/.local/bin:$HOME/go/bin:$HOME/.golang/bin:$PATH" 1 +export PATH="$HOME/bin:$HOME/.local/bin:$PATH" 2 2 export EDITOR="nvim" 3 -export GOPATH="$HOME/go" 3 + 4 +### StartShip 5 +eval "$(starship init zsh)" 4 6 5 7 ### Oh my zsh 6 8 export OMH="$HOME/.oh-my-zsh" 7 -ZSH_THEME="simple" 9 +#ZSH_THEME="simple" 8 10 DISABLE_AUTO_TITLE="true" 9 -plugins=(yarn) 11 +plugins=(npm) 10 12 source $OMH/oh-my-zsh.sh 11 13 12 14 ### Aliases 13 15 alias cls="clear" 14 16 alias mkdir="mkdir -p" 15 17 alias cp="cp -r" 16 -alias du="du -h" 17 18 alias vim="nvim" 18 19 alias vi="vim" 19 20 alias tmux="tmux -2" 20 21 alias :q="exit" 21 -alias ...="cd ../.." 22 +alias ...="cd ../.."