dotfiles @ 72c267b784cebeba1a75d9f5a815f342bb412b07

M config/bspwm/bspwmrc

@@ -1,4 +1,7 @@
 #!/bin/sh
+# Smirnov-O <ss2316544@gmail.com>
+# BSPWM config file
+
 ###== Functions
 A() {  # AutoStart
   if ! pgrep $1
@@ -16,6 +19,7 @@ A feh --randomize --bg-scale ~/Pictures/wallp &
 A sxhkd -c ~/.config/bspwm/sxhkd &
 A picom -b &
 ~/.config/bspwm/polybar/bar.sh &
+xautolock -time 5 -locker "slock" &
 
 ###== BSPWM
 
@@ -51,4 +55,4 @@ R '*:ranger'       desktop='^5' focus=off follow=off
 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+R Zathura          desktop='^9' focus=on  follow=on  state=tiled

M config/bspwm/sxhkd

@@ -5,29 +5,27 @@ ## == USER keys
 super + {_,shift} Return
     {kitty, rofi -show drun}
 
-super + shift + {w, e, f, c, s, t, q}
+super + shift + {w, e, f, s, t, q}
     {google-chrome-stable,              \
-     kitty --class nvim   -e nvim,      \
-     kitty --class ranger -e ranger,    \
      code,                              \
+     nemo,                              \
      .applications/simplenote.appimage, \
      .applications/todoist.appimage,    \
      xkill                              }
 
 {_,shift,ctrl} Print
-    {scrot -s, scrot, scrot -u}
+    {scrot -s, \
+     scrot,    \
+     scrot -u  }
 
 super + {equal, minus, shift+minus}
-    amixer sset Master {2%+,2%-,toggle}
+    amixer sset Master {2%+, 2%-, toggle}
 
 super + Escape
     .config/rofi/script/powermenu.sh
 
 ### == BSPWM keys
 super + q
-    bspc node -c
-
-alt + F4
     bspc node -c
 
 super + control + r
@@ -35,28 +33,15 @@ bspc wm -r \
     && pkill sxhkd \
     && sxhkd -c ~/.config/bspwm/sxhkd
 
-### == BSPWM windows
 super + {_,shift + } {h,j,k,l}
     bspc node -{f,s} {west,south,north,east}
 
 super + ctrl + {h,j,k,l}
     bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
 
-### === BSPWM window preselect
-super + alt + {h,j,k,l}
-    bspc node -p {west,south,north,east}
-
-super + alt + {1-9}
-    bspc node -o 0.{1-9}
-
-super + alt + {space,0}
-    bspc node -p cancel
-
-## == BSPWM workspace
 super + {_,shift + }{1-9}
     bspc {desktop -f,node -d} focused:'^{1-9}'
 
-## == BSPWM window layouts
 super + shift + {Tab, F11}
     bspc node -t {floating,fullscreen}
 

M config/kitty/kitty.conf

@@ -1,4 +1,5 @@
-font_family   Jetbrains Mono
+font_family   JetBrains Mono
+disable_ligatures always
 font_size     11
 repaint_delay 10
 

M config/nvim/init.vim

@@ -73,11 +73,11 @@ 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! Isort    :silent !isort %
+command! ElmFmt   :silent !elm-format % --yes
 
 
 "== Settings for specific languages
-autocmd FileType python setlocal ex sw=4 ts=4
+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
 
@@ -85,10 +85,6 @@
 "== ALE
 let g:ale_disable_lsp = 1
 let g:ale_echo_msg_format = '%severity%: %s'
-let g:ale_linters = {
-\ 'javascript': ['eslint'],
-\     'python': ['flake8'],
-\ }
 
 
 "== NERDTree
@@ -140,4 +136,4 @@ " Buffers
 nnoremap <leader>j :bnext<CR>
 nnoremap <leader>k :bprev<CR>
 nnoremap <leader>w :bdele<CR>
-nnoremap <leader>b :buffers<CR>+nnoremap <leader>b :buffers<CR>

M config/ranger/rifle.conf

@@ -1,11 +1,8 @@
 # vim: ft=cfg
 #== Websites
-ext x?html?, has firefox,          X, flag f = firefox -- "$@"
-ext x?html?, has qutebrowser,      X, flag f = qutebrowser -- "$@"
-ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
-ext x?html?, has chromium,         X, flag f = chromium -- "$@"
-ext x?html?, has google-chrome,    X, flag f = google-chrome -- "$@"
-ext x?html?, has w3m,              terminal  = w3m "$@"
+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 -- "$@"
 
 #== Misc
 mime ^text,  label editor = ${EDITOR} -- "$@"
@@ -21,13 +18,9 @@ ext js  = node   -- "$1"
 ext sh  = sh     -- "$1"
 
 #== Video/Audio
-mime ^video,       has mpv,      X, flag f = mpv -- "$@"
-mime ^video,       has mpv,      X, flag f = mpv --fs -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -fs -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -fs -- "$@"
-mime ^video|audio, has vlc,      X, flag f = vlc -- "$@"
+mime ^video,       has mpv,  X, flag f = mpv -- "$@"
+mime ^video,       has mpv,  X, flag f = mpv --fs -- "$@"
+mime ^video|audio, has vlc,  X, flag f = vlc -- "$@"
 
 #== Documents
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
@@ -56,26 +49,6 @@ 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
 
-#== Fonts
-mime ^font, has fontforge, X, flag f = fontforge "$@"
-
 #== Terminals
 mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@"
 mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@"
-
-#== Misc
-label wallpaper, number 11, mime ^image, has feh, X = feh --bg-scale "$1"
-label wallpaper, number 12, mime ^image, has feh, X = feh --bg-tile "$1"
-label wallpaper, number 13, mime ^image, has feh, X = feh --bg-center "$1"
-label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1"
-
-#== Generic file openers
-label open, has xdg-open = xdg-open -- "$@"
-label open, has open     = open -- "$@"
-
-              !mime ^text, !ext json|csv|tex|py|rb|js|sh  = ask
-label editor, !mime ^text, !ext json|csv|tex|py|rb|js|sh  = ${EDITOR} -- "$@"
-label pager,  !mime ^text, !ext json|csv|tex|py|rb|js|sh  = "$PAGER" -- "$@"
-mime application/x-executable = "$1"
-label trash, has trash-put = trash-put -- "$@"
-label trash = mkdir -p -- ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash; mv -- "$@" ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash

A config/starship.toml

@@ -0,0 +1,18 @@
+add_newline = false
+
+[line_break]
+disabled = false
+
+[nodejs]
+symbol = "N.JS "
+
+[python]
+symbol = "PY "
+
+[elm]
+symbol = "Elm "
+
+
+[directory]
+truncation_length = 3
+truncate_to_repo = false

M tmux.conf

@@ -59,4 +59,4 @@
 ###== Pane border colors
 set -g pane-border-style fg=colour240
 set -g pane-active-border-style fg=colour39
-set-window-option -g window-status-current-style fg=colour39+set-window-option -g window-status-current-style fg=colour39

M vscode/settings.json

@@ -11,16 +11,17 @@ "editor.formatOnSave": false,
   "editor.minimap.enabled": false,
   "editor.tabCompletion": "on",
   "editor.tabSize": 2,
-
   "explorer.confirmDelete": false,
   "explorer.confirmDragAndDrop": false,
-
   "window.menuBarVisibility": "hidden",
 
   "gitlens.codeLens.enabled": false,
   "git.autofetch": true,
   "git.confirmSync": false,
   "git.enableSmartCommit": true,
+
+  "liveSassCompile.settings.formats": [{"format": "expanded", "extensionName": ".css", "savePath": null}],
+  "liveSassCompile.settings.generateMap": false,
 
   "emmet.includeLanguages": {
     "javascript": "javascriptreact"

M zshrc

@@ -19,4 +19,4 @@ alias vim="nvim"
 alias vi="vim"
 alias tmux="tmux -2"
 alias :q="exit"
-alias ...="cd ../.."+alias ...="cd ../.."