From 01a3d988eb6e99b3493b981ae9389d2f88c1132a Mon Sep 17 00:00:00 2001 From: CramMK Date: Tue, 7 Jul 2020 09:36:40 +0200 Subject: [PATCH] Update dotfiles --- README.md | 4 ++-- config.yaml | 17 ++++++-------- dotdrop | 2 +- dotfiles/dunst/dunstrc | 2 +- dotfiles/i3/config | 20 ++++++++++++----- .../compton.conf => picom/picom.conf} | 0 dotfiles/polybar/config | 22 +++++++++++-------- dotfiles/ranger/rc.conf | 2 +- dotfiles/scripts/startup-laptop | 1 - 9 files changed, 40 insertions(+), 30 deletions(-) rename dotfiles/{compton/compton.conf => picom/picom.conf} (100%) diff --git a/README.md b/README.md index d126839..d420d84 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ My personal configurations, managed with the 'dotdrop' submodule. [Nord-themed.](https://www.nordtheme.com/) -![home](https://i.imgur.com/9yRK9Dk.png) +![home](https://i.imgur.com/zayLDb6.png) ![vim](https://i.imgur.com/aihcZMe.png) ![spotify](https://i.imgur.com/hFKH7y1.png) ## Features -+ Distro: `Fedora 31` ++ Distro: `Fedora` + Font: `InconsolataLGC Nerd Font Mono` and `Inconsolata` (polybar) + Shell: `zsh` + Terminal: `alacritty` diff --git a/config.yaml b/config.yaml index a97056b..405987a 100644 --- a/config.yaml +++ b/config.yaml @@ -24,9 +24,6 @@ dotfiles: d_xresources_themes: src: X11/Xresources.themes dst: ~/.Xresources.themes - f_xinitrc: - src: X11/xinitrc - dst: ~/.xinitrc f_i3: src: i3/config dst: ~/.config/i3/config @@ -38,9 +35,9 @@ dotfiles: dst: ~/.local/share/fonts actions: - font-cache - f_compton: - src: compton/compton.conf - dst: ~/.config/compton.conf + f_picom: + src: picom/picom.conf + dst: ~/.config/picom.conf f_tmux: src: tmux/tmux.conf dst: ~/.tmux.conf @@ -77,7 +74,7 @@ profiles: - i3 - x11 - font - - compton + - picom - tmux - polybar - dunst @@ -101,7 +98,7 @@ profiles: - x11 - i3 - font - - compton + - picom - tmux - dir_colors - scripts @@ -129,9 +126,9 @@ profiles: font: dotfiles: - d_fonts - compton: + picom: dotfiles: - - f_compton + - f_picom tmux: dotfiles: - f_tmux diff --git a/dotdrop b/dotdrop index c48ea15..5b2b05d 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit c48ea15a7c3dcc11d6672383422f3d54d13469e0 +Subproject commit 5b2b05d353756bd09018f9dba049d0598cf632bb diff --git a/dotfiles/dunst/dunstrc b/dotfiles/dunst/dunstrc index 9af6a3d..2ad948c 100644 --- a/dotfiles/dunst/dunstrc +++ b/dotfiles/dunst/dunstrc @@ -42,7 +42,7 @@ # The transparency of the window. Range: [0; 100]. # This option will only work if a compositing window manager is # present (e.g. xcompmgr, compiz, etc.). - transparency = 10 + transparency = 5 # The height of the entire notification. If the height is smaller # than the font height and padding combined, it will be raised diff --git a/dotfiles/i3/config b/dotfiles/i3/config index 28f01ac..5885b22 100644 --- a/dotfiles/i3/config +++ b/dotfiles/i3/config @@ -111,14 +111,24 @@ bindsym $mod+Shift+r restart ### Design ### new_window 1pixel -for_window [class="^.*"] border pixel 0 +for_window [class="^.*"] border pixel 4 # Colors from https://www.nordtheme.com/ +set $nord0 "#2e3440" + +set $blue0 "#8FBCBB" + +set $frost0 "#d8dee9" +set $frost2 "#eceff4" + +set $green "#A3BE8C" +set $red "#bf616a" + # class border backgr. text indicator child_border -client.focused #a3be8c #2e3440 #ECEFF4 #A3BE8C #A3BE8C -client.focused_inactive #2e3440 #2e3440 #ECEFF4 #2e3440 #5f676a -client.unfocused #333333 #222222 #D8DEE9 #2e3440 #2e3440 -client.urgent #2f343a #BF616A #ECEFF4 #BF616A #BF616A +client.focused $blue0 $nord0 $frost2 $green $blue0 +client.focused_inactive $nord0 $nord $nord0 $frost2 $nord0 +client.unfocused #333333 #222222 $frost0 $nord0 $nord0 +client.urgent $red $red $frost2 $red $red client.background #ffffff {%@@ if profile == "work" @@%} diff --git a/dotfiles/compton/compton.conf b/dotfiles/picom/picom.conf similarity index 100% rename from dotfiles/compton/compton.conf rename to dotfiles/picom/picom.conf diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index eecba36..2f535b8 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -23,14 +23,13 @@ frost2 = #ECEFF4 nord0_trans = #dd2E3440 -accent = ${colors.green} -background = ${colors.nord0} +accent = ${colors.blue0} foreground = ${colors.frost2} ############################################################################### [settings] format-foreground = ${colors.foreground} -format-background = ${colors.background} +format-background = ${colors.nord0} screenchange-reload = true ############################################################################### @@ -57,9 +56,14 @@ radius = 0.0 foreground = ${colors.foreground} background = ${colors.nord0_trans} -tray-position = +tray-position = right +tray-padding = 2 +tray-background = ${colors.nord1} +tray-offset-x = 8 +tray-offset-y = 0 -width = 100%:-16px +# 100%-16px(gaps)-8px(tray) +width = 100%:-24px height = 27 offset-y = 8px @@ -69,7 +73,7 @@ override-redirect = true modules-left = i3 modules-center = -modules-right = spotify backlight volume battery network date +modules-right = spotify backlight volume battery date separator = wm-name = i3 @@ -116,8 +120,8 @@ label-visible-background = ${self.background} label-visible-padding = 2 label-urgent = %index% -label-urgent-foreground = ${colors.red} -label-urgent-background = ${self.background} +label-urgent-foreground = ${colors.foreground} +label-urgent-background = ${colors.red} label-urgent-padding = 2 ############################################################################### @@ -125,7 +129,7 @@ label-urgent-padding = 2 type = internal/date format-padding = 2 -format-background = ${colors.nord0} +format-background = ${colors.nord1} interval = 1.0 diff --git a/dotfiles/ranger/rc.conf b/dotfiles/ranger/rc.conf index b76a962..117da92 100644 --- a/dotfiles/ranger/rc.conf +++ b/dotfiles/ranger/rc.conf @@ -4,6 +4,6 @@ set preview_images true default_linemode devicons # separators, outline, both, none -set draw_borders both +set draw_borders none set mouse_enabled true diff --git a/dotfiles/scripts/startup-laptop b/dotfiles/scripts/startup-laptop index 6672f54..79116f4 100755 --- a/dotfiles/scripts/startup-laptop +++ b/dotfiles/scripts/startup-laptop @@ -4,7 +4,6 @@ setxkbmap -layout za export LANG="en_US.UTF-8" export LANGUAGE="en_US.UTF-8" -export SHELL="/bin/zsh" feh --bg-scale $HOME/wallpaper/wallpaper.png