From dc022c5837b539f7f288a2724a944aeaa572abef Mon Sep 17 00:00:00 2001 From: vibikim Date: Sat, 22 Aug 2020 19:04:56 +0300 Subject: [PATCH] xresources, st, nvim and more --- .Xresources | 38 +++++++++++++++ .bashrc | 1 + .profile | 4 +- README.md | 10 ++-- bspwm/bspwmrc | 20 +++++++- install.sh | 2 + kitty/kitty.conf | 29 ------------ kitty/night.conf | 29 ------------ kitty/pastels.conf | 25 ---------- kitty/sunset.conf | 24 ---------- nvim/.netrwhist | 11 +++++ nvim/init.vim | 42 +++++++++++++++++ polybar/config.ini | 32 +++++++++---- sxhkd/sxhkdrc | 2 + termite/config | 113 --------------------------------------------- 15 files changed, 145 insertions(+), 237 deletions(-) create mode 100644 .Xresources delete mode 100644 kitty/kitty.conf delete mode 100644 kitty/night.conf delete mode 100644 kitty/pastels.conf delete mode 100644 kitty/sunset.conf create mode 100644 nvim/.netrwhist create mode 100644 nvim/init.vim delete mode 100644 termite/config diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..5c37c81 --- /dev/null +++ b/.Xresources @@ -0,0 +1,38 @@ +! special +*.foreground: #cee3eb +*.background: #010202 +*.cursorColor: #cee3eb +*.font: TerminessTTF Nerd Font Mono:size=12 + +! black +*.color0: #020405 +*.color8: #51a285 + +! red +*.color1: #0e1416 +*.color9: #E36441 + +! green +*.color2: #1d272a +*.color10: #93a350 + +! yellow +*.color3: #314045 +*.color11: #e38c41 + +! blue +*.color4: #4c6067 +*.color12: #5ac9e6 + +! magenta +*.color5: #6c8791 +*.color13: #f947b5 + +! cyan +*.color6: #91b5c2 +*.color14: #52d4a9 + +! white +*.color7: #d3e6ed +*.color15: #9fb52e + diff --git a/.bashrc b/.bashrc index 27da0b2..bd428a8 100644 --- a/.bashrc +++ b/.bashrc @@ -145,6 +145,7 @@ export YAOURT_COLORS="nb=1:pkg=1:ver=1;32:lver=1;45:installed=1;42:grp=1;34:od=1 # User added aliases alias yeet='yay' +alias vim='nvim' alias gcloud-ssh-bot='gcloud beta compute --project "vibot-discord" ssh --zone "europe-west3-c" "redbot"' alias gcloud-ssh-multipurpose='gcloud beta compute --project "multipurpose-vps-264707" ssh --zone "us-west2-c" "vibikim@halo" --ssh-flag="-p 22"' diff --git a/.profile b/.profile index 64f046e..2435b2e 100644 --- a/.profile +++ b/.profile @@ -1,8 +1,8 @@ # This runs at login. Normally environmental variables are set here. # Default programs: -export EDITOR="vim" -export TERMINAL="kitty" +export EDITOR="nvim" +export TERMINAL="st" export BROWSER="firefox" export READER="zathura" export FILEMANAGER="pcmanfm" diff --git a/README.md b/README.md index d8c7bef..ed2bef7 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,19 @@ # My dotfiles~ -### My dotfiles are a hot mess right now +### My dotfiles are a hot mess right now (but more and more manageable with every commit) I made this repo mostly to keep my dotfiles in sync across computers, so yeah... It's mostly defaults or other's configs slightly modified to my taste. What I use right now (stuff I have to install on a fresh linux install): +------------------------------------------------------------------------ * bspwm * sxhkd * polybar * dunst -* kitty (will do st in the future) -* pcmanfm and lf +* st -- my build is [right here ](https://github.com/vibikim/st) +* nemo and lf * rofi AND dmenu (weird i know) -* vim +* neovim * copyq * flameshot * nitrogen @@ -20,6 +21,7 @@ What I use right now (stuff I have to install on a fresh linux install): * xfce4-power-manager * nm-applet * lxqt-policykit +* pavucontrol * firefox * rhythmbox -- TODO migrate to a MPD based music player * lxapperance (optional) diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc index 613b651..58d1ed1 100755 --- a/bspwm/bspwmrc +++ b/bspwm/bspwmrc @@ -50,10 +50,28 @@ bspc config borderless_monocle true bspc config gapless_monocle true -#TODO adauga culori din Xresources ### # COLORS ### + +# Read colors from Xresources and use them upfront +# I am sorry for how cursed this is + +clist=`xrdb -query` +echo "$clist" | while read line +do + name=$(echo $line | cut -d: -f1) + color=$(echo $line | cut -d: -f2) + case "$name" in + "*.color6") bspc config active_border_color $color \ + && bspc config presel_feedback_color $color ;; + "*.background") bspc config normal_border_color $color ;; + "*.foreground") bspc config focused_border_color $color ;; + esac +done + + + #bspc config normal_border_color #bspc config active_border_color #bspc config focused_border_color diff --git a/install.sh b/install.sh index 7e86d7c..4722e22 100755 --- a/install.sh +++ b/install.sh @@ -14,6 +14,7 @@ goconfig() { gohome .bashrc gohome .profile gohome .vimrc +gohome .Xresources goconfig bspwm goconfig dunst @@ -21,3 +22,4 @@ goconfig polybar goconfig kitty goconfig sxhkd goconfig picom.conf +goconfig nvim diff --git a/kitty/kitty.conf b/kitty/kitty.conf deleted file mode 100644 index 63d8f5b..0000000 --- a/kitty/kitty.conf +++ /dev/null @@ -1,29 +0,0 @@ -font_family GohuFont Nerd Font Mono -bold_font mononoki Nerd Font Mono -italic_font mononoki Nerd Font Mono -bold_italic_font mononoki Nerd Font Mono - -font_size 10 -window_padding_width 3 - -adjust_line_height 0 -adjust_column_width 0 - -remember_window_size no -initial_window_width 80c -initial_window_height 25c - -window_resize_step_cells 1 -window_resize_step_lines 1 - -cursor_blink_interval 0.8 -cursor_stop_blinking_after 15.0 -cursor_shape block - -background_opacity 0.90 -dim_opacity 1 - -map alt+c copy_to_clipboard -map alt+v paste_from_clipboard - -include sunset.conf diff --git a/kitty/night.conf b/kitty/night.conf deleted file mode 100644 index 0852bdf..0000000 --- a/kitty/night.conf +++ /dev/null @@ -1,29 +0,0 @@ -foreground #DCDCDC -background #1D1F28 - -selection_foreground #1D1F28 -selection_background #DCDCDC - -color0 #282A36 -color8 #282A36 - -color1 #F37F97 -color9 #F37F97 - -color2 #5ADECD -color10 #5ADECD - -color3 #F2A272 -color11 #F2A272 - -color4 #8897F4 -color12 #8897F4 - -color5 #C574DD -color13 #C574DD - -color6 #79E6F3 -color14 #79E6F3 - -color7 #DCDCDC -color15 #DCDCDC diff --git a/kitty/pastels.conf b/kitty/pastels.conf deleted file mode 100644 index 119e840..0000000 --- a/kitty/pastels.conf +++ /dev/null @@ -1,25 +0,0 @@ -background #1A2026 -#background #261A20 -foreground #DCDCDC - -selection_background #DCDCDC -selection_foreground #1A2026 - -cursor #DCDCDC -color0 #3F3F4F -color1 #CF9086 -color2 #60b48a -color3 #dfaf8f -color4 #9ab8d7 -color5 #dc8cc3 -color6 #8cd0d3 -color7 #DCDCDC -color8 #4F4F5F -color9 #DCA3A3 -color10 #72D5A3 -color11 #F0DFAF -color12 #94BFF3 -color13 #EC93D3 -color14 #93E0E3 -color15 #FFFFFF - diff --git a/kitty/sunset.conf b/kitty/sunset.conf deleted file mode 100644 index 1619c35..0000000 --- a/kitty/sunset.conf +++ /dev/null @@ -1,24 +0,0 @@ - -background #191919 -foreground #fafafa - -selected_background #fafafa -selected_foreground #191919 - -color0 #191919 -color1 #FF4E50 -color2 #FC913A -color3 #F9D423 -color4 #EDE574 -color5 #E1F5C4 -color6 #a0a0a0 -color7 #fafafa -color8 #4f4f4f -color9 #FF4E50 -color10 #FC913A -color11 #F9D423 -color12 #EDE574 -color13 #E1F5C4 -color14 #a0a0a0 -color15 #fafafa - diff --git a/nvim/.netrwhist b/nvim/.netrwhist new file mode 100644 index 0000000..47ee37f --- /dev/null +++ b/nvim/.netrwhist @@ -0,0 +1,11 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhistcnt =9 +let g:netrw_dirhist_9='/home/vibikim/repos/st' +let g:netrw_dirhist_8='/home/vibikim/repos' +let g:netrw_dirhist_7='/home/vibikim/repos/st' +let g:netrw_dirhist_6='/home/vibikim/repos' +let g:netrw_dirhist_5='/home/vibikim/repos/dotfiles/polybar' +let g:netrw_dirhist_4='/home/vibikim' +let g:netrw_dirhist_3='/home/vibikim/.config/awesome' +let g:netrw_dirhist_2='/home/vibikim/.config' +let g:netrw_dirhist_1='/home/vibikim' diff --git a/nvim/init.vim b/nvim/init.vim new file mode 100644 index 0000000..09e2c42 --- /dev/null +++ b/nvim/init.vim @@ -0,0 +1,42 @@ +let mapleader=" " + +" Basic stuff +set mouse=a +set nocompatible +set nohlsearch +filetype plugin on +syntax on +set encoding=utf-8 +set number +set termguicolors + +" Enable spell checking, s for spell check +map se :setlocal spell! spelllang=en +map sr :setlocal spell! spelllang=ro + +" Easier Write and Quit aliases +nnoremap q :q +nnoremap Q :wq +nnoremap w :w + +" ### +" # Plugins +" ### +call plug#begin('~/.local/share/nvim/plugged') + +Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' } + +call plug#end() + +" hexokinase +let g:Hexokinase_refreshEvents = ['InsertLeave'] +let g:Hexokinase_highlighters = ['backgroundfull'] + +autocmd VimEnter * HexokinaseTurnOn + + +" ### +" # Key Remapping +" ### + +map :source ~/.config/nvim/init.vim diff --git a/polybar/config.ini b/polybar/config.ini index 80798e0..f882903 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -165,19 +165,31 @@ pseudo-transparency = false [color] -bg = #141C21 +; bg = #141C21 ; fg = #D9DBDF this is something white - fg = #AFB42B -fg-alt = #141C21 +; fg = #AFB42B +; fg-alt = #141C21 + +; alpha = #00000000 + +; shade1 = #AFB42B +; shade2 = #C0CA33 +; shade3 = #CDDC39 +; shade4 = #D4E157 +; shade5 = #DCE775 +; shade6 = #E6EE9C +bg = ${xrdb:background} +fg = ${xrdb:foreground} +fg-alt = ${xrdb:color0} alpha = #00000000 -shade1 = #AFB42B -shade2 = #C0CA33 -shade3 = #CDDC39 -shade4 = #D4E157 -shade5 = #DCE775 -shade6 = #E6EE9C +shade1 = ${xrdb:color2} +shade2 = ${xrdb:color3} +shade3 = ${xrdb:color4} +shade4 = ${xrdb:color5} +shade5 = ${xrdb:color6} +shade6 = ${xrdb:color7} ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ;; @@ -207,7 +219,7 @@ label-volume = %{A3:pavucontrol &:}%percentage%%%{A} format-muted-background = ${color.shade4} format-muted-foreground = ${color.fg-alt} format-muted-padding = 2 -label-muted = %{A3:pavucntrol &:}""%{A} +label-muted = %{A3:pavucntrol &:}%{A} ramp-volume-0 =  diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 21bc2d8..bb586c8 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -15,6 +15,8 @@ super + shift + v pavucontrol super + shift + f $FILEMANAGER +super + shift + n + thunderbird super + shift + Return $FILEMANAGER diff --git a/termite/config b/termite/config deleted file mode 100644 index 631c381..0000000 --- a/termite/config +++ /dev/null @@ -1,113 +0,0 @@ -[options] -#allow_bold = true -#audible_bell = false -#bold_is_bright = true -#cell_height_scale = 1.0 -#cell_width_scale = 1.0 -#clickable_url = true -#dynamic_title = true -#font = Mononoki Nerd Font Mono 12 -font = Mononoki Nerd Font Mono 10 -#fullscreen = true -#icon_name = terminal -#mouse_autohide = false -#scroll_on_output = false -#scroll_on_keystroke = true -# Length of the scrollback buffer, 0 disabled the scrollback buffer -# and setting it to a negative value means "infinite scrollback" -scrollback_lines = 10000 -#search_wrap = true -#urgent_on_bell = true -#hyperlinks = false - -[colors] -# Base16 Harmonic16 Dark -# Author: Jannik Siebert (https://github.com/janniks) - -foreground_bold = #e5ebf1 -#cursor = #e5ebf1 -cursor = #DCDCDC -cursor_foreground = #0b1c2c -#background = #1D1F28 - -# 16 color space -# theme: NIGHT - -#foreground = #DCDCDC -#background = rgba(30, 32, 41, 0.98) -#color0 = #282A36 -#color1 = #F37F97 -#color2 = #5ADECD -#color3 = #F2A272 -#color4 = #8897F4 -#color5 = #C574DD -#color6 = #79E6F3 -#color7 = #DCDCDC -#color8 = #282A36 -#color9 = #F37F97 -#color10 = #5ADECD -#color11 = #F2A272 -#color12 = #8897F4 -#color13 = #C574DD -#color14 = #79E6F3 -#color15 = #DCDCDC - - -# theme: SUNSET - -background = #191919 -foreground = #fafafa -color0 = #191919 -color1 = #FF4E50 -color2 = #FC913A -color3 = #F9D423 -color4 = #EDE574 -color5 = #E1F5C4 -color6 = #a0a0a0 -color7 = #fafafa -color8 = #4f4f4f -color9 = #FF4E50 -color10 = #FC913A -color11 = #F9D423 -color12 = #EDE574 -color13 = #E1F5C4 -color14 = #a0a0a0 -color15 = #fafafa - -# Black, Gray, Silver, White -#color0 = #0b1c2c -#color8 = #627e99 -#color7 = #cbd6e2 -#color15 = #f7f9fb - -# Red -#color1 = #bf8b56 -#color9 = #bf8b56 - -# Green -#color2 = #56bf8b -#color10 = #56bf8b - -# Yellow -#color3 = #8bbf56 -#color11 = #8bbf56 - -# Blue -#color4 = #8b56bf -#color12 = #8b56bf - -# Purple -#color5 = #bf568b -#color13 = #bf568b - -# Teal -#color6 = #568bbf -#color14 = #568bbf - -# Extra colors -color16 = #bfbf56 -color17 = #bf5656 -color18 = #223b54 -color19 = #405c79 -color20 = #aabcce -color21 = #e5ebf1