diff --git a/config/i3/config b/config/i3/config index 174b342..45ef9ec 100644 --- a/config/i3/config +++ b/config/i3/config @@ -20,15 +20,15 @@ set $terminal alacritty set $browser firefox set $filemanager alacritty --title=ranger -e ranger set $codeeditor alacritty --title=nvim -e nvim -set $guicode vscodium +set $guicode code ############ Autostart ############ exec_always --no-startup-id exec setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" exec_always --no-startup-id exec picom --experimental-backends -b -exec_always --no-startup-id exec $HOME/.config/i3/bar.sh +#exec_always --no-startup-id exec $HOME/.config/i3/bar.sh exec --no-startup-id exec nitrogen --restore exec --no-startup-id exec lxsession -exec --no-startup-id exec $HOME/.script/autolock +#exec --no-startup-id exec $HOME/.script/autolock #exec --no-startup-id exec org.telegram.desktop #exec --no-startup-id exec discord #exec --no-startup-id exec conky @@ -163,6 +163,22 @@ bindsym $mod+Shift+7 move container to workspace $ws7 bindsym $mod+Shift+8 move container to workspace $ws8 bindsym $mod+Shift+9 move container to workspace $ws9 +############### Bar ############### +bar { + status_command i3status-rs ~/.config/i3/i3status-rs.toml + font pango:JetBrains Mono 10 + position top + colors { + background #262A2B + statusline #FFFFFF + separator #58676C + focused_workspace #008DCD #008DCD #FFFFFF + active_workspace #262A2B #262A2B #FFFFFF + inactive_workspace #262A2B #262A2B #DFDFDF + urgent_workspace #FF6C6B #FF6C6B #FFFFFF + binding_mode #2F343A #900000 #FFFFFF + } +} ############## Colors ############# # Class Border Backgr Text Indicator Child_border client.focused #008DCD #008DCD #FFFFFF #008DCD #008DCD diff --git a/config/i3/i3status-rs.toml b/config/i3/i3status-rs.toml new file mode 100644 index 0000000..86ed10a --- /dev/null +++ b/config/i3/i3status-rs.toml @@ -0,0 +1,39 @@ +theme = "native" +icons = "awesome5" + +### CPU load +[[block]] +block = "cpu" +interval = 5 + +### Blacklight +[[block]] +block = "backlight" +device = "intel_backlight" + +### Volume +[[block]] +block = "sound" +step_width = 2 + +### WiFi signal +#[[block]] +#block = "custom" +#command = "cat /proc/net/wireless | grep \"wlp3s0\" | awk '{print $4}' | grep -o '[0-9]*'" +#interval = 10 + +### Keyboard layout +[[block]] +block = "custom" +interval = 0 +command = """ +case "$(xkblayout)" in + Eng) echo "us" ;; + Ukr) echo "ua" ;; +esac""" + +### Date && time +[[block]] +block = "time" +interval = 60 +format = "%H:%M" \ No newline at end of file diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 0a04f01..52af522 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -5,22 +5,18 @@ call plug#begin('~/.vim/plugged') Plug 'dense-analysis/ale' " Linter Plug 'airblade/vim-gitgutter' " Git indicator Plug 'ap/vim-css-color' " Preview CSS colors - Plug 'SirVer/ultisnips' " Snippets Plug 'jiangmiao/auto-pairs' " Auto close brackets Plug 'editorconfig/editorconfig-vim' " Editor Config support Plug 'christoomey/vim-tmux-navigator' " Jump from vim in tmux Plug 'maxboisvert/vim-simple-complete' " Sublime like completion - " History && file explorer - Plug 'mbbill/undotree', {'on': 'UndotreeToggle'} " Git like history - Plug 'scrooloose/nerdtree', {'on': 'NERDTreeToggle'} " File explorer - Plug 'mattn/emmet-vim', {'for': ['javascript.jsx', 'html']} - " Language support Plug 'pangloss/vim-javascript', {'for': 'javascript'} Plug 'mxw/vim-jsx', {'for': ['javascript.jsx', 'javascript']} Plug 'plasticboy/vim-markdown', {'for': 'markdown'} Plug 'PotatoesMaster/i3-vim-syntax', {'for': 'i3'} + Plug 'cespare/vim-toml', {'for': 'toml'} + Plug 'zah/nim.vim', {'for': 'nim'} call plug#end() syntax on @@ -96,29 +92,6 @@ let g:lightline = { \ 'linter_warnings': 'lightline#ale#warnings' \ }, } -" NERDTree -nnoremap :NERDTreeToggle -let g:NERDTreeWinPos="right" -let NERDTreeIgnore = ['__pycache__', 'node_modules'] -let NERDTreeShowHidden=0 -let g:NERDTreeWinSize = 28 - -" UltiSnips -let g:UltiSnipsExpandTrigger = "" -let g:UltiSnipsJumpForwardTrigger = "" -let g:UltiSnipsJumpBackwardTrigger = "" -let g:UltiSnipsSnippetDirectories = ["snips"] -let g:UltiSnipsEditSplit = "vertical" - -" Emmet -let g:user_emmet_expandabbr_key='' -let g:user_emmet_mode='a' - -" Neoterm -let g:neoterm_default_mod = 'vertical' -let g:neoterm_size = 30 -let g:neoterm_autoinsert = 1 - " Ale let g:ale_disable_lsp = 1 let g:ale_sign_error = '> ' @@ -129,7 +102,7 @@ let g:ale_fixers = { \ 'python': ['flake8', 'pylint8']} " == Mapping -let mapleader="," +let mapleader="\\" imap jj " Window(s) @@ -163,3 +136,7 @@ noremap :tabn 9 " Buffer(s) noremap b :bnext noremap p :bprev + +" Paste & copy from/in system clipboard +noremap c "*yy +noremap v "+p diff --git a/vscode/settings.json b/vscode/settings.json index 3579527..a1d9104 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -21,8 +21,6 @@ {"before": ["f"], "after" : ["leader","leader","s"]} ], - "Vsnips.VarFiles": ["/home/sasha/.config/nvim/init.vim"], - "Vsnips.SnipsDir": ["/home/sasha/.config/nvim/snips"], // Terminal "workbench.panel.defaultLocation": "right", @@ -99,4 +97,5 @@ "[javascriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "workbench.startupEditor": "newUntitledFile", } \ No newline at end of file diff --git a/zshrc b/zshrc index 9628087..2d34e0f 100644 --- a/zshrc +++ b/zshrc @@ -1,5 +1,5 @@ export ZSH="$HOME/.oh-my-zsh" -export PATH="$HOME/bin:$HOME/.local/bin:$GOPATH/bin:$PATH" +export PATH="$HOME/.yarn/bin:$HOME/bin:$HOME/.local/bin:$GOPATH/bin:$PATH" source ~/.profile ### Oh my zsh ###