From 72c267b784cebeba1a75d9f5a815f342bb412b07 Mon Sep 17 00:00:00 2001 From: Smirnov Alexander Date: Sun, 18 Apr 2021 17:26:25 +0300 Subject: [PATCH] Update kitty font, starship config, sxhkd --- config/bspwm/bspwmrc | 6 +++++- config/bspwm/sxhkd | 27 ++++++--------------------- config/kitty/kitty.conf | 3 ++- config/nvim/init.vim | 10 +++------- config/ranger/rifle.conf | 39 ++++++--------------------------------- config/starship.toml | 18 ++++++++++++++++++ tmux.conf | 2 +- vscode/settings.json | 5 +++-- zshrc | 2 +- 9 files changed, 45 insertions(+), 67 deletions(-) create mode 100644 config/starship.toml diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index d352f84..0d6a9e8 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -1,4 +1,7 @@ #!/bin/sh +# Smirnov-O +# 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 \ No newline at end of file +R Zathura desktop='^9' focus=on follow=on state=tiled diff --git a/config/bspwm/sxhkd b/config/bspwm/sxhkd index 8257b80..ce5f816 100644 --- a/config/bspwm/sxhkd +++ b/config/bspwm/sxhkd @@ -5,20 +5,21 @@ 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 @@ -27,36 +28,20 @@ super + Escape super + q bspc node -c -alt + F4 - bspc node -c - super + control + r 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} diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index b6665ce..0c1a286 100644 --- a/config/kitty/kitty.conf +++ b/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 diff --git a/config/nvim/init.vim b/config/nvim/init.vim index ab384ae..2293032 100644 --- a/config/nvim/init.vim +++ b/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 @@ 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' -let g:ale_linters = { -\ 'javascript': ['eslint'], -\ 'python': ['flake8'], -\ } "== NERDTree @@ -140,4 +136,4 @@ noremap :tabn 9 nnoremap j :bnext nnoremap k :bprev nnoremap w :bdele -nnoremap b :buffers \ No newline at end of file +nnoremap b :buffers diff --git a/config/ranger/rifle.conf b/config/ranger/rifle.conf index 1c6d6cc..fdb2239 100644 --- a/config/ranger/rifle.conf +++ b/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 diff --git a/config/starship.toml b/config/starship.toml new file mode 100644 index 0000000..1c657da --- /dev/null +++ b/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 diff --git a/tmux.conf b/tmux.conf index cd7bdcd..f4c31dc 100644 --- a/tmux.conf +++ b/tmux.conf @@ -59,4 +59,4 @@ set -g status-style fg=colour110 ###== 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 \ No newline at end of file +set-window-option -g window-status-current-style fg=colour39 diff --git a/vscode/settings.json b/vscode/settings.json index 037d9ba..1f012fe 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -11,10 +11,8 @@ "editor.minimap.enabled": false, "editor.tabCompletion": "on", "editor.tabSize": 2, - "explorer.confirmDelete": false, "explorer.confirmDragAndDrop": false, - "window.menuBarVisibility": "hidden", "gitlens.codeLens.enabled": false, @@ -22,6 +20,9 @@ "git.confirmSync": false, "git.enableSmartCommit": true, + "liveSassCompile.settings.formats": [{"format": "expanded", "extensionName": ".css", "savePath": null}], + "liveSassCompile.settings.generateMap": false, + "emmet.includeLanguages": { "javascript": "javascriptreact" }, diff --git a/zshrc b/zshrc index 557ec73..807b184 100644 --- a/zshrc +++ b/zshrc @@ -19,4 +19,4 @@ alias vim="nvim" alias vi="vim" alias tmux="tmux -2" alias :q="exit" -alias ...="cd ../.." \ No newline at end of file +alias ...="cd ../.."