16 files changed,
180 insertions(+),
228 deletions(-)
Author:
Smirnov Alexander
ss2316544@gmail.com
Committed at:
2021-05-10 17:57:51 +0300
Parent:
72c267b
jump to
M
config/bspwm/bspwmrc
@@ -16,10 +16,10 @@ }
###== Autostart A feh --randomize --bg-scale ~/Pictures/wallp & +xautolock -time 5 -locker "slock" & A sxhkd -c ~/.config/bspwm/sxhkd & -A picom -b & ~/.config/bspwm/polybar/bar.sh & -xautolock -time 5 -locker "slock" & +A picom -b & ###== BSPWM@@ -36,10 +36,9 @@ C single_monocle true
C focus_follows_pointer true # Colors -C normal_border_color "#262A2B" +C normal_border_color "#f5f5f5" C active_border_color "#1F2324" C focused_border_color "#008DCD" -C presel_feedback_color "#51AFEF" C urgent_border_color "#FF6C6B" ###== BSPWM Rules@@ -47,12 +46,11 @@ R kitty desktop='^1' focus=on follow=on
R Google-chrome desktop='^2' focus=on follow=on R LibreWolf desktop='^2' focus=on follow=on R Code desktop='^3' focus=on follow=on -R '*:nvim' desktop='^3' focus=on follow=on -R Todoist desktop='^4' focus=on follow=on R Joplin desktop='^4' focus=on follow=on +R Todoist desktop='^4' focus=on follow=on R Simplenote desktop='^4' focus=on follow=on -R '*:ranger' desktop='^5' focus=off follow=off +R Nemo desktop='^5' focus=on follow=on +R Zathura desktop='^5' focus=on follow=on state=tiled R discord desktop='^6' focus=on follow=off R TelegramDesktop desktop='^6' focus=off follow=on R KeePassXC desktop='^7' focus=on follow=on -R Zathura desktop='^9' focus=on follow=on state=tiled
M
config/bspwm/polybar/polybar
@@ -8,6 +8,14 @@ background = #262A2B
foreground = #cfd1dd secondary = #008DCD alert = #FF6C6B +empty = #383a42 + +;[colors] ; Light +;background = #f9f9f9 +;foreground = #5b5b5f +;secondary = #0098dd +;alert = #df631c +;empty = #a0a1a7 [bar/bar] width = 100%@@ -19,7 +27,8 @@ wm-restack = bspwm
font-0 = Iosevka Nerd Font:style=Medium:size=8;3 font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5 modules-left = bspwm archupd -modules-right = pulseaudio keyboard time wifi-signal +modules-center = time wifi-signal +modules-right = pulseaudio keyboard tray-position = right tray-padding = 0@@ -39,7 +48,7 @@ label-urgent =
label-urgent-foreground = ${colors.alert} label-urgent-padding = 2 label-empty = -label-empty-foreground = #58676C74 +label-empty-foreground = ${colors.empty} label-empty-padding = 2 [module/pulseaudio]
M
config/bspwm/sxhkd
@@ -5,12 +5,13 @@ ## == USER keys
super + {_,shift} Return {kitty, rofi -show drun} -super + shift + {w, e, f, s, t, q} +super + shift + {w, e, f, s, t, z, q} {google-chrome-stable, \ code, \ nemo, \ .applications/simplenote.appimage, \ .applications/todoist.appimage, \ + slock, \ xkill } {_,shift,ctrl} Print
M
config/kitty/kitty.conf
@@ -1,12 +1,12 @@
-font_family JetBrains Mono +font_family JetBrains Mono disable_ligatures always -font_size 11 +font_size 11 repaint_delay 10 # Cursor -cursor #dfdfdf -cursor_text_color #7d7d7d -cursor_shape underline +cursor #dfdfdf +cursor_text_color #7d7d7d +cursor_shape underline cursor_underline_thickness 1.3 cursor_blink_interval 0@@ -28,23 +28,25 @@ map ctrl+minus change_font_size all -2.0
map ctrl+backspace change_font_size all 0 # Theming -background_opacity 0.85 -background #262a2b -foreground #ffffff -selection_background #1F2324 -color0 #002731 -color8 #001e26 -color1 #d01b24 -color9 #bd3612 -color2 #728905 -color10 #465a61 -color3 #a57705 -color11 #52676f -color4 #2075c7 -color12 #708183 -color5 #c61b6e -color13 #5856b9 -color6 #0fbcf9 -color14 #4bcffa -color7 #e9e2cb -color15 #fcf4dc +background #f6f6f6 +foreground #2a2b33 +cursor #D8DEE9 + +selection_background #f0ede4 +color0 #000000 +color8 #323232 +color1 #ff3333 +color9 #ff6565 +color2 #86b200 +color10 #b8e532 +color3 #f19618 +color11 #ffc849 +color4 #41a6d9 +color12 #73d7ff +color5 #f07078 +color13 #ffa3aa +color6 #4cbe99 +color14 #7ff0cb +color7 #ffffff +color15 #ffffff +selection_foreground #fafafa
M
config/nvim/init.vim
@@ -1,139 +1,64 @@
call plug#begin('~/.vim/plugged') - Plug 'Smirnov-O/nten16.vim' - Plug 'sheerun/vim-polyglot' + Plug 'Smirnov-O/nten.vim' Plug 'jiangmiao/auto-pairs' - Plug 'scrooloose/nerdtree' - Plug 'w0rp/ale' + Plug 'sheerun/vim-polyglot' call plug#end() "== General -set termguicolors -colorscheme nten16 - -" Line numbers -set nu rnu - -" Line wrap -set linebreak wrap +colo nten-light " Color scheme +set nu rnu " Line numbers +set cursorline " Highlight line by cursor +set linebreak wrap " Line wrap +set mouse=a mousehide " Mouse +set ruler laststatus=0 " Status line +set history=500 " Set history size +set autoread " Auto read file on change +set hidden " Change buffet without warning +set visualbell t_vb= " Disable sounds +set pumheight=8 " Maximum items in pop up +set modeline " Enable modeline +set nobk noswf noudf " Swap files +set is ic scs " Search +set scrolloff=3 +set enc=utf-8 fenc=utf-8 " Encoding +set list listchars=tab:\|·,trail:~,space:· -" Tabs -set tabstop=2 -set shiftwidth=2 -set softtabstop=2 +" Tab +set tabstop=4 +set shiftwidth=4 +set softtabstop=4 set smarttab set expandtab set autoindent -" Status line -set ruler laststatus=0 +"== Netrw file manager +let g:netrw_liststyle=3 +let g:netrw_banner=0 +let g:netrw_dirhistmax=0 -" Maximux item in popup -set pumheight=8 +"== Custom setting for another files +au FileType python,elm setlocal ex sw=4 ts=4 +au FileType javascript,javascriptreact,json,yaml setlocal ex sw=2 ts=2 -" Scroll -set scrolloff=3 - -" Mouse -set mouse=a -set mousehide -set cursorline - -" Encoding -set encoding=utf-8 -set fileencodings=utf-8 - -" Backup file & history -set nobackup noswapfile noundofile -set history=500 - -" Search -set incsearch -set ignorecase -set smartcase - -" Enable mode line -set modeline - -" Auto reload file -set autoread - -" Buffer -set hidden - -" Space/tab indicator -set list listchars=tab:\|·,trail:~,space:· - -" Disable sound -set visualbell t_vb= - - -"== Aliases -command! W :w -command! Wq :wq -command! Term :vs|wincmd L|set nonu nornu|startinsert|cd %:p:h|term -command! Prettier :silent !prettier -w % -command! Black :silent !black % -command! ElmFmt :silent !elm-format % --yes - - -"== Settings for specific languages -autocmd FileType python,elm setlocal ex sw=4 ts=4 -autocmd FileType javascript,javascriptreact setlocal et sw=2 ts=2 -autocmd FileType html,css,json,yaml setlocal ex sw=2 ts=2 - - -"== ALE -let g:ale_disable_lsp = 1 -let g:ale_echo_msg_format = '%severity%: %s' - - -"== NERDTree -let g:NERDTreeWinPos = "right" -let g:NERDTreeMinimalUI = 1 -let g:NERDTreeWinSize = 24 - +"== Custom commands +com! Term :vs|winc L|se nu! rnu!|start|term +com! Prettier :silent !prettier -w % +com! Black :silent !black % +com! ElmFmt :silent !elm-format --yes % +com! GoFmt :silent !gofmt -w % "== Mapping let mapleader=";" - -" NerdTree -nnoremap <leader>e :NERDTreeToggle<CR> - -" Terminal -tnoremap <Esc> <C-\><C-n> -nnoremap <leader>t :Term<CR> - -" Alternative keys -nnoremap <C-s> :w<CR> -nnoremap <C-n> :tabnew<CR> -nnoremap <space> :noh<CR> - -" Window -nnoremap <C-h> :wincmd h<CR> -nnoremap <C-j> :wincmd j<CR> -nnoremap <C-k> :wincmd k<CR> -nnoremap <C-l> :wincmd l<CR> - -" Split -nnoremap spv :vs<CR> -nnoremap sph :sp<CR> -nnoremap spk :wincmd K<CR> -nnoremap spl :wincmd L<CR> - -" Tab -nnoremap tn :tabnew<CR> -noremap <A-1> :tabn 1<CR> -noremap <A-2> :tabn 2<CR> -noremap <A-3> :tabn 3<CR> -noremap <A-4> :tabn 4<CR> -noremap <A-5> :tabn 5<CR> -noremap <A-6> :tabn 6<CR> -noremap <A-7> :tabn 7<CR> -noremap <A-8> :tabn 8<CR> -noremap <A-9> :tabn 9<CR> - -" Buffers -nnoremap <leader>j :bnext<CR> -nnoremap <leader>k :bprev<CR> -nnoremap <leader>w :bdele<CR> -nnoremap <leader>b :buffers<CR> +nn <C-S> :w<cr> +nn <leader>t :Term<cr> +nn <space> :noh<cr> +nn <leader>j :bn<cr> +nn <leader>k :bp<cr> +nn <leader>w :bd<cr> +nn <C-h> :wincmd h<cr> +nn <C-j> :wincmd j<cr> +nn <C-k> :wincmd k<cr> +nn <C-l> :wincmd l<cr> +tno <esc> <c-\><c-n> +nn spv :vs<cr> +nn sph :sp<cr>
M
config/picom.conf
@@ -2,7 +2,7 @@ ########### Shadows ###########
dropdown_menu = { shadow = false; }; popup_menu = { shadow = false; }; utility = { shadow = false; }; -shadow = true; +shadow = false; shadow-radius = 15; shadow-offset-x = -7; shadow-offset-y = -7;
M
config/ranger/rc.conf
@@ -22,29 +22,20 @@ set save_console_history false
set scroll_offset 4 #== Mappings -map @ shell $SHELL +map gc cd ~/code +map gd cd ~/Documents +map gw cd ~/Downloads +map g. cd ~/.dotfiles +map gu cd /mnt/usb -# go to -map gc cd ~/code -map gd cd ~/Documents -map gw cd ~/Downloads -map g. cd ~/.dotfiles -map gu cd /mnt/usb +map @ shell $SHELL +map dD delete +map <c-k> tab_shift 1 +map <c-j> tab_shift -1 +map ee shell gpe enc %s +map ed shell gpe dec %s +map sa shell zip -r archive.zip %s +map ss shell tar -czvf archive.tar.gz %s +map sd shell 7z a archive.7z %s +map se shell extract %s -# delete -map dD delete -map dT trash - -# tab -map <c-k> tab_shift 1 -map <c-j> tab_shift -1 - -# archive -map sa shell zip -r archive.zip %s -map ss shell tar -czvf archive.tar.gz %s -map sd shell 7z a archive.7z %s -map se shell extract %s - -# gpg -map ee shell gpe enc %s -map ed shell gpe dec %s
M
config/ranger/rifle.conf
@@ -1,21 +1,23 @@
-# vim: ft=cfg -#== Websites -ext x?html?, has google-chrome, X, flag f = google-chrome "$@" -ext x?html?, has firefox, X, flag f = firefox -- "$@" -ext x?html?, has qutebrowser, X, flag f = qutebrowser -- "$@" +# vim:ft=cfg + +#== Web +ext x?html?, has google-chrome, X, flag f = google-chrome $@ +ext x?html?, has firefox, X, flag f = firefox -- "$@" + +#== Script +ext py = python -- "$1" +ext js = node -- "$1" +ext sh = bash -- "$1" #== Misc -mime ^text, label editor = ${EDITOR} -- "$@" -mime ^text, label pager = "$PAGER" -- "$@" +#mime ^text, lable editor = $EDITOR -- "$@" +#mime ^text, label pager = $PAGER -- "$@" + + !mime ^text, label editor, ext json|csv|tex|py|rb|js|sh = ${EDITOR} -- "$@" !mime ^text, label pager, ext json|csv|tex|py|rb|js|sh = "$PAGER" -- "$@" name ^[mM]akefile$ = make -#== Scripts -ext py = python -- "$1" -ext rb = ruby -- "$1" -ext js = node -- "$1" -ext sh = sh -- "$1" #== Video/Audio mime ^video, has mpv, X, flag f = mpv -- "$@"@@ -48,7 +50,3 @@ ext zip, has unzip = unzip -l "$1" | less
ext zip, has unzip = for file in "$@"; do unzip -d "${file%.*}" "$file"; done ext rar, has unrar = unrar l "$1" | less ext rar, has unrar = for file in "$@"; do unrar x "$file"; done - -#== Terminals -mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@" -mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@"
M
config/rofi/config
@@ -1,4 +1,4 @@
-rofi.theme: nten +rofi.theme: nten-light rofi.font: Jetbarains Mono 12 rofi.auto-select: false rofi.hide-scrollbar: true
M
config/starship.toml
@@ -1,8 +1,5 @@
add_newline = false -[line_break] -disabled = false - [nodejs] symbol = "N.JS "@@ -12,7 +9,15 @@
[elm] symbol = "Elm " +[java] +disabled = true + +[package] +symbol = "PKG " + +[cmd_duration] +disabled = true [directory] -truncation_length = 3 +truncation_length = 5 truncate_to_repo = false
M
gitconfig
@@ -2,10 +2,16 @@ [user]
name = Smirnov Alexander email = ss2316544@gmail.com +[github] + name = Smirnov-O + [core] editor = nvim [alias] - ada = add -A - cmm = commit -m - br = branch+ ad = add -A + cm = commit -m + br = branch + df = diff + dh = diff HEAD + l = log --oneline --decorate
M
tmux.conf
@@ -36,6 +36,10 @@ bind -r J resize-pane -D 2
bind -r K resize-pane -U 2 bind -r L resize-pane -R 2 +## Alternative window move +bind-key i swap-window -t -1 +bind-key o swap-window -t +1 + ## Alternative keys for create window bind _ split-window -v bind - split-window -h@@ -52,7 +56,7 @@ set -g status-right ' #{?client_prefix,*,} #S '
set -g status-left ' ' ## Colors -set -g status-bg black +set -g status-bg default set -g status-fg white set -g status-style fg=colour110
M
vscode/settings.json
@@ -1,13 +1,13 @@
{ "editor.fontFamily": "'Jetbrains Mono', 'Droid Sans Mono', 'monospace'", "workbench.colorTheme": "Brackets Light Pro", - "workbench.iconTheme": "vs-minimal", + "workbench.panel.defaultLocation": "right", "workbench.sideBar.location": "right", - "editor.wordWrap": "on", + "editor.wordWrap": "off", "editor.fontSize": 14, "editor.mouseWheelZoom": true, "editor.formatOnPaste": false, - "editor.formatOnSave": false, + "editor.formatOnSave": true, "editor.minimap.enabled": false, "editor.tabCompletion": "on", "editor.tabSize": 2,@@ -20,18 +20,21 @@ "git.autofetch": true,
"git.confirmSync": false, "git.enableSmartCommit": true, - "liveSassCompile.settings.formats": [{"format": "expanded", "extensionName": ".css", "savePath": null}], - "liveSassCompile.settings.generateMap": false, + "prettier.semi": false, + + "tabnine.experimentalAutoImports": true, + "emmet.includeLanguages": { "javascript": "javascriptreact" }, "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.tabSize": 2 }, - "[javascriptreact]": { + "[javascriptreact]":{ "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.tabSize": 2 - } -}+ }, + "workbench.startupEditor": "newUntitledFile", + "editor.suggestSelection": "first", + "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", +}
M
zshrc
@@ -1,22 +1,31 @@
-export PATH="$HOME/bin:$HOME/.local/bin:$PATH" +export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.n/bin:$HOME/.golang/bin:$HOME/go/bin:$PATH" +export GOPATH="$HOME/go" export EDITOR="nvim" ### StartShip eval "$(starship init zsh)" +### FzF +export FZF_DEFAULT_COMMAND="rg --files --ignore-vcs" + ### Oh my zsh export OMH="$HOME/.oh-my-zsh" #ZSH_THEME="simple" DISABLE_AUTO_TITLE="true" -plugins=(npm) +plugins=(docker npm) source $OMH/oh-my-zsh.sh ### Aliases +source ~/.aliases.sh + + alias cls="clear" alias mkdir="mkdir -p" alias cp="cp -r" -alias vim="nvim" -alias vi="vim" +alias vim="nvim" vi="vim" +alias e="$EDITOR" alias tmux="tmux -2" alias :q="exit" alias ...="cd ../.." + +