all repos

dotfiles @ 04331d3

i use rach linux btw
16 files changed, 180 insertions(+), 228 deletions(-)
Update vim, git, tmux, migrate to light theme
Author: Smirnov Alexander ss2316544@gmail.com
Committed at: 2021-05-10 17:57:51 +0300
Parent: 72c267b
M config/bspwm/bspwmrc
···
        16
        16
         

      
        17
        17
         ###== Autostart

      
        18
        18
         A feh --randomize --bg-scale ~/Pictures/wallp &

      
        
        19
        +xautolock -time 5 -locker "slock" &

      
        19
        20
         A sxhkd -c ~/.config/bspwm/sxhkd &

      
        20
        
        -A picom -b &

      
        21
        21
         ~/.config/bspwm/polybar/bar.sh &

      
        22
        
        -xautolock -time 5 -locker "slock" &

      
        
        22
        +A picom -b &

      
        23
        23
         

      
        24
        24
         ###== BSPWM

      
        25
        25
         

      ···
        36
        36
         C focus_follows_pointer  true

      
        37
        37
         

      
        38
        38
         # Colors

      
        39
        
        -C normal_border_color   "#262A2B"

      
        
        39
        +C normal_border_color   "#f5f5f5"

      
        40
        40
         C active_border_color   "#1F2324"

      
        41
        41
         C focused_border_color  "#008DCD"

      
        42
        
        -C presel_feedback_color "#51AFEF"

      
        43
        42
         C urgent_border_color   "#FF6C6B"

      
        44
        43
         

      
        45
        44
         ###== BSPWM Rules

      ···
        47
        46
         R Google-chrome    desktop='^2' focus=on  follow=on

      
        48
        47
         R LibreWolf        desktop='^2' focus=on  follow=on

      
        49
        48
         R Code             desktop='^3' focus=on  follow=on

      
        50
        
        -R '*:nvim'         desktop='^3' focus=on  follow=on

      
        51
        
        -R Todoist          desktop='^4' focus=on  follow=on

      
        52
        49
         R Joplin           desktop='^4' focus=on  follow=on

      
        
        50
        +R Todoist          desktop='^4' focus=on  follow=on

      
        53
        51
         R Simplenote       desktop='^4' focus=on  follow=on

      
        54
        
        -R '*:ranger'       desktop='^5' focus=off follow=off

      
        
        52
        +R Nemo             desktop='^5' focus=on  follow=on

      
        
        53
        +R Zathura          desktop='^5' focus=on  follow=on  state=tiled

      
        55
        54
         R discord          desktop='^6' focus=on  follow=off

      
        56
        55
         R TelegramDesktop  desktop='^6' focus=off follow=on

      
        57
        56
         R KeePassXC        desktop='^7' focus=on  follow=on

      
        58
        
        -R Zathura          desktop='^9' focus=on  follow=on  state=tiled

      
M config/bspwm/polybar/polybar
···
        8
        8
         foreground = #cfd1dd

      
        9
        9
         secondary  = #008DCD

      
        10
        10
         alert      = #FF6C6B

      
        
        11
        +empty      = #383a42

      
        
        12
        +

      
        
        13
        +;[colors]    ; Light

      
        
        14
        +;background  = #f9f9f9

      
        
        15
        +;foreground  = #5b5b5f

      
        
        16
        +;secondary   = #0098dd

      
        
        17
        +;alert       = #df631c

      
        
        18
        +;empty       = #a0a1a7

      
        11
        19
         

      
        12
        20
         [bar/bar]

      
        13
        21
         width = 100%

      ···
        19
        27
         font-0 = Iosevka Nerd Font:style=Medium:size=8;3

      
        20
        28
         font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5

      
        21
        29
         modules-left = bspwm archupd

      
        22
        
        -modules-right = pulseaudio keyboard time wifi-signal

      
        
        30
        +modules-center = time wifi-signal

      
        
        31
        +modules-right = pulseaudio keyboard

      
        23
        32
         tray-position = right

      
        24
        33
         tray-padding = 0

      
        25
        34
         

      ···
        39
        48
         label-urgent-foreground = ${colors.alert}

      
        40
        49
         label-urgent-padding = 2

      
        41
        50
         label-empty = 

      
        42
        
        -label-empty-foreground = #58676C74

      
        
        51
        +label-empty-foreground = ${colors.empty}

      
        43
        52
         label-empty-padding = 2

      
        44
        53
         

      
        45
        54
         [module/pulseaudio]

      
D config/bspwm/screen.png

Not showing binary file.

M config/bspwm/sxhkd
···
        5
        5
         super + {_,shift} Return

      
        6
        6
             {kitty, rofi -show drun}

      
        7
        7
         

      
        8
        
        -super + shift + {w, e, f, s, t, q}

      
        
        8
        +super + shift + {w, e, f, s, t, z, q}

      
        9
        9
             {google-chrome-stable,              \

      
        10
        10
              code,                              \

      
        11
        11
              nemo,                              \

      
        12
        12
              .applications/simplenote.appimage, \

      
        13
        13
              .applications/todoist.appimage,    \

      
        
        14
        +     slock,                             \

      
        14
        15
              xkill                              }

      
        15
        16
         

      
        16
        17
         {_,shift,ctrl} Print

      
M config/kitty/kitty.conf
···
        1
        
        -font_family   JetBrains Mono

      
        
        1
        +font_family JetBrains Mono

      
        2
        2
         disable_ligatures always

      
        3
        
        -font_size     11

      
        
        3
        +font_size 11

      
        4
        4
         repaint_delay 10

      
        5
        5
         

      
        6
        6
         # Cursor

      
        7
        
        -cursor                     #dfdfdf

      
        8
        
        -cursor_text_color          #7d7d7d

      
        9
        
        -cursor_shape               underline

      
        
        7
        +cursor            #dfdfdf

      
        
        8
        +cursor_text_color #7d7d7d

      
        
        9
        +cursor_shape      underline

      
        10
        10
         cursor_underline_thickness 1.3

      
        11
        11
         cursor_blink_interval 0

      
        12
        12
         

      ···
        28
        28
         map ctrl+backspace  change_font_size all 0

      
        29
        29
         

      
        30
        30
         # Theming

      
        31
        
        -background_opacity 0.85

      
        32
        
        -background #262a2b

      
        33
        
        -foreground #ffffff

      
        34
        
        -selection_background #1F2324

      
        35
        
        -color0   #002731

      
        36
        
        -color8   #001e26

      
        37
        
        -color1   #d01b24

      
        38
        
        -color9   #bd3612

      
        39
        
        -color2   #728905

      
        40
        
        -color10  #465a61

      
        41
        
        -color3   #a57705

      
        42
        
        -color11  #52676f

      
        43
        
        -color4   #2075c7

      
        44
        
        -color12  #708183

      
        45
        
        -color5   #c61b6e

      
        46
        
        -color13  #5856b9

      
        47
        
        -color6   #0fbcf9

      
        48
        
        -color14  #4bcffa

      
        49
        
        -color7   #e9e2cb

      
        50
        
        -color15  #fcf4dc

      
        
        31
        +background #f6f6f6

      
        
        32
        +foreground #2a2b33

      
        
        33
        +cursor #D8DEE9

      
        
        34
        +

      
        
        35
        +selection_background  #f0ede4

      
        
        36
        +color0                #000000

      
        
        37
        +color8                #323232

      
        
        38
        +color1                #ff3333

      
        
        39
        +color9                #ff6565

      
        
        40
        +color2                #86b200

      
        
        41
        +color10               #b8e532

      
        
        42
        +color3                #f19618

      
        
        43
        +color11               #ffc849

      
        
        44
        +color4                #41a6d9

      
        
        45
        +color12               #73d7ff

      
        
        46
        +color5                #f07078

      
        
        47
        +color13               #ffa3aa

      
        
        48
        +color6                #4cbe99

      
        
        49
        +color14               #7ff0cb

      
        
        50
        +color7                #ffffff

      
        
        51
        +color15               #ffffff

      
        
        52
        +selection_foreground #fafafa

      
M config/nvim/init.vim
···
        1
        1
         call plug#begin('~/.vim/plugged')

      
        2
        
        -  Plug 'Smirnov-O/nten16.vim'

      
        3
        
        -  Plug 'sheerun/vim-polyglot'

      
        
        2
        +  Plug 'Smirnov-O/nten.vim'

      
        4
        3
           Plug 'jiangmiao/auto-pairs'

      
        5
        
        -  Plug 'scrooloose/nerdtree'

      
        6
        
        -  Plug 'w0rp/ale'

      
        
        4
        +  Plug 'sheerun/vim-polyglot'

      
        7
        5
         call plug#end()

      
        8
        6
         

      
        9
        7
         "== General

      
        10
        
        -set termguicolors

      
        11
        
        -colorscheme nten16

      
        12
        
        -

      
        13
        
        -" Line numbers

      
        14
        
        -set nu rnu

      
        15
        
        -

      
        16
        
        -" Line wrap

      
        17
        
        -set linebreak wrap

      
        
        8
        +colo nten-light        " Color scheme

      
        
        9
        +set nu rnu             " Line numbers

      
        
        10
        +set cursorline         " Highlight line by cursor

      
        
        11
        +set linebreak wrap     " Line wrap

      
        
        12
        +set mouse=a mousehide  " Mouse

      
        
        13
        +set ruler laststatus=0 " Status line

      
        
        14
        +set history=500        " Set history size

      
        
        15
        +set autoread           " Auto read file on change

      
        
        16
        +set hidden             " Change buffet without warning

      
        
        17
        +set visualbell t_vb=   " Disable sounds

      
        
        18
        +set pumheight=8        " Maximum items in pop up

      
        
        19
        +set modeline           " Enable modeline

      
        
        20
        +set nobk noswf noudf   " Swap files

      
        
        21
        +set is ic scs          " Search

      
        
        22
        +set scrolloff=3

      
        
        23
        +set enc=utf-8 fenc=utf-8  " Encoding

      
        
        24
        +set list listchars=tab:\|·,trail:~,space:·

      
        18
        25
         

      
        19
        
        -" Tabs

      
        20
        
        -set tabstop=2

      
        21
        
        -set shiftwidth=2

      
        22
        
        -set softtabstop=2

      
        
        26
        +" Tab

      
        
        27
        +set tabstop=4

      
        
        28
        +set shiftwidth=4

      
        
        29
        +set softtabstop=4

      
        23
        30
         set smarttab

      
        24
        31
         set expandtab

      
        25
        32
         set autoindent

      
        26
        33
         

      
        27
        
        -" Status line

      
        28
        
        -set ruler laststatus=0

      
        
        34
        +"== Netrw file manager

      
        
        35
        +let g:netrw_liststyle=3

      
        
        36
        +let g:netrw_banner=0

      
        
        37
        +let g:netrw_dirhistmax=0

      
        29
        38
         

      
        30
        
        -" Maximux item in popup

      
        31
        
        -set pumheight=8

      
        
        39
        +"== Custom setting for another files

      
        
        40
        +au FileType python,elm setlocal ex sw=4 ts=4

      
        
        41
        +au FileType javascript,javascriptreact,json,yaml setlocal ex sw=2 ts=2

      
        32
        42
         

      
        33
        
        -" Scroll

      
        34
        
        -set scrolloff=3

      
        35
        
        -

      
        36
        
        -" Mouse

      
        37
        
        -set mouse=a

      
        38
        
        -set mousehide

      
        39
        
        -set cursorline

      
        40
        
        -

      
        41
        
        -" Encoding

      
        42
        
        -set encoding=utf-8

      
        43
        
        -set fileencodings=utf-8

      
        44
        
        -

      
        45
        
        -" Backup file & history

      
        46
        
        -set nobackup noswapfile noundofile

      
        47
        
        -set history=500

      
        48
        
        -

      
        49
        
        -" Search

      
        50
        
        -set incsearch

      
        51
        
        -set ignorecase

      
        52
        
        -set smartcase

      
        53
        
        -

      
        54
        
        -" Enable mode line

      
        55
        
        -set modeline

      
        56
        
        -

      
        57
        
        -" Auto reload file

      
        58
        
        -set autoread

      
        59
        
        -

      
        60
        
        -" Buffer

      
        61
        
        -set hidden

      
        62
        
        -

      
        63
        
        -" Space/tab indicator

      
        64
        
        -set list listchars=tab:\|·,trail:~,space:·

      
        65
        
        -

      
        66
        
        -" Disable sound

      
        67
        
        -set visualbell t_vb=

      
        68
        
        -

      
        69
        
        -

      
        70
        
        -"== Aliases

      
        71
        
        -command! W        :w

      
        72
        
        -command! Wq       :wq

      
        73
        
        -command! Term     :vs|wincmd L|set nonu nornu|startinsert|cd %:p:h|term

      
        74
        
        -command! Prettier :silent !prettier -w %

      
        75
        
        -command! Black    :silent !black %

      
        76
        
        -command! ElmFmt   :silent !elm-format % --yes

      
        77
        
        -

      
        78
        
        -

      
        79
        
        -"== Settings for specific languages

      
        80
        
        -autocmd FileType python,elm setlocal ex sw=4 ts=4

      
        81
        
        -autocmd FileType javascript,javascriptreact setlocal et sw=2 ts=2

      
        82
        
        -autocmd FileType html,css,json,yaml setlocal ex sw=2 ts=2

      
        83
        
        -

      
        84
        
        -

      
        85
        
        -"== ALE

      
        86
        
        -let g:ale_disable_lsp = 1

      
        87
        
        -let g:ale_echo_msg_format = '%severity%: %s'

      
        88
        
        -

      
        89
        
        -

      
        90
        
        -"== NERDTree

      
        91
        
        -let g:NERDTreeWinPos = "right"

      
        92
        
        -let g:NERDTreeMinimalUI = 1

      
        93
        
        -let g:NERDTreeWinSize = 24

      
        94
        
        -

      
        
        43
        +"== Custom commands

      
        
        44
        +com! Term     :vs|winc L|se nu! rnu!|start|term

      
        
        45
        +com! Prettier :silent !prettier -w %

      
        
        46
        +com! Black    :silent !black %

      
        
        47
        +com! ElmFmt   :silent !elm-format --yes %

      
        
        48
        +com! GoFmt    :silent !gofmt -w %

      
        95
        49
         

      
        96
        50
         "== Mapping

      
        97
        51
         let mapleader=";"

      
        98
        
        -

      
        99
        
        -" NerdTree

      
        100
        
        -nnoremap <leader>e :NERDTreeToggle<CR>

      
        101
        
        -

      
        102
        
        -" Terminal

      
        103
        
        -tnoremap <Esc> <C-\><C-n>

      
        104
        
        -nnoremap <leader>t :Term<CR>

      
        105
        
        -

      
        106
        
        -" Alternative keys

      
        107
        
        -nnoremap <C-s>   :w<CR>

      
        108
        
        -nnoremap <C-n>   :tabnew<CR>

      
        109
        
        -nnoremap <space> :noh<CR>

      
        110
        
        -

      
        111
        
        -" Window

      
        112
        
        -nnoremap <C-h> :wincmd h<CR>

      
        113
        
        -nnoremap <C-j> :wincmd j<CR>

      
        114
        
        -nnoremap <C-k> :wincmd k<CR>

      
        115
        
        -nnoremap <C-l> :wincmd l<CR>

      
        116
        
        -

      
        117
        
        -" Split

      
        118
        
        -nnoremap spv :vs<CR>

      
        119
        
        -nnoremap sph :sp<CR>

      
        120
        
        -nnoremap spk :wincmd K<CR>

      
        121
        
        -nnoremap spl :wincmd L<CR>

      
        122
        
        -

      
        123
        
        -" Tab

      
        124
        
        -nnoremap tn :tabnew<CR>

      
        125
        
        -noremap <A-1> :tabn 1<CR>

      
        126
        
        -noremap <A-2> :tabn 2<CR>

      
        127
        
        -noremap <A-3> :tabn 3<CR>

      
        128
        
        -noremap <A-4> :tabn 4<CR>

      
        129
        
        -noremap <A-5> :tabn 5<CR>

      
        130
        
        -noremap <A-6> :tabn 6<CR>

      
        131
        
        -noremap <A-7> :tabn 7<CR>

      
        132
        
        -noremap <A-8> :tabn 8<CR>

      
        133
        
        -noremap <A-9> :tabn 9<CR>

      
        134
        
        -

      
        135
        
        -" Buffers

      
        136
        
        -nnoremap <leader>j :bnext<CR>

      
        137
        
        -nnoremap <leader>k :bprev<CR>

      
        138
        
        -nnoremap <leader>w :bdele<CR>

      
        139
        
        -nnoremap <leader>b :buffers<CR>

      
        
        52
        +nn <C-S> :w<cr>

      
        
        53
        +nn <leader>t :Term<cr>

      
        
        54
        +nn <space> :noh<cr>

      
        
        55
        +nn <leader>j :bn<cr>

      
        
        56
        +nn <leader>k :bp<cr>

      
        
        57
        +nn <leader>w :bd<cr>

      
        
        58
        +nn <C-h> :wincmd h<cr>

      
        
        59
        +nn <C-j> :wincmd j<cr>

      
        
        60
        +nn <C-k> :wincmd k<cr>

      
        
        61
        +nn <C-l> :wincmd l<cr>

      
        
        62
        +tno <esc> <c-\><c-n>

      
        
        63
        +nn spv :vs<cr>

      
        
        64
        +nn sph :sp<cr>

      
M config/picom.conf
···
        2
        2
         dropdown_menu = { shadow = false; };

      
        3
        3
         popup_menu = { shadow = false; };

      
        4
        4
         utility = { shadow = false; };

      
        5
        
        -shadow = true;

      
        
        5
        +shadow = false;

      
        6
        6
         shadow-radius = 15;

      
        7
        7
         shadow-offset-x = -7;

      
        8
        8
         shadow-offset-y = -7;

      
M config/ranger/rc.conf
···
        22
        22
         set scroll_offset 4

      
        23
        23
         

      
        24
        24
         #== Mappings

      
        25
        
        -map @     shell $SHELL

      
        
        25
        +map gc     cd ~/code

      
        
        26
        +map gd     cd ~/Documents

      
        
        27
        +map gw     cd ~/Downloads

      
        
        28
        +map g.     cd ~/.dotfiles

      
        
        29
        +map gu     cd /mnt/usb

      
        26
        30
         

      
        27
        
        -# go to

      
        28
        
        -map gc    cd ~/code

      
        29
        
        -map gd    cd ~/Documents

      
        30
        
        -map gw    cd ~/Downloads

      
        31
        
        -map g.    cd ~/.dotfiles

      
        32
        
        -map gu    cd /mnt/usb

      
        
        31
        +map @      shell $SHELL

      
        
        32
        +map dD     delete

      
        
        33
        +map <c-k>  tab_shift 1

      
        
        34
        +map <c-j>  tab_shift -1

      
        
        35
        +map ee     shell gpe enc %s

      
        
        36
        +map ed     shell gpe dec %s

      
        
        37
        +map sa     shell zip -r archive.zip %s

      
        
        38
        +map ss     shell tar -czvf archive.tar.gz %s

      
        
        39
        +map sd     shell 7z a archive.7z %s

      
        
        40
        +map se     shell extract %s

      
        33
        41
         

      
        34
        
        -# delete

      
        35
        
        -map dD    delete

      
        36
        
        -map dT    trash

      
        37
        
        -

      
        38
        
        -# tab

      
        39
        
        -map <c-k> tab_shift 1

      
        40
        
        -map <c-j> tab_shift -1

      
        41
        
        -

      
        42
        
        -# archive

      
        43
        
        -map sa    shell zip -r archive.zip %s

      
        44
        
        -map ss    shell tar -czvf archive.tar.gz %s

      
        45
        
        -map sd    shell 7z a archive.7z %s

      
        46
        
        -map se    shell extract %s

      
        47
        
        -

      
        48
        
        -# gpg

      
        49
        
        -map ee    shell gpe enc %s

      
        50
        
        -map ed    shell gpe dec %s

      
M config/ranger/rifle.conf
···
        1
        
        -# vim: ft=cfg

      
        2
        
        -#== Websites

      
        3
        
        -ext x?html?, has google-chrome,  X, flag f = google-chrome "$@"

      
        4
        
        -ext x?html?, has firefox,        X, flag f = firefox -- "$@"

      
        5
        
        -ext x?html?, has qutebrowser,    X, flag f = qutebrowser -- "$@"

      
        
        1
        +# vim:ft=cfg

      
        
        2
        +

      
        
        3
        +#== Web

      
        
        4
        +ext x?html?, has google-chrome, X, flag f = google-chrome $@

      
        
        5
        +ext x?html?, has firefox,       X, flag f = firefox -- "$@"

      
        
        6
        +

      
        
        7
        +#== Script

      
        
        8
        +ext py = python -- "$1"

      
        
        9
        +ext js = node -- "$1"

      
        
        10
        +ext sh = bash -- "$1"

      
        6
        11
         

      
        7
        12
         #== Misc

      
        8
        
        -mime ^text,  label editor = ${EDITOR} -- "$@"

      
        9
        
        -mime ^text,  label pager  = "$PAGER" -- "$@"

      
        
        13
        +#mime ^text, lable editor = $EDITOR -- "$@"

      
        
        14
        +#mime ^text, label pager = $PAGER -- "$@"

      
        
        15
        +

      
        
        16
        +

      
        10
        17
         !mime ^text, label editor, ext json|csv|tex|py|rb|js|sh = ${EDITOR} -- "$@"

      
        11
        18
         !mime ^text, label pager,  ext json|csv|tex|py|rb|js|sh = "$PAGER" -- "$@"

      
        12
        19
         name ^[mM]akefile$ = make

      
        13
        20
         

      
        14
        
        -#== Scripts

      
        15
        
        -ext py  = python -- "$1"

      
        16
        
        -ext rb  = ruby   -- "$1"

      
        17
        
        -ext js  = node   -- "$1"

      
        18
        
        -ext sh  = sh     -- "$1"

      
        19
        21
         

      
        20
        22
         #== Video/Audio

      
        21
        23
         mime ^video,       has mpv,  X, flag f = mpv -- "$@"

      ···
        48
        50
         ext zip, has unzip = for file in "$@"; do unzip -d "${file%.*}" "$file"; done

      
        49
        51
         ext rar, has unrar = unrar l "$1" | less

      
        50
        52
         ext rar, has unrar = for file in "$@"; do unrar x "$file"; done

      
        51
        
        -

      
        52
        
        -#== Terminals

      
        53
        
        -mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@"

      
        54
        
        -mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@"

      
M config/rofi/config
···
        1
        
        -rofi.theme: nten

      
        
        1
        +rofi.theme: nten-light

      
        2
        2
         rofi.font: Jetbarains Mono 12

      
        3
        3
         rofi.auto-select: false

      
        4
        4
         rofi.hide-scrollbar: true

      
M config/rofi/script/powermenu.sh
···
        1
        1
         #!/usr/bin/env bash

      
        2
        2
         declare options=("ShutDown\nLogOut\nReboot")

      
        
        3
        +rofitheme="nten-light-dmenu"

      
        
        4
        +choice=$(echo -e ${options[@]} | rofi -dmenu -p "Power" -theme $rofitheme)

      
        3
        5
         

      
        4
        
        -choice=$(echo -e ${options[@]} | rofi -dmenu -p "Power" -theme nten-dmenu)

      
        5
        6
         case $choice in

      
        6
        7
             "ShutDown")

      
        7
        
        -        case "$(echo -e "Yes\nNo" | rofi -dmenu -p "ShutDown" -theme nten-dmenu)" in

      
        
        8
        +        case "$(echo -e "Yes\nNo" | rofi -dmenu -p "ShutDown" -theme $rofitheme)" in

      
        8
        9
                     "Yes") exec systemctl poweroff ;;

      
        9
        10
                     "no")  exec exit 0             ;;

      
        10
        11
                 esac

      
        11
        12
             ;;

      
        12
        13
             "LogOut")

      
        13
        
        -        case "$(echo -e "Yes\nNo" | rofi -dmenu -p "LogOut" -theme nten-dmenu)" in

      
        
        14
        +        case "$(echo -e "Yes\nNo" | rofi -dmenu -p "LogOut" -theme $rofitheme)" in

      
        14
        15
                     "Yes") exec loginctl terminate-session $XDG_SESSION_ID ;;

      
        15
        16
                     "No")  exec exit 0                                     ;;

      
        16
        17
                 esac

      
        17
        18
             ;;

      
        18
        19
             "Reboot")

      
        19
        
        -        case "$(echo -e "Yes\nNo" | rofi -dmenu -p "Reboot" -theme nten-dmenu)" in

      
        
        20
        +        case "$(echo -e "Yes\nNo" | rofi -dmenu -p "Reboot" -theme $rofitheme)" in

      
        20
        21
                     "Yes") exec systemctl reboot ;;

      
        21
        22
                     "No")  exec exit 0           ;;

      
        22
        23
                 esac

      
M config/starship.toml
···
        1
        1
         add_newline = false

      
        2
        2
         

      
        3
        
        -[line_break]

      
        4
        
        -disabled = false

      
        5
        
        -

      
        6
        3
         [nodejs]

      
        7
        4
         symbol = "N.JS "

      
        8
        5
         

      ···
        12
        9
         [elm]

      
        13
        10
         symbol = "Elm "

      
        14
        11
         

      
        
        12
        +[java]

      
        
        13
        +disabled = true

      
        
        14
        +

      
        
        15
        +[package]

      
        
        16
        +symbol = "PKG "

      
        
        17
        +

      
        
        18
        +[cmd_duration]

      
        
        19
        +disabled = true

      
        15
        20
         

      
        16
        21
         [directory]

      
        17
        
        -truncation_length = 3

      
        
        22
        +truncation_length = 5

      
        18
        23
         truncate_to_repo = false

      
M gitconfig
···
        2
        2
           name = Smirnov Alexander

      
        3
        3
           email = ss2316544@gmail.com

      
        4
        4
         

      
        
        5
        +[github]

      
        
        6
        +  name = Smirnov-O

      
        
        7
        +

      
        5
        8
         [core]

      
        6
        9
           editor = nvim

      
        7
        10
         

      
        8
        11
         [alias]

      
        9
        
        -  ada = add -A

      
        10
        
        -  cmm = commit -m

      
        11
        
        -  br  = branch
      
        
        12
        +  ad = add -A

      
        
        13
        +  cm = commit -m

      
        
        14
        +  br = branch

      
        
        15
        +  df = diff

      
        
        16
        +  dh = diff HEAD

      
        
        17
        +  l = log --oneline --decorate

      
M tmux.conf
···
        36
        36
         bind -r K resize-pane -U 2

      
        37
        37
         bind -r L resize-pane -R 2

      
        38
        38
         

      
        
        39
        +## Alternative window move

      
        
        40
        +bind-key i swap-window -t -1

      
        
        41
        +bind-key o swap-window -t +1

      
        
        42
        +

      
        39
        43
         ## Alternative keys for create window

      
        40
        44
         bind _ split-window -v

      
        41
        45
         bind - split-window -h

      ···
        52
        56
         set -g status-left ' '

      
        53
        57
         

      
        54
        58
         ## Colors

      
        55
        
        -set -g status-bg black

      
        
        59
        +set -g status-bg default

      
        56
        60
         set -g status-fg white

      
        57
        61
         set -g status-style fg=colour110

      
        58
        62
         

      
M vscode/settings.json
···
        1
        1
         {

      
        2
        2
           "editor.fontFamily": "'Jetbrains Mono', 'Droid Sans Mono', 'monospace'",

      
        3
        3
           "workbench.colorTheme": "Brackets Light Pro",

      
        4
        
        -  "workbench.iconTheme": "vs-minimal",

      
        
        4
        +  "workbench.panel.defaultLocation": "right",

      
        5
        5
           "workbench.sideBar.location": "right",

      
        6
        
        -  "editor.wordWrap": "on",

      
        
        6
        +  "editor.wordWrap": "off",

      
        7
        7
           "editor.fontSize": 14,

      
        8
        8
           "editor.mouseWheelZoom": true,

      
        9
        9
           "editor.formatOnPaste": false,

      
        10
        
        -  "editor.formatOnSave": false,

      
        
        10
        +  "editor.formatOnSave": true,

      
        11
        11
           "editor.minimap.enabled": false,

      
        12
        12
           "editor.tabCompletion": "on",

      
        13
        13
           "editor.tabSize": 2,

      ···
        20
        20
           "git.confirmSync": false,

      
        21
        21
           "git.enableSmartCommit": true,

      
        22
        22
         

      
        23
        
        -  "liveSassCompile.settings.formats": [{"format": "expanded", "extensionName": ".css", "savePath": null}],

      
        24
        
        -  "liveSassCompile.settings.generateMap": false,

      
        
        23
        +  "prettier.semi": false,

      
        
        24
        +

      
        
        25
        +  "tabnine.experimentalAutoImports": true,

      
        
        26
        +

      
        25
        27
         

      
        26
        28
           "emmet.includeLanguages": {

      
        27
        29
             "javascript": "javascriptreact"

      
        28
        30
           },

      
        29
        31
           "[javascript]": {

      
        30
        32
             "editor.defaultFormatter": "esbenp.prettier-vscode",

      
        31
        
        -    "editor.tabSize": 2

      
        32
        33
           },

      
        33
        
        -  "[javascriptreact]": {

      
        
        34
        +  "[javascriptreact]":{

      
        34
        35
             "editor.defaultFormatter": "esbenp.prettier-vscode",

      
        35
        
        -    "editor.tabSize": 2

      
        36
        
        -  }

      
        37
        
        -}
      
        
        36
        +  },

      
        
        37
        +  "workbench.startupEditor": "newUntitledFile",

      
        
        38
        +  "editor.suggestSelection": "first",

      
        
        39
        +  "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",

      
        
        40
        +}

      
M zshrc
···
        1
        
        -export PATH="$HOME/bin:$HOME/.local/bin:$PATH"

      
        
        1
        +export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.n/bin:$HOME/.golang/bin:$HOME/go/bin:$PATH"

      
        
        2
        +export GOPATH="$HOME/go"

      
        2
        3
         export EDITOR="nvim"

      
        3
        4
         

      
        4
        5
         ### StartShip

      
        5
        6
         eval "$(starship init zsh)"

      
        6
        7
         

      
        
        8
        +### FzF

      
        
        9
        +export FZF_DEFAULT_COMMAND="rg --files --ignore-vcs"

      
        
        10
        +

      
        7
        11
         ### Oh my zsh

      
        8
        12
         export OMH="$HOME/.oh-my-zsh"

      
        9
        13
         #ZSH_THEME="simple"

      
        10
        14
         DISABLE_AUTO_TITLE="true"

      
        11
        
        -plugins=(npm)

      
        
        15
        +plugins=(docker npm)

      
        12
        16
         source $OMH/oh-my-zsh.sh

      
        13
        17
         

      
        14
        18
         ### Aliases

      
        
        19
        +source ~/.aliases.sh

      
        
        20
        +

      
        
        21
        +

      
        15
        22
         alias cls="clear"

      
        16
        23
         alias mkdir="mkdir -p"

      
        17
        24
         alias cp="cp -r"

      
        18
        
        -alias vim="nvim"

      
        19
        
        -alias vi="vim"

      
        
        25
        +alias vim="nvim" vi="vim"

      
        
        26
        +alias e="$EDITOR"

      
        20
        27
         alias tmux="tmux -2"

      
        21
        28
         alias :q="exit"

      
        22
        29
         alias ...="cd ../.."

      
        
        30
        +

      
        
        31
        +