diff --git a/README.md b/README.md index 4eb8048..e6ab1c0 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,14 @@ + Bar: polybar + Notifications: dunst + Compositor: [picom](https://github.com/ibhagwan/picom) -+ Set Wallpaper: feh ++ Image Viewer: feh + Info: [fet.sh](https://github.com/6gk/fet.sh) + Screenshots: Flameshot ## Dependencies -+ vim-plug: `curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim` ++ [vim-plug](https://github.com/junegunn/vim-plug) ++ fzf ### Nvim LSP diff --git a/laptop/.config/alacritty/alacritty.yml b/laptop/.config/alacritty/alacritty.yml index ec1766f..994da53 100644 --- a/laptop/.config/alacritty/alacritty.yml +++ b/laptop/.config/alacritty/alacritty.yml @@ -87,34 +87,34 @@ font: # x: 0 # y: 0 -# Colors (Solarized Dark) +# Colors (One Dark) colors: # Default colors primary: - background: '0x002b36' - foreground: '0x839496' + background: '0x1e2127' + foreground: '0xabb2bf' # Normal colors normal: - black: '0x073642' - red: '0xdc322f' - green: '0x859900' - yellow: '0xb58900' - blue: '0x268bd2' - magenta: '0xd33682' - cyan: '0x2aa198' - white: '0xeee8d5' + black: '0x1e2127' + red: '0xe06c75' + green: '0x98c379' + yellow: '0xd19a66' + blue: '0x61afef' + magenta: '0xc678dd' + cyan: '0x56b6c2' + white: '0xabb2bf' # Bright colors bright: - black: '0x002b36' - red: '0xcb4b16' - green: '0x586e75' - yellow: '0x657b83' - blue: '0x839496' - magenta: '0x6c71c4' - cyan: '0x93a1a1' - white: '0xfdf6e3' + black: '0x5c6370' + red: '0xe06c75' + green: '0x98c379' + yellow: '0xd19a66' + blue: '0x61afef' + magenta: '0xc678dd' + cyan: '0x56b6c2' + white: '0xffffff' background_opacity: 0.95 diff --git a/laptop/.config/i3/config b/laptop/.config/i3/config index 0150db1..568872f 100644 --- a/laptop/.config/i3/config +++ b/laptop/.config/i3/config @@ -140,8 +140,8 @@ new_window 1pixel # Set Border for_window [class="^.*"] border pixel 1 -set $red "#dc322f" -set $termbg "#002b36" +set $red "#e06c75" +set $termbg "#1e2127" # class border backgr. text indic. child_border client.focused #ffffff #ffffff #000000 #ffffff #ffffff diff --git a/laptop/.config/polybar/config b/laptop/.config/polybar/config index aecb278..cdd99db 100644 --- a/laptop/.config/polybar/config +++ b/laptop/.config/polybar/config @@ -3,8 +3,7 @@ [colors] background = #000000 foreground = #ffffff -urgent = ${xrdb:color1} -#urgent = #ff0000 +urgent = #e06c75 [bar/laptop] monitor = ${env:MONITOR} @@ -25,7 +24,7 @@ padding-right = 1 separator = / modules-left = i3 xwindow -modules-right = spotify network networkupdown volume backlight battery date +modules-right = spotify network volume backlight battery date foreground = ${colors.foreground} background = ${colors.background} @@ -70,14 +69,13 @@ label-maxlen = 100 [module/date] type = internal/date -date = %H:%M - %a %d.%m.%Y% +date = %a, %d %H:%M [module/backlight] type = internal/backlight #ls -1 /sys/class/backlight card = amdgpu_bl0 -format-prefix = " " -label = %percentage%% +label =  %percentage%% [module/battery] type = internal/battery @@ -132,7 +130,7 @@ interface = wlo1 interval = 3.0 accumulate-stats = true unknown-as-up = true -label-connected =  %essid%: %signal%% +label-connected =  %essid% label-disconnected = no wifi [module/networkupdown] diff --git a/laptop/.tmux.conf b/laptop/.tmux.conf index 751c7c3..7282e80 100644 --- a/laptop/.tmux.conf +++ b/laptop/.tmux.conf @@ -1,4 +1,4 @@ -set -g default-terminal "tmux-256color" +set -g default-terminal "xterm-256color" #some vi behaviour bind-key -r h select-pane -L diff --git a/laptop/.vimrc b/laptop/.vimrc index a85438d..274912b 100644 --- a/laptop/.vimrc +++ b/laptop/.vimrc @@ -12,11 +12,13 @@ let mapleader = "\" " ============================== vim-plug call plug#begin() -Plug 'altercation/vim-colors-solarized' " Colorscheme +Plug 'joshdick/onedark.vim' " Colorscheme Plug 'tpope/vim-sleuth' " Automatic intendations -Plug 'jiangmiao/auto-pairs' " Pair Completion +Plug 'jiangmiao/auto-pairs' " Pair ompletion + +Plug 'airblade/vim-gitgutter' " Show git changes if executable("fzf") Plug 'junegunn/fzf' @@ -24,8 +26,10 @@ if executable("fzf") endif if has ("nvim") - Plug 'neovim/nvim-lspconfig' " language client - Plug 'nvim-lua/completion-nvim' " fancy autocomplete + Plug 'neovim/nvim-lspconfig' " LSP + Plug 'Shougo/neosnippet.vim' + Plug 'Shougo/neosnippet-snippets' + Plug 'nvim-lua/completion-nvim' " Fancy autocomplete endif call plug#end() @@ -33,8 +37,9 @@ call plug#end() " ============================== Colors syntax on set background=dark -colorscheme solarized +colorscheme onedark hi Normal ctermbg=NONE guibg=NONE +set termguicolors filetype indent plugin on " ============================== General @@ -114,6 +119,39 @@ if has ("nvim") " Avoid showing message extra message when using completion set shortmess+=c + + let g:completion_trigger_keyword_length = 1 + let g:completion_matching_ignore_case = 1 + let g:completion_trigger_on_delete = 1 + + let g:completion_enable_snippet = 'Neosnippet' + + let g:completion_chain_complete_list = { + \ 'default' : { + \ 'default': [ + \ {'complete_items': ['lsp', 'snippet', 'path']}, + \ {'mode': ''}, + \ {'mode': ''}], + \ } + \} + + set pumheight=10 +endif + +" ++++++++++ lsp Settings +if has ("nvim") + " Show definition + nnoremap gd lua vim.lsp.buf.definition() + " Go to references + nnoremap gr lua vim.lsp.buf.references() + nnoremap K lua vim.lsp.buf.hover() +endif + +" ++++++++++ neosnippet Settings +if has ("nvim") + imap (neosnippet_expand_or_jump) + smap (neosnippet_expand_or_jump) + xmap (neosnippet_expand_target) endif " ++++++++++ Enable Language Servers diff --git a/laptop/.zshrc b/laptop/.zshrc index 256db1e..84dc2bb 100644 --- a/laptop/.zshrc +++ b/laptop/.zshrc @@ -12,7 +12,8 @@ autoload -U colors && colors precmd_vcs_info() { vcs_info } precmd_functions+=( precmd_vcs_info ) setopt prompt_subst -export PROMPT="%{$fg[yellow]%}%m %{$fg[blue]%}%~%{$fg[cyan]%}\$vcs_info_msg_0_ %{$reset_color%}" +GIT="%{$fg[cyan]%}\$vcs_info_msg_0_" +export PROMPT="%{$fg[yellow]%}%m %{$fg[blue]%}%~$GIT %{$reset_color%}" zstyle ':vcs_info:git:*' formats '|%b ' # ============================== Exports diff --git a/screenshots/home_new.png b/screenshots/home_new.png index 49642da..e01a8af 100644 Binary files a/screenshots/home_new.png and b/screenshots/home_new.png differ