From 727c1e61706664cfa6c092a976810eb9d96c921b Mon Sep 17 00:00:00 2001 From: CramMK Date: Wed, 8 Jul 2020 20:19:31 +0200 Subject: [PATCH] Update dotfiles --- dotfiles/dunst/dunstrc | 2 +- dotfiles/i3/config | 13 +++++---- dotfiles/polybar/config | 28 ++++++++++++-------- dotfiles/ranger/rc.conf | 1 + dotfiles/scripts/{wallpaper.py => wallpaper} | 0 dotfiles/vim/vimrc | 1 + dotfiles/zsh/zshrc | 4 +++ 7 files changed, 32 insertions(+), 17 deletions(-) rename dotfiles/scripts/{wallpaper.py => wallpaper} (100%) diff --git a/dotfiles/dunst/dunstrc b/dotfiles/dunst/dunstrc index 2ad948c..2be5472 100644 --- a/dotfiles/dunst/dunstrc +++ b/dotfiles/dunst/dunstrc @@ -155,7 +155,7 @@ hide_duplicate_count = false # Display indicators for URLs (U) and actions (A). - show_indicators = yes + show_indicators = no ### Icons ### diff --git a/dotfiles/i3/config b/dotfiles/i3/config index 5885b22..067e610 100644 --- a/dotfiles/i3/config +++ b/dotfiles/i3/config @@ -30,6 +30,8 @@ bindsym $mod+Shift+l move right bindsym $mod+Ctrl+l resize grow width 10 px bindsym $mod+Ctrl+h resize shrink width 10 px +bindsym $mod+Ctrl+j resize shrink height 10 px +bindsym $mod+Ctrl+k resize grow height 10 px bindsym $mod+Shift+q kill @@ -50,7 +52,7 @@ bindsym $mod+p workspace prev # Rofi and dmenu bindsym $mod+space exec "rofi -show" -bindsym $mod+d exec "dmenu_run -fn 'InconsolataLGC Nerd Font Mono' -nb '#2E3440' -sb '#2E3440' -nf '#ECEFF4' -sf '#A3BE8C' -p 'ﰌ'" +bindsym $mod+d exec "dmenu_run -fn 'InconsolataLGC Nerd Font Mono' -nb '#2E3440' -sb '#2E3440' -nf '#ECEFF4' -sf '#5E81AC'" bindsym --release $mod+Shift+p exec"import ~/screenshots/Screenshot-$(date '+%Y%m%d-%H%M%S').png" @@ -116,7 +118,8 @@ for_window [class="^.*"] border pixel 4 # Colors from https://www.nordtheme.com/ set $nord0 "#2e3440" -set $blue0 "#8FBCBB" +set $blue1 "#88c0d0" +set $blue3 "#5E81AC" set $frost0 "#d8dee9" set $frost2 "#eceff4" @@ -125,9 +128,9 @@ set $green "#A3BE8C" set $red "#bf616a" # class border backgr. text indicator child_border -client.focused $blue0 $nord0 $frost2 $green $blue0 -client.focused_inactive $nord0 $nord $nord0 $frost2 $nord0 -client.unfocused #333333 #222222 $frost0 $nord0 $nord0 +client.focused $blue3 $nord0 $frost2 $blue3 $blue3 +client.focused_inactive $blue1 $nord0 $nord0 $frost2 $blue1 +client.unfocused $blue1 #222222 $frost0 $blue1 $blue1 client.urgent $red $red $frost2 $red $red client.background #ffffff diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index 2f535b8..a68af11 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -23,9 +23,15 @@ frost2 = #ECEFF4 nord0_trans = #dd2E3440 -accent = ${colors.blue0} +accent = ${colors.blue3} foreground = ${colors.frost2} +tray = ${colors.nord1} +shade0 = ${colors.nord2} +shade1 = ${colors.nord3} +shade2 = ${colors.nord2} +shade3 = ${colors.nord1} + ############################################################################### [settings] format-foreground = ${colors.foreground} @@ -54,11 +60,11 @@ padding-right = 0 radius = 0.0 foreground = ${colors.foreground} -background = ${colors.nord0_trans} +background = ${colors.nord0} tray-position = right tray-padding = 2 -tray-background = ${colors.nord1} +tray-background = ${colors.tray} tray-offset-x = 8 tray-offset-y = 0 @@ -105,7 +111,7 @@ ws-icon-8 = 9;9 ws-icon-9 = 10;10 label-focused = %icon% -label-focused-foreground = ${self.background} +label-focused-foreground = ${colors.foreground} label-focused-background = ${colors.accent} label-focused-padding = 2 @@ -129,7 +135,7 @@ label-urgent-padding = 2 type = internal/date format-padding = 2 -format-background = ${colors.nord1} +format-background = ${colors.shade0} interval = 1.0 @@ -183,15 +189,15 @@ battery = BAT0 apdapter = ADP1 format-charging = -format-charging-background = ${colors.nord2} +format-charging-background = ${colors.shade1} format-charging-padding = 2 format-discharging = -format-discharging-background = ${colors.nord2} +format-discharging-background = ${colors.shade1} format-discharging-padding = 2 format-full = -format-full-background = ${colors.nord2} +format-full-background = ${colors.shade1} format-full-padding = 2 label-charging = %percentage%% @@ -223,7 +229,7 @@ animation-charging-framerate = 750 [module/volume] type = internal/pulseaudio -format-volume-background = ${colors.nord3} +format-volume-background = ${colors.shade2} format-volume-padding = 2 format-volume = @@ -275,8 +281,8 @@ ramp-signal-4 =  type = internal/backlight format-padding = 2 -format-background = ${colors.frost0} -format-foreground = ${colors.nord0} +format-background = ${colors.shade3} +format-foreground = ${colors.foreground} # ls -1 /sys/class/backlight card = amdgpu_bl0 diff --git a/dotfiles/ranger/rc.conf b/dotfiles/ranger/rc.conf index 117da92..2998c85 100644 --- a/dotfiles/ranger/rc.conf +++ b/dotfiles/ranger/rc.conf @@ -1,4 +1,5 @@ set preview_images true +set preview_images_method ueberzug #icons default_linemode devicons diff --git a/dotfiles/scripts/wallpaper.py b/dotfiles/scripts/wallpaper similarity index 100% rename from dotfiles/scripts/wallpaper.py rename to dotfiles/scripts/wallpaper diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc index d8332ab..1db1c82 100644 --- a/dotfiles/vim/vimrc +++ b/dotfiles/vim/vimrc @@ -67,6 +67,7 @@ filetype indent plugin on " ------------------------------------- General -------------------------------- set number +set relativenumber " :highlight LineNr ctermfg=white "color set showmatch " Highlights paranthesis set mat=5 diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc index b5066a5..130ffd5 100644 --- a/dotfiles/zsh/zshrc +++ b/dotfiles/zsh/zshrc @@ -146,3 +146,7 @@ bindkey '^Z' fancy-ctrl-z ## Nord dir colors test -r "~/.dir_colors" && eval $(dircolors ~/.dir_colors) + +if [ -f ~/.zsh-highlighting/zsh-syntax-highlighting.zsh ]; then + source /home/marc/.zsh-highlighting/zsh-syntax-highlighting.zsh +fi