add emmet, buffer line to nvim, update vscode, del amfora & polybar weather script

This commit is contained in:
Smirnov Alexander 2021-05-30 19:25:02 +03:00
parent fcb370ba0b
commit a4532907b4
7 changed files with 81 additions and 150 deletions

View file

@ -1,68 +0,0 @@
[a-general]
home = "gemini://geminispace.info"
search = "gemini://geminispace.info/search"
http = "librewolf"
color = true
ansi = true
bullets = true
auto_redirect = true
emoji_favicons = true
left_margin = 0.15
max_width = 100
downloads = ""
page_max_size = 2097152
page_max_time = 10
scrollbar = "auto"
[keybindings]
bind_quit = "q"
bind_bottom = ["i", ":", ";"]
bind_reload = ["Ctrl-R", "R"]
bind_save = ["Ctrl-S", "W"]
bind_edit = "I"
# Navigation
bind_back = ["H", "h"]
bind_forward = ["L", "l"]
# Bookmaeks
bind_bookmarks = "b"
bind_add_bookmark = "B"
# Tab
bind_new_tab = "t"
bind_close_tab = "T"
bind_next_tab = "J"
bind_prev_tab = "K"
[theme]
bg = "#262A2B"
fg = "#dfdfdf"
tab_num = "#797979"
bottombar_text = "#dfdfdf"
bottombar_bg = "#1F2324"
scrollbar = "#1F2324"
btn_bg = "#1F2324"
btn_text = "#dfdfdf"
[[mediatype-handlers]]
cmd = "feh"
types = "image"
no_prompt = true
[cache]
max_size = 0
max_pages = 30
timeout = 1800
[subscriptions]
popup = true
workers = 3
update_interval = 1800
entries_per_page = 20
[auth]
[auth.certs]
[auth.keys]
[proxies]

View file

@ -7,41 +7,41 @@ A() { # AutoStart
if ! pgrep $1
then $@& fi
}
C() { # BSPWM config
C() { # Config
bspc config $@
}
R() { # BSPWM rule
R() { # Set rule
bspc rule -a $@
}
###== Autostart
#== Autostart
A feh --randomize --bg-scale ~/Pictures/wallp &
xautolock -time 5 -locker "slock" &
A sxhkd -c ~/.config/bspwm/sxhkd &
~/.config/bspwm/polybar/bar.sh &
A picom -b &
###== BSPWM
#== BSPWM
# Workspaces
bspc monitor -d 1 2 3 4 5 6 7 8 9
# General
C border_width 2
C window_gap 2
C split_ratio 0.50
C borderless_monocle true
C gapless_monocle true
C single_monocle true
C focus_follows_pointer true
C border_width 2
C window_gap 2
C split_ratio 0.50
C borderless_monocle true
C gapless_monocle true
C single_monocle true
C focus_follows_pointer true
# Colors
C normal_border_color "#f5f5f5"
C active_border_color "#1F2324"
C focused_border_color "#008DCD"
C urgent_border_color "#FF6C6B"
C normal_border_color "#090909"
C active_border_color "#1F2324"
C focused_border_color "#008DCD"
C urgent_border_color "#FF6C6B"
###== BSPWM Rules
#== BSPWM Rules
R kitty desktop='^1' focus=on follow=on
R Google-chrome desktop='^2' focus=on follow=on
R LibreWolf desktop='^2' focus=on follow=on

View file

@ -1,15 +0,0 @@
import requests
import os
API_KEY = os.getenv("OWM_POLYBAR")
CITY = os.getenv("OWM_CITY")
try:
JSON = requests.get(
f"http://api.openweathermap.org/data/2.5/weather?q={CITY}&lang=EN&&units=metric&appid={API_KEY}"
).json()
print("", int(JSON["main"]["temp"]), "°С")
except Exception:
print(" err")

View file

@ -3,34 +3,18 @@ disable_ligatures always
enable_audio_bell no
open_url_modifiers ctrl
cursor_blink_interval 0
tab_bar_style powerline
## HotKeys
# HotKeys
map ctrl+equal change_font_size all +2
map ctrl+minus change_font_size all -2
map ctrl+backspace change_font_size all 0
map ctrl+1 first_window
map ctrl+2 second_window
map ctrl+3 third_window
map ctrl+4 fourth_window
## Theme
#selection_background #303030
#selection_foreground #202020
#background #202020
#foreground #d0d0d0
#cursor #d0d0d0
#color0 #151515
#color8 #505050
#color1 #ac4142
#color9 #ac4142
#color2 #7e8d50
#color10 #7e8d50
#color3 #e5b566
#color11 #e5b566
#color4 #6c99ba
#color12 #6c99ba
#color5 #9e4e85
#color13 #9e4e85
#color6 #7dd5cf
#color14 #7dd5cf
#color7 #d0d0d0
#color15 #f5f5f5
# Theme
color0 #232323
color1 #ff000f
color2 #8ce10b

View file

@ -1,19 +1,21 @@
call plug#begin('~/.vim/plugged')
Plug 'sheerun/vim-polyglot'
" Completion && LSP
" LSP && Completion
Plug 'neovim/nvim-lspconfig'
Plug 'hrsh7th/nvim-compe'
Plug 'mattn/emmet-vim', {'on': ['EmmetInstall', 'Emmet']}
Plug 'jiangmiao/auto-pairs'
" Status line
Plug 'hoob3rt/lualine.nvim'
" Theme
Plug 'Smirnov-O/nten.vim'
" Status line & Buffer line
Plug 'hoob3rt/lualine.nvim'
Plug 'romgrk/barbar.nvim'
call plug#end()
"== General
colo codedark " Color scheme
set termguicolors " GUI colors
set nu rnu cul " Line numbers & cursor highlight
set nu rnu cul " Line numbers & cursor line highlight
set nolbr nowrap " Line wrap
set mouse=a mh " Mouse
set history=500 " Set history size
@ -22,6 +24,7 @@ set hidden " Change buffet without warning
set visualbell t_vb= " Disable sounds
set pumheight=8 " Maximum items in pop up
set modeline " Enable modeline
set nosmd " Disable show mode
set nobk noswf noudf " Swap files
set is ic scs " Search
let mapleader=";" " Set leader key
@ -34,11 +37,23 @@ set list listchars=tab:\|·,trail:~,space:·
set ts=4 sw=4 sts=4
set sta et ai
"== Tab line
let bufferline = get(g:, 'bufferline', {})
let g:bufferline.icons = v:false
let g:bufferline.icon_close_tab = '🗴'
"== Status line
lua require'lualine'.setup({options = {
\ theme = "codedark"
\ theme = "codedark"
\ }})
"== Emmet
let g:user_emmet_mode = "inc"
let g:user_emmet_leader_key=','
let g:user_emmet_settings = {'javascript': {
\ 'extends': 'jsx'
\ }}
"== Completion(LSP)
ino <expr> <tab> pumvisible() ? "\<C-n>" : "\<tab>"
ino <expr> <s-tab> pumvisible() ? "\<C-p>" : "\<tab>"
@ -70,6 +85,7 @@ let g:netrw_dirhistmax = 0
"== Custom setting for another files
au FileType python,elm setl sw=4 ts=4
au FileType javascript,javascriptreact,json,yaml setl sw=2 ts=2
au FileType javascript,javascriptreact,css,scss,less EmmetInstall
au FileType go setl noet sw=4 ts=4
"== Custom commands

View file

@ -1,38 +1,52 @@
{
"editor.fontFamily": "'Jetbrains Mono', 'Droid Sans Mono', 'monospace'",
"workbench.colorTheme": "Brackets Light Pro",
"workbench.panel.defaultLocation": "bottom",
"update.showReleaseNotes": false,
"window.menuBarVisibility": "hidden",
"workbench.sideBar.location": "right",
"editor.wordWrap": "off",
"editor.fontSize": 14,
"workbench.editor.untitled.hint": "hidden",
"workbench.iconTheme": "vs-minimal",
"explorer.compactFolders": false,
"explorer.confirmDragAndDrop": false,
"explorer.confirmDelete": false,
"editor.cursorSmoothCaretAnimation": true,
"editor.fontFamily": "'Jetbrains Mono', monospace",
"editor.hover.enabled": false,
"editor.lightbulb.enabled": false,
"editor.minimap.enabled": false,
"editor.smoothScrolling": true,
"editor.mouseWheelZoom": true,
"editor.formatOnPaste": false,
"editor.formatOnSave": true,
"editor.minimap.enabled": false,
"editor.tabCompletion": "on",
"editor.tabSize": 2,
"explorer.confirmDelete": false,
"explorer.confirmDragAndDrop": false,
"window.menuBarVisibility": "hidden",
"editor.wordWrap": "off",
"editor.fontSize": 14,
"editor.tabSize": 4,
"gitlens.codeLens.enabled": false,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"gitlens.codeLens.enabled": true,
"git.autofetch": true,
"git.confirmSync": false,
"git.enableSmartCommit": true,
"prettier.semi": false,
"extensions.ignoreRecommendations": true,
"tabnine.experimentalAutoImports": true,
"prettier.semi": false,
"html.format.enable": false,
"emmet.includeLanguages": {
"javascript": "javascriptreact"
},
"emmet.includeLanguages": {"javascript": "javascriptreact"},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 2,
},
"[javascriptreact]":{
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
},
"workbench.startupEditor": "none"
"editor.tabSize": 2,
}
}

8
zshrc
View file

@ -7,15 +7,15 @@ export EDITOR="nvim"
export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$PATH"
## Oh my zsh
export OMH="$HOME/.oh-my-zsh"
# ZSH_THEME="simple"
plugins=(dotenv)
source $OMH/oh-my-zsh.sh
ZSH_THEME="simple"
source "$HOME/.oh-my-zsh/oh-my-zsh.sh"
## HotKets
bindkey -s "^o" "ranger\n"
bindkey -s "^v" 'nvim $(fzf)\n'
bindkey -s "^e" 'nvim $(fzf)\n'
bindkey -s "^f" 'cd $(fd -t directory | fzf)\n'
bindkey -s "^g" "lazygit\n"
## FNM
eval $(fnm env)