all repos

dotfiles @ a453290

i use rach linux btw
7 files changed, 81 insertions(+), 150 deletions(-)
add emmet, buffer line to nvim, update vscode, del amfora & polybar weather script
Author: Smirnov Alexander ss2316544@gmail.com
Committed at: 2021-05-30 19:25:02 +0300
Parent: fcb370b
D config/amfora/config.toml
···
        1
        
        -[a-general]

      
        2
        
        -home   = "gemini://geminispace.info"

      
        3
        
        -search = "gemini://geminispace.info/search"

      
        4
        
        -http           = "librewolf"

      
        5
        
        -color          = true

      
        6
        
        -ansi           = true

      
        7
        
        -bullets        = true

      
        8
        
        -auto_redirect  = true

      
        9
        
        -emoji_favicons = true

      
        10
        
        -left_margin    = 0.15

      
        11
        
        -max_width      = 100

      
        12
        
        -downloads      = ""

      
        13
        
        -page_max_size  = 2097152

      
        14
        
        -page_max_time  = 10

      
        15
        
        -scrollbar      = "auto"

      
        16
        
        -

      
        17
        
        -

      
        18
        
        -[keybindings]

      
        19
        
        -bind_quit   = "q"

      
        20
        
        -bind_bottom = ["i", ":", ";"]

      
        21
        
        -bind_reload = ["Ctrl-R", "R"]

      
        22
        
        -bind_save   = ["Ctrl-S", "W"]

      
        23
        
        -bind_edit   = "I"

      
        24
        
        -

      
        25
        
        -# Navigation

      
        26
        
        -bind_back    = ["H", "h"]

      
        27
        
        -bind_forward = ["L", "l"]

      
        28
        
        -

      
        29
        
        -# Bookmaeks

      
        30
        
        -bind_bookmarks    = "b"

      
        31
        
        -bind_add_bookmark = "B"

      
        32
        
        -

      
        33
        
        -# Tab

      
        34
        
        -bind_new_tab   = "t"

      
        35
        
        -bind_close_tab = "T"

      
        36
        
        -bind_next_tab  = "J"

      
        37
        
        -bind_prev_tab  = "K"

      
        38
        
        -

      
        39
        
        -[theme]

      
        40
        
        -bg             = "#262A2B"

      
        41
        
        -fg             = "#dfdfdf"

      
        42
        
        -tab_num        = "#797979"

      
        43
        
        -bottombar_text = "#dfdfdf"

      
        44
        
        -bottombar_bg   = "#1F2324"

      
        45
        
        -scrollbar      = "#1F2324"

      
        46
        
        -btn_bg         = "#1F2324"

      
        47
        
        -btn_text       = "#dfdfdf"

      
        48
        
        -

      
        49
        
        -[[mediatype-handlers]]

      
        50
        
        -cmd       = "feh"

      
        51
        
        -types     = "image"

      
        52
        
        -no_prompt = true

      
        53
        
        -

      
        54
        
        -[cache]

      
        55
        
        -max_size  = 0

      
        56
        
        -max_pages = 30

      
        57
        
        -timeout   = 1800

      
        58
        
        -

      
        59
        
        -[subscriptions]

      
        60
        
        -popup            = true

      
        61
        
        -workers          = 3

      
        62
        
        -update_interval  = 1800

      
        63
        
        -entries_per_page = 20

      
        64
        
        -

      
        65
        
        -[auth]

      
        66
        
        -[auth.certs]

      
        67
        
        -[auth.keys]

      
        68
        
        -[proxies]

      
M config/bspwm/bspwmrc
···
        7
        7
           if ! pgrep $1

      
        8
        8
              then $@& fi

      
        9
        9
         }

      
        10
        
        -C() {  # BSPWM config

      
        
        10
        +C() {  # Config

      
        11
        11
             bspc config $@

      
        12
        12
         }

      
        13
        
        -R() {  # BSPWM rule

      
        
        13
        +R() {  # Set rule

      
        14
        14
             bspc rule -a $@

      
        15
        15
         }

      
        16
        16
         

      
        17
        
        -###== Autostart

      
        
        17
        +#== Autostart

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

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

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

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

      
        22
        22
         A picom -b &

      
        23
        23
         

      
        24
        
        -###== BSPWM

      
        
        24
        +#== BSPWM

      
        25
        25
         

      
        26
        26
         # Workspaces

      
        27
        27
         bspc monitor -d 1 2 3 4 5 6 7 8 9

      
        28
        28
         

      
        29
        29
         # General

      
        30
        
        -C border_width           2

      
        31
        
        -C window_gap             2

      
        32
        
        -C split_ratio            0.50

      
        33
        
        -C borderless_monocle     true

      
        34
        
        -C gapless_monocle        true

      
        35
        
        -C single_monocle         true

      
        36
        
        -C focus_follows_pointer  true

      
        
        30
        +C border_width          2

      
        
        31
        +C window_gap            2

      
        
        32
        +C split_ratio           0.50

      
        
        33
        +C borderless_monocle    true

      
        
        34
        +C gapless_monocle       true

      
        
        35
        +C single_monocle        true

      
        
        36
        +C focus_follows_pointer true

      
        37
        37
         

      
        38
        38
         # Colors

      
        39
        
        -C normal_border_color   "#f5f5f5"

      
        40
        
        -C active_border_color   "#1F2324"

      
        41
        
        -C focused_border_color  "#008DCD"

      
        42
        
        -C urgent_border_color   "#FF6C6B"

      
        
        39
        +C normal_border_color  "#090909"

      
        
        40
        +C active_border_color  "#1F2324"

      
        
        41
        +C focused_border_color "#008DCD"

      
        
        42
        +C urgent_border_color  "#FF6C6B"

      
        43
        43
         

      
        44
        
        -###== BSPWM Rules

      
        
        44
        +#== BSPWM Rules

      
        45
        45
         R kitty            desktop='^1' focus=on  follow=on

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

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

      
D config/bspwm/polybar/scripts/weather.py
···
        1
        
        -import requests

      
        2
        
        -import os

      
        3
        
        -

      
        4
        
        -

      
        5
        
        -API_KEY = os.getenv("OWM_POLYBAR")

      
        6
        
        -CITY = os.getenv("OWM_CITY")

      
        7
        
        -

      
        8
        
        -

      
        9
        
        -try:

      
        10
        
        -    JSON = requests.get(

      
        11
        
        -        f"http://api.openweathermap.org/data/2.5/weather?q={CITY}&lang=EN&&units=metric&appid={API_KEY}"

      
        12
        
        -    ).json()

      
        13
        
        -    print("", int(JSON["main"]["temp"]), "°С")

      
        14
        
        -except Exception:

      
        15
        
        -    print(" err")
      
M config/kitty/kitty.conf
···
        3
        3
         enable_audio_bell no

      
        4
        4
         open_url_modifiers ctrl

      
        5
        5
         cursor_blink_interval 0

      
        
        6
        +tab_bar_style powerline

      
        6
        7
         

      
        7
        
        -## HotKeys

      
        
        8
        +# HotKeys

      
        8
        9
         map ctrl+equal change_font_size all +2

      
        9
        10
         map ctrl+minus change_font_size all -2

      
        10
        11
         map ctrl+backspace change_font_size all 0

      
        
        12
        +map ctrl+1 first_window

      
        
        13
        +map ctrl+2 second_window

      
        
        14
        +map ctrl+3 third_window

      
        
        15
        +map ctrl+4 fourth_window

      
        11
        16
         

      
        12
        
        -## Theme

      
        13
        
        -#selection_background  #303030

      
        14
        
        -#selection_foreground #202020

      
        15
        
        -#background #202020

      
        16
        
        -#foreground #d0d0d0

      
        17
        
        -#cursor  #d0d0d0

      
        18
        
        -#color0  #151515

      
        19
        
        -#color8  #505050

      
        20
        
        -#color1  #ac4142

      
        21
        
        -#color9  #ac4142

      
        22
        
        -#color2  #7e8d50

      
        23
        
        -#color10 #7e8d50

      
        24
        
        -#color3  #e5b566

      
        25
        
        -#color11 #e5b566

      
        26
        
        -#color4  #6c99ba

      
        27
        
        -#color12 #6c99ba

      
        28
        
        -#color5  #9e4e85

      
        29
        
        -#color13 #9e4e85

      
        30
        
        -#color6  #7dd5cf

      
        31
        
        -#color14 #7dd5cf

      
        32
        
        -#color7  #d0d0d0

      
        33
        
        -#color15 #f5f5f5

      
        
        17
        +# Theme

      
        34
        18
         color0 #232323

      
        35
        19
         color1 #ff000f

      
        36
        20
         color2 #8ce10b

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

      
        2
        2
           Plug 'sheerun/vim-polyglot'

      
        3
        
        -  " Completion && LSP

      
        
        3
        +  " LSP && Completion

      
        4
        4
           Plug 'neovim/nvim-lspconfig'

      
        5
        5
           Plug 'hrsh7th/nvim-compe'

      
        
        6
        +  Plug 'mattn/emmet-vim', {'on': ['EmmetInstall', 'Emmet']}

      
        6
        7
           Plug 'jiangmiao/auto-pairs'

      
        7
        
        -  " Status line

      
        8
        
        -  Plug 'hoob3rt/lualine.nvim'

      
        9
        8
           " Theme

      
        10
        9
           Plug 'Smirnov-O/nten.vim'

      
        
        10
        +  " Status line & Buffer line

      
        
        11
        +  Plug 'hoob3rt/lualine.nvim'

      
        
        12
        +  Plug 'romgrk/barbar.nvim'

      
        11
        13
         call plug#end()

      
        12
        14
         

      
        13
        15
         "== General

      
        14
        16
         colo codedark         " Color scheme

      
        15
        17
         set termguicolors     " GUI colors

      
        16
        
        -set nu rnu cul        " Line numbers & cursor highlight

      
        
        18
        +set nu rnu cul        " Line numbers & cursor line highlight

      
        17
        19
         set nolbr nowrap      " Line wrap

      
        18
        20
         set mouse=a mh        " Mouse

      
        19
        21
         set history=500       " Set history size

      ···
        22
        24
         set visualbell t_vb=  " Disable sounds

      
        23
        25
         set pumheight=8       " Maximum items in pop up

      
        24
        26
         set modeline          " Enable modeline

      
        
        27
        +set nosmd             " Disable show mode

      
        25
        28
         set nobk noswf noudf  " Swap files

      
        26
        29
         set is ic scs         " Search

      
        27
        30
         let mapleader=";"     " Set leader key

      ···
        34
        37
         set ts=4 sw=4 sts=4

      
        35
        38
         set sta et ai

      
        36
        39
         

      
        
        40
        +"== Tab line

      
        
        41
        +let bufferline = get(g:, 'bufferline', {})

      
        
        42
        +let g:bufferline.icons = v:false

      
        
        43
        +let g:bufferline.icon_close_tab = '🗴'

      
        
        44
        +

      
        37
        45
         "== Status line

      
        38
        46
         lua require'lualine'.setup({options = {

      
        39
        
        -\ theme = "codedark"

      
        
        47
        +\     theme = "codedark"

      
        40
        48
         \ }})

      
        
        49
        +

      
        
        50
        +"== Emmet

      
        
        51
        +let g:user_emmet_mode = "inc"

      
        
        52
        +let g:user_emmet_leader_key=','

      
        
        53
        +let g:user_emmet_settings = {'javascript': {

      
        
        54
        +\   'extends': 'jsx'

      
        
        55
        +\ }}

      
        41
        56
         

      
        42
        57
         "== Completion(LSP)

      
        43
        58
         ino <expr> <tab> pumvisible() ? "\<C-n>" : "\<tab>"

      ···
        70
        85
         "== Custom setting for another files

      
        71
        86
         au FileType python,elm setl sw=4 ts=4

      
        72
        87
         au FileType javascript,javascriptreact,json,yaml setl sw=2 ts=2

      
        
        88
        +au FileType javascript,javascriptreact,css,scss,less EmmetInstall

      
        73
        89
         au FileType go setl noet sw=4 ts=4

      
        74
        90
         

      
        75
        91
         "== Custom commands

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

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

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

      
        4
        
        -  "workbench.panel.defaultLocation": "bottom",

      
        
        2
        +  "update.showReleaseNotes": false,

      
        
        3
        +  "window.menuBarVisibility": "hidden",

      
        
        4
        +

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

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

      
        7
        
        -  "editor.fontSize": 14,

      
        
        6
        +  "workbench.editor.untitled.hint": "hidden",

      
        
        7
        +  "workbench.iconTheme": "vs-minimal",

      
        
        8
        +

      
        
        9
        +  "explorer.compactFolders": false,

      
        
        10
        +  "explorer.confirmDragAndDrop": false,

      
        
        11
        +  "explorer.confirmDelete": false,

      
        
        12
        +

      
        
        13
        +  "editor.cursorSmoothCaretAnimation": true,

      
        
        14
        +  "editor.fontFamily": "'Jetbrains Mono', monospace",

      
        
        15
        +  "editor.hover.enabled": false,

      
        
        16
        +  "editor.lightbulb.enabled": false,

      
        
        17
        +  "editor.minimap.enabled": false,

      
        
        18
        +  "editor.smoothScrolling": true,

      
        8
        19
           "editor.mouseWheelZoom": true,

      
        9
        20
           "editor.formatOnPaste": false,

      
        10
        21
           "editor.formatOnSave": true,

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

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

      
        13
        
        -  "editor.tabSize": 2,

      
        14
        
        -  "explorer.confirmDelete": false,

      
        15
        
        -  "explorer.confirmDragAndDrop": false,

      
        16
        
        -  "window.menuBarVisibility": "hidden",

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

      
        
        24
        +  "editor.fontSize": 14,

      
        
        25
        +  "editor.tabSize": 4,

      
        
        26
        +

      
        
        27
        +  "files.insertFinalNewline": true,

      
        
        28
        +  "files.trimFinalNewlines": true,

      
        
        29
        +  "files.trimTrailingWhitespace": true,

      
        17
        30
         

      
        18
        
        -  "gitlens.codeLens.enabled": false,

      
        
        31
        +  "gitlens.codeLens.enabled": true,

      
        19
        32
           "git.autofetch": true,

      
        20
        33
           "git.confirmSync": false,

      
        21
        34
           "git.enableSmartCommit": true,

      
        22
        35
         

      
        23
        
        -  "prettier.semi": false,

      
        
        36
        +  "extensions.ignoreRecommendations": true,

      
        
        37
        +

      
        24
        38
           "tabnine.experimentalAutoImports": true,

      
        25
        
        -  "html.format.enable": false,

      
        26
        39
         

      
        
        40
        +  "prettier.semi": false,

      
        
        41
        +  "html.format.enable": false,

      
        27
        42
         

      
        28
        
        -  "emmet.includeLanguages": {

      
        29
        
        -    "javascript": "javascriptreact"

      
        30
        
        -  },

      
        
        43
        +  "emmet.includeLanguages": {"javascript": "javascriptreact"},

      
        31
        44
           "[javascript]": {

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

      
        
        46
        +    "editor.tabSize": 2,

      
        33
        47
           },

      
        34
        
        -  "[javascriptreact]":{

      
        
        48
        +  "[javascriptreact]": {

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

      
        36
        
        -  },

      
        37
        
        -  "workbench.startupEditor": "none"

      
        
        50
        +    "editor.tabSize": 2,

      
        
        51
        +  }

      
        38
        52
         }

      
M zshrc
···
        7
        7
         export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$PATH"

      
        8
        8
         

      
        9
        9
         ## Oh my zsh

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

      
        11
        
        -# ZSH_THEME="simple"

      
        12
        10
         plugins=(dotenv)

      
        13
        
        -source $OMH/oh-my-zsh.sh

      
        
        11
        +ZSH_THEME="simple"

      
        
        12
        +source "$HOME/.oh-my-zsh/oh-my-zsh.sh"

      
        14
        13
         

      
        15
        14
         ## HotKets

      
        16
        15
         bindkey -s "^o" "ranger\n"

      
        17
        
        -bindkey -s "^v" 'nvim $(fzf)\n'

      
        
        16
        +bindkey -s "^e" 'nvim $(fzf)\n'

      
        18
        17
         bindkey -s "^f" 'cd $(fd -t directory | fzf)\n'

      
        
        18
        +bindkey -s "^g" "lazygit\n"

      
        19
        19
         

      
        20
        20
         ## FNM

      
        21
        21
         eval $(fnm env)