diff --git a/.config/aliasrc b/.config/aliasrc index d3354a3..f6d6874 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -3,6 +3,7 @@ alias .evim='$EDITOR $HOME/.config/vim/vimrc' alias .ebspwm='$EDITOR $HOME/.config/bspwm/bspwmrc' alias .eqb='$EDITOR $HOME/.config/qutebrowser/config.py' +alias .ezsh='$EDITOR $HOME/.config/zsh/.zshrc' alias .f='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' alias aliases='$EDITOR ~/.config/aliasrc && source ~/.config/aliasrc' diff --git a/.config/environment b/.config/environment index ffe0747..155791a 100644 --- a/.config/environment +++ b/.config/environment @@ -25,6 +25,8 @@ export OSH="$XDG_CONFIG_HOME/bash/oh-my-bash" export PASSWORD_STORE_GENERATED_LENGTH='64' export PATH=$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$GOPATH/bin +export QT_QPA_PLATFORMTHEME="qt5ct" + export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" diff --git a/.config/polybar/colors.ini b/.config/polybar/colors.ini index ce413f8..50d90e2 100644 --- a/.config/polybar/colors.ini +++ b/.config/polybar/colors.ini @@ -6,5 +6,12 @@ primary = #bd93f9 secondary = #8be9fd alert = #ff5555 + cyan = #8be9fd + green = #50fa7b + orange = #ffb86c + pink = #ff79c6 + purple = #bd93f9 + red = #ff5555 + yellow = #f1fa8c ; vim: ft=dosini diff --git a/.config/polybar/custom.ini b/.config/polybar/custom.ini index 4b8d1ed..0a70a0c 100644 --- a/.config/polybar/custom.ini +++ b/.config/polybar/custom.ini @@ -5,7 +5,7 @@ format-prefix = " " format-prefix-foreground = ${colors.foreground} - format-underline = #8bf + format-underline = ${colors.pink} format = <label> label = %output:4% @@ -17,7 +17,7 @@ format-prefix = " " format-prefix-foreground = ${colors.foreground} - format-underline = #1794D1 + format-underline = ${colors.cyan} format = <label> click-left = alacritty -e sh -c "$HOME/.local/bin/archlinux-update; checkupdates > $HOME/.cache/archlinux-updates.txt; read" & diff --git a/.config/polybar/modules.ini b/.config/polybar/modules.ini index 228cec0..31dd61c 100644 --- a/.config/polybar/modules.ini +++ b/.config/polybar/modules.ini @@ -72,7 +72,7 @@ ; pin-workspaces = true label-mode-padding = 2 - label-mode-foreground = #000 + label-mode-foreground = ${colors.foreground} label-mode-background = ${colors.primary} ; focused = Active workspace on focused monitor @@ -133,17 +133,17 @@ format-prefix = " " format-prefix-foreground = ${colors.foreground} - format-underline = #fff + format-underline = ${colors.foreground} format = <label> label = %percentage%% bar-width = 10 bar-indicator = | - bar-indicator-foreground = #fff + bar-indicator-foreground = ${colors.foreground} bar-indicator-font = 2 bar-fill = - bar-fill-font = 2 - bar-fill-foreground = #9f78e1 + bar-fill-foreground = ${colors.purple} bar-empty = - bar-empty-font = 2 bar-empty-foreground = ${colors.foreground} @@ -158,7 +158,7 @@ interval = 2 format-prefix = " " format-prefix-foreground = ${colors.foreground} - format-underline = #f90000 + format-underline = ${colors.red} label = %percentage:3%% [module/memory] @@ -166,7 +166,7 @@ interval = 2 format-prefix = " " format-prefix-foreground = ${colors.foreground} - format-underline = #4bffdc + format-underline = ${colors.cyan} label = %percentage_used%% [module/wlan] @@ -175,7 +175,7 @@ interval = 3.0 format-connected = <ramp-signal> <label-connected> - format-connected-underline = #9f78e1 + format-connected-underline = ${colors.purple} label-connected = %essid% (%signal:3%%) format-disconnected = @@ -196,7 +196,7 @@ interface = ${root.eth-interface} interval = 3.0 - format-connected-underline = #55aa55 + format-connected-underline = ${colors.green} format-connected-prefix = " " format-connected-prefix-foreground = ${colors.foreground} label-connected = %local_ip% @@ -217,7 +217,7 @@ format-prefix = " " format-prefix-foreground = ${colors.foreground} - format-underline = #0a6cf5 + format-underline = ${colors.yellow} label = %date% %time% @@ -228,22 +228,22 @@ format-volume-prefix-foreground = ${colors.foreground} ; format-volume = <label-volume> <bar-volume> format-volume = <label-volume> - format-volume-underline = #d8d804 + format-volume-underline = ${colors.yellow} label-volume = %percentage%% label-volume-foreground = ${root.foreground} - format-muted-underline = #686823 + format-muted-underline = ${colors.orange} label-muted = muted - label-muted-foreground = #666 + label-muted-foreground = ${root.foreground-alt} bar-volume-width = 10 - bar-volume-foreground-0 = #55aa55 - bar-volume-foreground-1 = #55aa55 - bar-volume-foreground-2 = #55aa55 - bar-volume-foreground-3 = #55aa55 - bar-volume-foreground-4 = #55aa55 - bar-volume-foreground-5 = #f5a70a - bar-volume-foreground-6 = #ff5555 + bar-volume-foreground-0 = ${colors.foreground} + bar-volume-foreground-1 = ${colors.foreground} + bar-volume-foreground-2 = ${colors.foreground} + bar-volume-foreground-3 = ${colors.foreground} + bar-volume-foreground-4 = ${colors.foreground} + bar-volume-foreground-5 = ${colors.foreground} + bar-volume-foreground-6 = ${colors.foreground} bar-volume-gradient = false bar-volume-indicator = | bar-volume-indicator-font = 2 @@ -265,13 +265,13 @@ label-muted = sound muted bar-volume-width = 10 - bar-volume-foreground-0 = #55aa55 - bar-volume-foreground-1 = #55aa55 - bar-volume-foreground-2 = #55aa55 - bar-volume-foreground-3 = #55aa55 - bar-volume-foreground-4 = #55aa55 - bar-volume-foreground-5 = #f5a70a - bar-volume-foreground-6 = #ff5555 + bar-volume-foreground-0 = ${colors.foreground} + bar-volume-foreground-1 = ${colors.foreground} + bar-volume-foreground-2 = ${colors.foreground} + bar-volume-foreground-3 = ${colors.foreground} + bar-volume-foreground-4 = ${colors.foreground} + bar-volume-foreground-5 = ${colors.foreground} + bar-volume-foreground-6 = ${colors.foreground} bar-volume-gradient = false bar-volume-indicator = | bar-volume-indicator-font = 2 @@ -288,7 +288,7 @@ full-at = 100 format-charging = <animation-charging> <label-charging> - format-charging-underline = #ffb52a + format-charging-underline = ${colors.yellow} label-charging = %percentage_raw%% (%time%) format-discharging = <ramp-capacity> <label-discharging> @@ -331,7 +331,7 @@ warn-temperature = 70 format = <ramp> <label> - format-underline = #f50a4d + format-underline = ${colors.red} format-warn = <ramp> <label-warn> format-warn-underline = ${self.format-underline} diff --git a/.config/vim/vimrc b/.config/vim/vimrc index 94d4845..14c56a9 100644 --- a/.config/vim/vimrc +++ b/.config/vim/vimrc @@ -1,4 +1,5 @@ set runtimepath+=~/.config/vim,~/.config/vim/after +set packpath+=~/.config/vim if has('nvim') " Neovim specific commands @@ -37,6 +38,9 @@ call plug#begin('~/.config/vim/plugged') Plug 'sheerun/vim-polyglot' call plug#end() +packadd! dracula_pro + + "let g:indentLine_setColors = 0 packadd termdebug @@ -149,9 +153,13 @@ let g:jellybeans_overrides = { \ '256ctermbg': 'none' \ }, \ } -colorscheme dracula +"colorscheme dracula +let g:dracula_colorterm = 0 +colorscheme dracula_pro + highlight Normal ctermbg=NONE + let g:highlightedyank_highlight_duration = 250 let g:syntastic_always_populate_loc_list = 0 diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 147ec78..5a59b8f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -11,7 +11,7 @@ fi # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="tjkirch" +ZSH_THEME="serguzim" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -82,10 +82,13 @@ plugins=( copydir copyfile cp + docker + docker-compose encode64 extract git git-auto-status + httpie jump kubectl safe-paste diff --git a/.config/zsh/custom/themes/serguzim.zsh-theme b/.config/zsh/custom/themes/serguzim.zsh-theme new file mode 100644 index 0000000..1e6f9ec --- /dev/null +++ b/.config/zsh/custom/themes/serguzim.zsh-theme @@ -0,0 +1,11 @@ +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg_bold[green]%}✔ " +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✘ " + +PROMPT='%(?, ,%{$fg[red]%}RETURN: $?%{$reset_color%} +) +%{$fg[green]%}%* %{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%M%{$reset_color%}: %{$fg_bold[blue]%}%~$(git_prompt_info) +%{$fg_bold[green]%}❯%{$reset_color%} ' + +#RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'