Update git, tmux, vscode, nvim, update bin's, openbox

bin/extract

@@ -1,18 +0,0 @@
-#!/bin/sh
-case "$1" in
-    *.tar.bz2)   tar xjf $1            ;;
-    *.tar.gz)    tar xzf $1            ;;
-    *.bz2)       bunzip2 $1            ;;
-    *.rar)       unrar x $1            ;;
-    *.gz)        gunzip $1             ;;
-    *.tar)       tar xf $1             ;;
-    *.tbz2)      tar xjf $1            ;;
-    *.tgz)       tar xzf $1            ;;
-    *.zip)       unzip $1              ;;
-    *.Z)         uncompress $1         ;;
-    *.7z)        7z x $1               ;;
-    *.deb)       ar x $1               ;;
-    *.tar.xz)    tar xf $1             ;;
-    *.tar.zst)   unzstd $1             ;;
-    *) echo "'$1' is not a valid file" ;;
-esac

config/alacritty.yml

@@ -1,73 +0,0 @@
-window:
-  title: Alacritty
-  class:
-    instance: Alacritty
-    general: Alacritty
-  padding:
-    x: 0
-    y: 0
-
-font:
-  antialias: lcd
-  hinting: true
-  size: 10.0
-  normal:
-    family: JetBrains Mono
-    style: Regular
-  bold:
-    family: JetBrains Mono
-    style: Bold
-  italic:
-    family: JetBrains Mono
-    style: Italic
-  bold_italic:
-    family: JetBrains Mono
-    style: Bold Italic
-  offset:
-    x: 1
-    y: 0
-
-cursor:
-  style: Underline
-  Underline:
-    height: 0.5 - 2
-
-scrolling.history: 1000
-debug.render_timer: false
-#draw_bold_text_with_bright_colors: false
-draw_bold_text_with_bright_colors: true
-background_opacity: 0.75
-dynamic_title: false
-
-colors:
-  primary:
-    background: "0x262A2B"
-    foreground: "0xFFFFFF"
-  cursor:
-    text: "0x7D7D7D"
-    cursor: "0xDFDFDF"
-  selection:
-    text: "0xEDEBD7"
-    background: "0x262A3B"
-  normal:
-    black: "0x181818"
-    red: "0xab4642"
-    green: "0xa1b56c"
-    yellow: "0xf7ca88"
-    blue: "0x7cafc2"
-    magenta: "0xba8baf"
-    cyan: "0x86c1b9"
-    white: "0xd8d8d8"
-  bright:
-    black: "0x585858"
-    red: "0xab4642"
-    green: "0xa1b56c"
-    yellow: "0xf7ca88"
-    blue: "0x7cafc2"
-    magenta: "0xba8baf"
-    cyan: "0x86c1b9"
-    white: "0xf8f8f8"
-
-key_bindings:
-  - { key: V, mods: Control|Shift, action: Paste }
-  - { key: C, mods: Control|Shift, action: Copy }

config/dunst/dunstrc

@@ -26,21 +26,10 @@
     hide_duplicate_count = false
     show_indicators = yes
     icon_position = off
-    max_icon_size = 32
-    icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-    sticky_history = yes
-    history_length = 20
-    dmenu = /usr/bin/dmenu -p dunst:
-    browser = /usr/bin/firefox -new-tab
     always_run_script = true
-    title = Dunst
-    class = Dunst
     startup_notification = false
     force_xinerama = false
 
-[experimental]
-    per_monitor_dpi = false
-
 [shortcuts]
     close =
     close_all =
@@ -62,6 +51,3 @@
     foreground = "#FFFFFF"
     frame_color = "#e3788f"
     timeout = 0
-
-[Spotify]
-    appname = Spotify

config/nvim/init.vim

@@ -1,17 +1,16 @@
 call plug#begin('~/.vim/plugged')
   Plug 'Smirnov-O/nten16.vim'
   Plug 'sheerun/vim-polyglot'
-  Plug 'maxboisvert/vim-simple-complete'
   Plug 'jiangmiao/auto-pairs'
 call plug#end()
 
 "== General
-" Appearance
 set termguicolors
 colorscheme nten16
 
 " Line numbers
-set nu rnu
+set number
+set relativenumber
 
 " Line wrap
 set nolinebreak
@@ -29,8 +28,14 @@ set autoindent
 set laststatus=0
 set ruler
 
+" Folding
+set foldmethod=manual
+
+" Maximux item in popup
+set pumheight=9
+
 " Scroll
-set scrolloff=3
+set scrolloff=4
 
 " Mouse
 set mouse=a
@@ -42,7 +47,7 @@ set encoding=utf-8
 set fileencodings=utf-8
 
 " Backup file & history
-set nobackup noswapfile
+set nobackup noswapfile noundofile
 set history=500
 
 " Search
@@ -67,31 +72,30 @@ set visualbell t_vb=
 
 
 "== Settings for specific files
-autocmd BufWritePre *.py normal m`:%s/\s\+$//e `
+autocmd FileType python,go,json setlocal et sw=4 ts=4
-autocmd FileType python,go,json setlocal expandtab shiftwidth=4 tabstop=4
+autocmd FileType html,css,javascript,javascriptreact,yaml setlocal et sw=2 ts=2
-autocmd FileType html,css,javascript,javascriptreact,yaml setlocal expandtab shiftwidth=2 tabstop=2
 
 
 "== Aliases
-command! W  :w
+command! W :w
 command! WQ :wq
 command! Wq :wq
 command! Wiki :e ~/doc/index.md
 command! Prettier :!prettier % --write
-command! ESlint   :!eslint %
+command! ESlint :!eslint %
-command! Flake8   :!flake8 %
+command! Flake8 :!flake8 %
-command! Black    :!black %
+command! Black :!black %
 command! AutoPep8 :!autopep8 % --in-place
 
 
 "== Mapping
-let mapleader="'"
+let mapleader=";"
 
 " Alternative keys
-noremap <C-s>   :w<CR>
+noremap <C-s>     :w<CR>
-noremap <C-n>   :tabnew<CR>
+noremap <C-n>     :tabnew<CR>
-noremap <C-f>   :find<Space>
+noremap <space>   :nohl<CR>
-noremap <space> :nohl<CR>
+noremap <C-space> zc
 
 " Window
 noremap <C-h> :wincmd h<CR>
@@ -106,8 +110,8 @@ noremap spk :wincmd K<CR>
 noremap spl :wincmd L<CR>
 
 " Tab
-noremap tn    :tabnew<CR>
+noremap tn :tabnew<CR>
-noremap tc    :tabclose<CR>
+noremap tc :tabclose<CR>
 noremap <A-1> :tabn 1<CR>
 noremap <A-2> :tabn 2<CR>
 noremap <A-3> :tabn 3<CR>
@@ -125,3 +129,6 @@ noremap <leader>k :bprev<CR>
 " Work with system clipboard
 noremap <leader>c "*yy<CR>
 noremap <leader>v "+p<CR>
+
+" Kill terminal
+tnoremap <Esc> <C-\><C-n> :q<CR>

config/openbox/tint2rc

@@ -227,8 +227,8 @@ execp_markup = 1
 execp_lclick_command = $HOME/.config/openbox/script/volume mute
 execp_rclick_command = 
 execp_mclick_command = 
-execp_uwheel_command = $HOME/.config/openbox/.script/volume up
+execp_uwheel_command = $HOME/.config/openbox/script/volume up
-execp_dwheel_command = $HOME/.config/openbox/.script/volume down
+execp_dwheel_command = $HOME/.config/openbox/script/volume down
 execp_font = Droid Sans Bold 8
 execp_font_color = #d1d1d1 100
 execp_padding = 8 0

config/picom.conf

@@ -7,8 +7,6 @@ shadow-radius = 15;
 shadow-offset-x = -7;
 shadow-offset-y = -7;
 shadow-exclude = [
-  "override_redirect",
-  "class_g = 'Firefox' && argb",
   "class_g = 'Tint2'"
 ];
 
@@ -26,7 +24,6 @@ frame-opacity = 1;
 inactive-opacity-override = false;
 no-fading-openclose = true
 
-
 ####### General Settings ######
 backend = "glx";
 vsync = true;

config/ranger/rifle.conf

@@ -1,213 +0,0 @@
-#############
-### Websites
-#############
-ext x?html?, has qutebrowser,      X, flag f = qutebrowser -- "$@"
-ext x?html?, has firefox,          X, flag f = firefox -- "$@"
-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 surf,             X, flag f = surf -- file://"$1"
-ext x?html?, has vimprobable,      X, flag f = vimprobable -- "$@"
-ext x?html?, has vimprobable2,     X, flag f = vimprobable2 -- "$@"
-ext x?html?, has dwb,              X, flag f = dwb -- "$@"
-ext x?html?, has jumanji,          X, flag f = jumanji -- "$@"
-ext x?html?, has luakit,           X, flag f = luakit -- "$@"
-ext x?html?, has uzbl,             X, flag f = uzbl -- "$@"
-ext x?html?, has uzbl-tabbed,      X, flag f = uzbl-tabbed -- "$@"
-ext x?html?, has uzbl-browser,     X, flag f = uzbl-browser -- "$@"
-ext x?html?, has uzbl-core,        X, flag f = uzbl-core -- "$@"
-ext x?html?, has midori,           X, flag f = midori -- "$@"
-ext x?html?, has opera,            X, flag f = opera -- "$@"
-ext x?html?, has seamonkey,        X, flag f = seamonkey -- "$@"
-ext x?html?, has iceweasel,        X, flag f = iceweasel -- "$@"
-ext x?html?, has epiphany,         X, flag f = epiphany -- "$@"
-ext x?html?, has konqueror,        X, flag f = konqueror -- "$@"
-ext x?html?, has elinks,           terminal = elinks "$@"
-ext x?html?, has links2,           terminal = links2 "$@"
-ext x?html?, has links,            terminal = links "$@"
-ext x?html?, has lynx,             terminal = lynx -- "$@"
-ext x?html?, has w3m,              terminal = w3m "$@"
-
-#########
-### Misc
-#########
-mime ^text,  label editor = ${VISUAL:-$EDITOR} -- "$@"
-mime ^text,  label pager  = "$PAGER" -- "$@"
-!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php = ${VISUAL:-$EDITOR} -- "$@"
-!mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
-
-ext 1                         = man "$1"
-ext s[wmf]c, has zsnes, X     = zsnes "$1"
-ext s[wmf]c, has snes9x-gtk,X = snes9x-gtk "$1"
-ext nes, has fceux, X         = fceux "$1"
-ext exe                       = wine "$1"
-name ^[mM]akefile$            = make
-
-############
-### Scripts
-############
-ext py  = python -- "$1"
-ext pl  = perl   -- "$1"
-ext rb  = ruby   -- "$1"
-ext js  = node   -- "$1"
-ext go  = go     -- "$1"
-ext sh  = sh     -- "$1"
-ext php = php    -- "$1"
-
-####################
-### Audio without X
-####################
-mime ^audio|ogg$, terminal, has mpv      = mpv -- "$@"
-mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@"
-mime ^audio|ogg$, terminal, has mplayer  = mplayer -- "$@"
-ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
-
-###########################
-### Video/Audio with a GUI
-###########################
-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 -- "$@"
-mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
-mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
-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 totem,    X, flag f = totem -- "$@"
-mime ^video|audio, has totem,    X, flag f = totem --fullscreen -- "$@"
-
-####################
-### Video without X
-####################
-mime ^video, terminal, !X, has mpv       = mpv -- "$@"
-mime ^video, terminal, !X, has mplayer2  = mplayer2 -- "$@"
-mime ^video, terminal, !X, has mplayer   = mplayer -- "$@"
-
-##############
-### Documents
-##############
-ext pdf, has zathura,  X, flag f = zathura -- "$@"
-ext pdf, has llpp,     X, flag f = llpp "$@"
-ext pdf, has mupdf,    X, flag f = mupdf "$@"
-ext pdf, has mupdf-x11,X, flag f = mupdf-x11 "$@"
-ext pdf, has apvlv,    X, flag f = apvlv -- "$@"
-ext pdf, has xpdf,     X, flag f = xpdf -- "$@"
-ext pdf, has evince,   X, flag f = evince -- "$@"
-ext pdf, has atril,    X, flag f = atril -- "$@"
-ext pdf, has okular,   X, flag f = okular -- "$@"
-ext pdf, has epdfview, X, flag f = epdfview -- "$@"
-ext pdf, has qpdfview, X, flag f = qpdfview "$@"
-ext pdf, has open,     X, flag f = open "$@"
-
-ext docx?, has catdoc,       terminal = catdoc -- "$@" | "$PAGER"
-
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric,    X, flag f = gnumeric -- "$@"
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread,     X, flag f = kspread -- "$@"
-ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
-ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has soffice,     X, flag f = soffice "$@"
-ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has ooffice,     X, flag f = ooffice "$@"
-
-ext djvu, has zathura,X, flag f = zathura -- "$@"
-ext djvu, has evince, X, flag f = evince -- "$@"
-ext djvu, has atril,  X, flag f = atril -- "$@"
-ext djvu, has djview, X, flag f = djview -- "$@"
-
-ext epub, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
-ext epub, has zathura,      X, flag f = zathura -- "$@"
-ext epub, has mupdf,        X, flag f = mupdf -- "$@"
-ext mobi, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
-
-ext cbr,  has zathura,      X, flag f = zathura -- "$@"
-ext cbz,  has zathura,      X, flag f = zathura -- "$@"
-
-###########
-### Images
-###########
-mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
-mime ^image/svg, has display,  X, flag f = display -- "$@"
-
-mime ^image, has pix        X, flag f = pix -- "$@"
-mime ^image, has ristretto, X, flag f = ristretto "$@"
-mime ^image, has gpicview,  X, flag f = gpicview -- "$@"
-mime ^image, has gwenview,  X, flag f = gwenview -- "$@"
-mime ^image, has pqiv,      X, flag f = pqiv -- "$@"
-mime ^image, has imv,       X, flag f = imv -- "$@"
-mime ^image, has sxiv,      X, flag f = sxiv -- "$@"
-mime ^image, has feh,       X, flag f = feh -- "$@"
-mime ^image, has mirage,    X, flag f = mirage -- "$@"
-mime ^image, has eog,       X, flag f = eog -- "$@"
-mime ^image, has eom,       X, flag f = eom -- "$@"
-mime ^image, has nomacs,    X, flag f = nomacs -- "$@"
-mime ^image, has geeqie,    X, flag f = geeqie -- "$@"
-mime ^image, has gimp,      X, flag f = gimp -- "$@"
-ext xcf,                    X, flag f = gimp -- "$@"
-
-#############
-### Archives
-#############
-ext 7z, has 7z = 7z -p l "$@" | "$PAGER"
-ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,     has atool = atool --list --each -- "$@" | "$PAGER"
-ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each -- "$@" | "$PAGER"
-ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has atool = atool --extract --each -- "$@"
-ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each -- "$@"
-
-ext tar|gz|bz2|xz, has tar = tar vvtf "$1" | "$PAGER"
-ext tar|gz|bz2|xz, has tar = for file in "$@"; do tar vvxf "$file"; done
-ext bz2, has bzip2 = for file in "$@"; do bzip2 -dk "$file"; done
-ext zip, has unzip = unzip -l "$1" | less
-ext zip, has unzip = for file in "$@"; do unzip -d "${file%.*}" "$file"; done
-ext ace, has unace = unace l "$1" | less
-ext ace, has unace = for file in "$@"; do unace e "$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 "$@"
-
-##############################
-### Flag t fallback terminals
-##############################
-mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@"
-mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@"
-mime ^ranger/x-terminal-emulator, has xfce4-terminal = xfce4-terminal -x "$@"
-mime ^ranger/x-terminal-emulator, has terminology = terminology -e "$@"
-mime ^ranger/x-terminal-emulator, has mate-terminal = mate-terminal -x "$@"
-mime ^ranger/x-terminal-emulator, has konsole = konsole -e "$@"
-mime ^ranger/x-terminal-emulator, has lxterminal = lxterminal -e "$@"
-mime ^ranger/x-terminal-emulator, has gnome-terminal = gnome-terminal -- "$@"
-mime ^ranger/x-terminal-emulator, has sakura = sakura -e "$@"
-mime ^ranger/x-terminal-emulator, has lilyterm = lilyterm -e "$@"
-mime ^ranger/x-terminal-emulator, has termite = termite -x '"$@"'
-mime ^ranger/x-terminal-emulator, has yakuake = yakuake -e "$@"
-mime ^ranger/x-terminal-emulator, has guake = guake -ne "$@"
-mime ^ranger/x-terminal-emulator, has tilda = tilda -c "$@"
-mime ^ranger/x-terminal-emulator, has st = st -e "$@"
-mime ^ranger/x-terminal-emulator, has terminator = terminator -x "$@"
-mime ^ranger/x-terminal-emulator, has urxvt = urxvt -e "$@"
-mime ^ranger/x-terminal-emulator, has pantheon-terminal = pantheon-terminal -e "$@"
-mime ^ranger/x-terminal-emulator, has xterm = xterm -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 -- "$@"
-
-label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = ${VISUAL:-$EDITOR} -- "$@"
-label pager,  !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = "$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

config/rofi/script/powermenu.sh

@@ -11,19 +11,16 @@ case "$choice" in
         case "$(echo -e "Yes\nNo"|${menucmd} -p "ShutDown" $@)" in
             "Yes") exec systemctl poweroff ;;
             "No")  exec exit 0             ;;
-        esac
+        esac ;;
-    ;;
     "Lock") exec betterlockscreen --off 300 -t "Computer is lockerd" -l ;;
     "Logout")
-        case "$(echo -e "Yes\nNo"|${menucmd} -p "ShutDown" $@)" in
+        case "$(echo -e "Yes\nNo"|${menucmd} -p "Logout" $@)" in
             "Yes") exec loginctl terminate-session $XDG_SESSION_ID ;;
             "No")  exec exit 0                                     ;;
-        esac
+        esac ;;
-    ;;
     "Reboot")
         case "$(echo -e "Yes\nNo"|${menucmd} -p "Reboot" $@)" in
             "Yes") exec systemctl reboot ;;
             "No")  exec exit 0           ;;
-        esac
+        esac ;;
-    ;;
 esac

config/zathura/zathurarc

@@ -1,18 +0,0 @@
-set font                     "JetBrains Mono 10"
-set default-fg               "#DFDFDF"
-set default-bg               "#262A2B"
-
-set statusbar-fg             "#CED4DA"
-set statusbar-bg             "#1F2324"
-set statusbar-h-padding      10
-set statusbar-v-padding      10
-
-set inputbar-fg              "#FFFFFF"
-set inputbar-bg              "#1F2324"
-
-set completion-bg            "#262A2B"
-set completion-fg            "#FFFFFF"
-set completion-highlight-bg  "#262A2B"
-set completion-highlight-fg  "#51AFEF"
-set completion-group-bg      "#262A2B"
-set completion-group-fg      "#51AFEF"

gitconfig

@@ -1,18 +1,10 @@
 [user]
-    username = Smirnov-O
+  name = Smirnov Alexandr
-    name = Smirnov Alexandr
+  email = ss2316544@gmail.com
-    email = ss2316544@gmail.com
-
-[web]
-    browser = google-chrome-stable
 
 [core]
-    editor = nvim
+  editor = nvim
 
 [alias]
-    ada = add -A
+  ada = add -A
-    cmm = commit -m
+  cmm = commit -m
-    st = status
-
-[credential]
-    helper = cache --timeout=1800

tmux.conf

@@ -19,11 +19,8 @@ set-option -sa terminal-overrides ",*:Tc"
 ###== Keybindongs
 
 ## HOME/END key support
-bind-key -n End send-key C-e
+bind-key -n Home send Escape "OH"
-bind-key -n Home send-key C-a
+bind-key -n End send Escape "OF"
-#bind-key -n Home send Escape "OH"
-#bind-key -n End send Escape "OF"
-
 
 ## Reload config
 bind r source-file ~/.tmux.conf \; display 'Reloaded tmux config'

vscode/README.md

@@ -2,17 +2,13 @@
 
 Install
 ```bash
-mv ~/.vscode/settings.json ~/.config/Code/User
+mv ~/vscode/settings.json ~/.config/Code/User
 ```
 
 Extensions
-- `Auto Import - ES6, TS` - Auto import for JS/TS, JSx/Tsx
+- `ESlint` - eslint integration
-- `Auto rename tag` - Rename tag in HTML/JSX
+- `Prettier` - JS code formater
-- `ESlint` - JavaScript linter
+- `GitLens` - Git integration
-- `One dark pro` - Color scheme
+- `Code spell` - Spell checker
-- `Prettier` - JavaScript code formater
+- `Ayu` - Color scheme
-- `Todo Tree` - Show all TODO in code
 - `Vim` - Vim mode
-- `vscode-icons` - Icons
-- `VScode rich presence` - Discord status
-- `Python` - Better python syntax

vscode/settings.json

@@ -1,683 +1,38 @@
 {
-    // Apperence
+    "workbench.colorTheme": "Ayu Mirage Bordered",
-    "workbench.colorTheme": "Ayu Dark Bordered",
     "workbench.iconTheme": "ayu",
-    "editor.fontFamily": "Jetbrain Mono, Droid Sans Mono, monospace",
     "editor.wordWrap": "off",
     "editor.fontSize": 14,
-
-    // Editor
-    "editor.tabCompletion": "on",
-    "editor.tabSize": 4,
-    "editor.formatOnSave": false,
-    "workbench.startupEditor": "newUntitledFile",
-
-    // Vim
-    "vim.easymotion": true,
-    "vim.surround": true,
-    "vim.useSystemClipboard": true,
-    "vim.insertModeKeyBindings": [
-        {"before": ["j", "j"],
-        "after" : ["<Esc>"]},
-        {"before": ["Ctrl", "Shift", "e"],
-        "commands": ["workbench.view.explorer"]},
-    ],
-    "vim.normalModeKeyBindings": [
-        {"before": ["f"],
-        "after" : ["leader","leader","s"]}
-    ],
-    
-    // Terminal
     "workbench.panel.defaultLocation": "right",
-    "terminal.integrated.shell.linux": "zsh",
-
-    // No show files
-    "files.exclude": {
-        "**/__pycache__": true,
-        "**/venv": true,
-        "**/env": true,
-        "**/.git": true,
-        "**/CVS": true,
-        "**/.DS_Store": true,
-        "**/node_modules": true
-    },
-
-    // Minimap
     "editor.minimap.side": "left",
     "editor.minimap.size": "fit",
-
-    // Sidebar 
     "workbench.sideBar.location": "right",
     "workbench.activityBar.visible": true,
-
-    // File menu
     "window.menuBarVisibility": "hidden",
-
+    "editor.formatOnPaste": true,
-    // Python
+    "editor.minimap.enabled": false,
-    "python.linting.pylintEnabled": false,
-    "python.linting.flake8Enabled": true,
-    "python.linting.enabled": true,
-    "python.formatting.provider": "autopep8",
-    // JS
-    "javascript.updateImportsOnFileMove.enabled": "never",
-
-    // Emmet
-    "emmet.includeLanguages": {
-        "javascript": "javascriptreact"
-    },
-    // Plugins
-    "todo-tree.tree.showScanModeButton": false,
-
-    // Explorer menu
     "explorer.confirmDelete": false,
     "explorer.confirmDragAndDrop": false,
 
-    // Config for specific languages
+    "editor.tabCompletion": "on",
-    "[python]": {
+    "editor.tabSize": 4,
-        "editor.tabSize": 4,
+    "editor.formatOnSave": true,
-        "editor.formatOnSave": true,
+    "git.autofetch": true,
-        "editor.formatOnPaste": true
+    "git.confirmSync": false,
+
+    "vim.easymotion": true,
+    "vim.surround": true,
+    "vim.useSystemClipboard": true,
+    "vim.normalModeKeyBindings": [{"before": ["f"], "after" : ["leader","leader","s"]}],
+
+    "emmet.includeLanguages": {
+        "javascript": "javascriptreact"
     },
     "[javascript]": {
-        "editor.tabSize": 2,
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": true,
-        "editor.formatOnPaste": true
-    },
-    "[javascriptreact]": {
-        "editor.formatOnSave": true,
-        "editor.formatOnPaste": true,
-        "editor.tabSize": 2,
         "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.tabSize": 2
     },
     "[markdown]": {
-        "editor.wordWrap": "on",
+        "editor.wordWrap": "on"
-        "editor.quickSuggestions": false
+    }
-    },
-    "[html]": {
-        "editor.tabSize": 3,
-        "editor.suggest.insertMode": "replace"
-    },
-    "[css]": {
-        "editor.tabSize": 2,
-        "editor.suggest.insertMode": "replace",
-        "editor.formatOnSave": true,
-        "editor.formatOnPaste": true,
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-    },
-    "[scss]": {
-        "editor.tabSize": 2,
-        "editor.suggest.insertMode": "replace",
-        "editor.formatOnSave": true,
-        "editor.formatOnPaste": true,
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-    },
-    "git.autofetch": true,
-    "editor.formatOnPaste": true,
-    "editor.minimap.enabled": false,
-    "tabnine.experimentalAutoImports": true,
-    "git.confirmSync": false,
-    "workbench.colorCustomizations": {
-        "[generated-dark]": {
-            "focusBorder": "#008dcd",
-            "foreground": "#dfdfdf",
-            "widget.shadow": "#0e1010",
-            "selection.background": "#008dcd80",
-            "errorForeground": "#F07171",
-            "textLink.foreground": "#c678dd",
-            "textLink.activeForeground": "#008dcd",
-            "textPreformat.foreground": "#51afef",
-            "textSeparator.foreground": "#0f1112",
-            "button.background": "#c678dd",
-            "button.foreground": "#000000",
-            "button.hoverBackground": "#a463b7",
-            "checkbox.background": "#313638",
-            "dropdown.background": "#313638",
-            "dropdown.border": "#3a4042",
-            "input.background": "#313638",
-            "input.border": "#3a4042",
-            "inputValidation.errorBackground": "#F0717190",
-            "inputValidation.errorBorder": "#F07171",
-            "inputValidation.errorForeground": "#000000",
-            "inputValidation.infoBackground": "#399EE690",
-            "inputValidation.infoBorder": "#399EE6",
-            "inputValidation.infoForeground": "#000000",
-            "inputValidation.warningBackground": "#EF7C2A90",
-            "inputValidation.warningBorder": "#EF7C2A",
-            "inputValidation.warningForeground": "#000000",
-            "scrollbar.shadow": "#0e1010",
-            "scrollbarSlider.background": "#6a757750",
-            "scrollbarSlider.hoverBackground": "#808e9140",
-            "scrollbarSlider.activeBackground": "#535c5e40",
-            "badge.background": "#51afef",
-            "badge.foreground": "#000000",
-            "progressBar.background": "#008dcd",
-            "list.activeSelectionBackground": "#008dcd20",
-            "list.focusBackground": "#008dcd30",
-            "list.highlightForeground": "#51afef",
-            "list.hoverBackground": "#323739",
-            "list.inactiveSelectionBackground": "#008dcd25",
-            "list.errorForeground": "#F07171",
-            "list.warningForeground": "#EF7C2A",
-            "activityBar.background": "#1b1e1e",
-            "activityBar.inactiveForeground": "#acacac",
-            "activityBar.dropBorder": "#008dcd",
-            "activityBarBadge.background": "#51afef",
-            "activityBarBadge.foreground": "#000000",
-            "activityBar.activeBorder": "#008dcd",
-            "activityBar.activeBackground": "#008dcd13",
-            "activityBar.activeFocusBorder": "#008dcd",
-            "sideBar.background": "#202425",
-            "sideBarSectionHeader.background": "#2b3032",
-            "minimap.selectionHighlight": "#008dcd80",
-            "minimap.errorHighlight": "#F07171",
-            "minimap.warningHighlight": "#EF7C2A",
-            "minimapGutter.addedBackground": "#ecbe7b",
-            "minimapGutter.deletedBackground": "#F07171",
-            "minimapGutter.modifiedBackground": "#399EE6",
-            "editorGroup.border": "#1b1e1e",
-            "editorGroup.dropBackground": "#008dcd30",
-            "editorGroupHeader.noTabsBackground": "#313638",
-            "editorGroupHeader.tabsBackground": "#313638",
-            "tab.activeBackground": "#262a2b",
-            "tab.border": "#3d4345",
-            "tab.activeBorder": "#008dcd",
-            "tab.lastPinnedBorder": "#008dcd50",
-            "tab.inactiveBackground": "#313638",
-            "tab.hoverBackground": "#3d4345",
-            "tab.activeModifiedBorder": "#399EE6",
-            "editorPane.background": "#1d2021",
-            "editor.background": "#262a2b",
-            "editor.foreground": "#dfdfdf",
-            "editorLineNumber.foreground": "#565f61",
-            "editorLineNumber.activeForeground": "#a3abad",
-            "editorCursor.background": "#ffffff",
-            "editorCursor.foreground": "#008dcd",
-            "editor.selectionBackground": "#008dcd30",
-            "editor.findMatchHighlightBackground": "#dfdfdf30",
-            "editor.findMatchBorder": "#008dcd",
-            "editor.lineHighlightBackground": "#313638",
-            "editorLink.activeForeground": "#008dcd",
-            "editorWhitespace.foreground": "#535c5e",
-            "editorIndentGuide.background": "#3d4345",
-            "editorIndentGuide.activeBackground": "#008dcd",
-            "editorRuler.foreground": "#3d4345",
-            "editorBracketMatch.border": "#00699a",
-            "editorBracketMatch.background": "#212526",
-            "editor.foldBackground": "#008dcd30",
-            "editorOverviewRuler.border": "#3d4345",
-            "editorOverviewRuler.selectionHighlightForeground": "#008dcd",
-            "editorOverviewRuler.modifiedForeground": "#399EE6",
-            "editorOverviewRuler.addedForeground": "#399EE6",
-            "editorOverviewRuler.deletedForeground": "#399EE6",
-            "editorOverviewRuler.errorForeground": "#F07171",
-            "editorOverviewRuler.warningForeground": "#EF7C2A",
-            "editorOverviewRuler.infoForeground": "#399EE6",
-            "editorOverviewRuler.bracketMatchForeground": "#008dcd",
-            "editorError.foreground": "#F07171",
-            "editorWarning.foreground": "#EF7C2A",
-            "editorInfo.foreground": "#399EE6",
-            "problemsErrorIcon.foreground": "#F07171",
-            "problemsWarningIcon.foreground": "#EF7C2A",
-            "problemsInfoIcon.foreground": "#399EE6",
-            "editorGutter.modifiedBackground": "#399EE6",
-            "editorGutter.addedBackground": "#ecbe7b",
-            "editorGutter.deletedBackground": "#F07171",
-            "diffEditor.insertedTextBackground": "#ecbe7b30",
-            "diffEditor.removedTextBackground": "#F0717135",
-            "editorWidget.background": "#262a2b",
-            "editorWidget.resizeBorder": "#3d4345",
-            "editorSuggestWidget.background": "#313638",
-            "editorSuggestWidget.border": "#3d4345",
-            "editorSuggestWidget.highlightForeground": "#51afef",
-            "editorHoverWidget.border": "#3d4345",
-            "editorMarkerNavigation.background": "#262a2b",
-            "editorMarkerNavigationError.background": "#F07171",
-            "editorMarkerNavigationWarning.background": "#EF7C2A",
-            "editorMarkerNavigationInfo.background": "#399EE6",
-            "peekViewResult.background": "#313638",
-            "peekViewTitle.background": "#1b1e1e",
-            "panel.dropBorder": "#008dcd",
-            "panelTitle.activeBorder": "#008dcd",
-            "statusBar.background": "#1b1e1e",
-            "statusBarItem.hoverBackground": "#323737",
-            "statusBarItem.prominentBackground": "#008dcd",
-            "statusBarItem.prominentForeground": "#ffffff",
-            "statusBarItem.prominentHoverBackground": "#007bb3",
-            "titleBar.activeBackground": "#313638",
-            "titleBar.inactiveBackground": "#262a2b",
-            "titleBar.border": "#353b3d",
-            "menu.background": "#262a2b",
-            "menu.foreground": "#dfdfdf",
-            "menu.selectionBackground": "#008dcdDD",
-            "menu.selectionForeground": "#ffffff",
-            "menu.separatorBackground": "#535c5e",
-            "notificationsErrorIcon.foreground": "#F07171",
-            "notificationsWarningIcon.foreground": "#EF7C2A",
-            "notificationsInfoIcon.foreground": "#399EE6",
-            "notifications.background": "#262a2b",
-            "extensionButton.prominentBackground": "#c678dd",
-            "extensionButton.prominentForeground": "#000000",
-            "extensionButton.prominentHoverBackground": "#985caa",
-            "pickerGroup.border": "#0f1112",
-            "pickerGroup.foreground": "#008dcd",
-            "terminal.selectionBackground": "#008dcd",
-            "terminalCursor.foreground": "#008dcd",
-            "terminalCursor.background": "#ffffff",
-            "gitDecoration.addedResourceForeground": "#ecbe7b",
-            "gitDecoration.modifiedResourceForeground": "#399EE6",
-            "gitDecoration.deletedResourceForeground": "#F07171",
-            "gitDecoration.stageDeletedResourceForeground": "#F07171",
-            "gitDecoration.stageModifiedResourceForeground": "#399EE6",
-            "settings.modifiedItemIndicator": "#399EE6",
-            "notebook.focusedRowBorder": "#008dcd"
-        }
-    },
-    "editor.tokenColorCustomizations": {
-        "[generated-dark]": {
-            "textMateRules": [
-                {
-                    "scope": "invalid",
-                    "settings": {
-                        "foreground": "#F07171"
-                    }
-                },
-                {
-                    "scope": [
-                        "meta.embedded",
-                        "source.groovy.embedded",
-                        "meta.template.expression"
-                    ],
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "variable",
-                        "support.variable.property.dom",
-                        "support.variable.dom",
-                        "support.variable.property",
-                        "punctuation.separator.parameter",
-                        "string.interpolated.pug variable"
-                    ],
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "comment",
-                        "punctuation.definition.comment"
-                    ],
-                    "settings": {
-                        "foreground": "#758184"
-                    }
-                },
-                {
-                    "scope": [
-                        "string",
-                        "punctuation.definition.string"
-                    ],
-                    "settings": {
-                        "foreground": "#2623ab"
-                    }
-                },
-                {
-                    "scope": "constant.character.escape",
-                    "settings": {
-                        "foreground": "#c678dd"
-                    }
-                },
-                {
-                    "scope": [
-                        "keyword",
-                        "constant.language.import-export-all"
-                    ],
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": [
-                        "entity.name.type",
-                        "support.type.primitive",
-                        "support.type.builtin",
-                        "meta.type.annotation entity.name.type",
-                        "meta.type.parameters entity.name.type"
-                    ],
-                    "settings": {
-                        "foreground": "#98be65"
-                    }
-                },
-                {
-                    "scope": [
-                        "keyword.control",
-                        "keyword.operator",
-                        "storage",
-                        "support.type",
-                        "keyword.operator.expression",
-                        "keyword.operator.new"
-                    ],
-                    "settings": {
-                        "foreground": "#c678dd"
-                    }
-                },
-                {
-                    "scope": [
-                        "entity.name.function",
-                        "support.class",
-                        "support.function",
-                        "new.expr entity.name.type",
-                        "entity.other.inherited-class"
-                    ],
-                    "settings": {
-                        "foreground": "#008dcd"
-                    }
-                },
-                {
-                    "scope": [
-                        "punctuation.definition.typeparameters",
-                        "keyword.operator.type",
-                        "keyword.operator.optional",
-                        "punctuation.definition.template-expression",
-                        "source.tsx punctuation.section.embedded",
-                        "source.jsx punctuation.section.embedded"
-                    ],
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": "constant",
-                    "settings": {
-                        "foreground": "#98be65"
-                    }
-                },
-                {
-                    "scope": [
-                        "constant.numeric",
-                        "constant.language"
-                    ],
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "variable.parameter",
-                        "parameter.variable",
-                        "meta.function.parameter variable",
-                        "source.rust meta.type_params.rust"
-                    ],
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "punctuation",
-                        "meta.brace"
-                    ],
-                    "settings": {
-                        "foreground": "#868686"
-                    }
-                },
-                {
-                    "scope": "comment.block.documentation entity.name.type",
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": [
-                        "variable.language.this",
-                        "variable.language.special.self"
-                    ],
-                    "settings": {
-                        "foreground": "#c678dd"
-                    }
-                },
-                {
-                    "scope": [
-                        "meta.tag.metadata.doctype entity.name.tag",
-                        "meta.tag.metadata.doctype punctuation.definition.tag",
-                        "meta.tag.metadata.doctype string",
-                        "meta.tag.metadata.doctype entity.other.attribute-name.html",
-                        "meta.tag.sgml.doctype"
-                    ],
-                    "settings": {
-                        "foreground": "#868686"
-                    }
-                },
-                {
-                    "scope": "entity.name.tag",
-                    "settings": {
-                        "foreground": "#c678dd"
-                    }
-                },
-                {
-                    "scope": "meta.tag string",
-                    "settings": {
-                        "foreground": "#2623ab"
-                    }
-                },
-                {
-                    "scope": "meta.attribute punctuation.definition.string",
-                    "settings": {
-                        "foreground": "#868686"
-                    }
-                },
-                {
-                    "scope": [
-                        "meta.tag entity.other.attribute-name",
-                        "entity.other.attribute-name.html"
-                    ],
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": [
-                        "constant.character.entity",
-                        "punctuation.definition.entity"
-                    ],
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "entity.name.section.markdown",
-                        "markup.heading.setext"
-                    ],
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": "punctuation.definition.list",
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": "meta.separator.markdown",
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": "markup.inline.raw",
-                    "settings": {
-                        "foreground": "#c678dd"
-                    }
-                },
-                {
-                    "scope": "markup.bold",
-                    "settings": {
-                        "fontStyle": "bold"
-                    }
-                },
-                {
-                    "scope": "markup.italic",
-                    "settings": {
-                        "fontStyle": "italic"
-                    }
-                },
-                {
-                    "scope": [
-                        "meta.link punctuation.definition.string",
-                        "meta.image punctuation.definition.string"
-                    ],
-                    "settings": {
-                        "foreground": "#868686"
-                    }
-                },
-                {
-                    "scope": [
-                        "link",
-                        "markup.underline.link",
-                        "constant.other.reference.link.markdown"
-                    ],
-                    "settings": {
-                        "foreground": "#008dcd"
-                    }
-                },
-                {
-                    "scope": "markup.quote",
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "entity.name.tag.css",
-                        "entity.name.tag.wildcard"
-                    ],
-                    "settings": {
-                        "foreground": "#2623ab"
-                    }
-                },
-                {
-                    "scope": [
-                        "entity.other.attribute-name.class",
-                        "entity.other.attribute-name punctuation.definition.entity"
-                    ],
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": [
-                        "entity.other.attribute-name.pseudo-element",
-                        "entity.other.attribute-name.pseudo-class",
-                        "constant.other.color"
-                    ],
-                    "settings": {
-                        "foreground": "#c678dd"
-                    }
-                },
-                {
-                    "scope": [
-                        "entity.other.attribute-name.id",
-                        "entity.other.attribute-name.id punctuation.definition.entity"
-                    ],
-                    "settings": {
-                        "foreground": "#008dcd"
-                    }
-                },
-                {
-                    "scope": "source.css constant.numeric",
-                    "settings": {
-                        "foreground": "#2623ab"
-                    }
-                },
-                {
-                    "scope": [
-                        "meta.property-name",
-                        "support.type.property-name"
-                    ],
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "meta.property-value",
-                        "meta.property-value constant.other",
-                        "support.constant.property-value"
-                    ],
-                    "settings": {
-                        "foreground": "#008dcd"
-                    }
-                },
-                {
-                    "scope": "variable.parameter.url",
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": "punctuation.definition.variable",
-                    "settings": {
-                        "foreground": "#dfdfdf"
-                    }
-                },
-                {
-                    "scope": [
-                        "punctuation.section.embedded.begin.php",
-                        "punctuation.section.embedded.end.php"
-                    ],
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": "entity.name.section",
-                    "settings": {
-                        "foreground": "#008dcd"
-                    }
-                },
-                {
-                    "scope": "support.type.property-name.json",
-                    "settings": {
-                        "foreground": "#51afef"
-                    }
-                },
-                {
-                    "scope": "markup.inserted",
-                    "settings": {
-                        "foreground": "#ecbe7b"
-                    }
-                },
-                {
-                    "scope": "markup.changed",
-                    "settings": {
-                        "foreground": "#399EE6"
-                    }
-                },
-                {
-                    "scope": "markup.deleted",
-                    "settings": {
-                        "foreground": "#F07171"
-                    }
-                },
-                {
-                    "scope": "meta.diff.header",
-                    "settings": {
-                        "foreground": "#399EE6",
-                        "fontStyle": "italic"
-                    }
-                },
-                {
-                    "scope": "meta.diff.range",
-                    "settings": {
-                        "foreground": "#c678dd"
-                    }
-                }
-            ]
-        }
-    },
-    
 }