From 45319bb1a9bac035a1ef8270116b724908997be8 Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Sat, 3 Oct 2020 00:18:20 +0200 Subject: [PATCH] Sync laptop --- README.md | 2 +- files/.Xresources | 93 ++++++++++++++++-------------------- files/.config/i3/config | 12 ++--- files/.config/polybar/config | 9 ++-- 4 files changed, 51 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index 4d88c5c..990dfd4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ + Image-Viewer: viewnior + Info: [fet.sh](https://github.com/6gk/fet.sh) and neofetch + Launcher: dmenu -+ Pdf-Viewer: epdfview ++ Pdf-Viewer: epdfview or zathura + Screenshots: Flameshot + Video-Player: vlc or mpv diff --git a/files/.Xresources b/files/.Xresources index 96b6b55..772353a 100644 --- a/files/.Xresources +++ b/files/.Xresources @@ -1,59 +1,48 @@ -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 +! Base16 OneDark +! Scheme: Lalit Magant (http://github.com/tilal6991) -*background: S_base03 -*foreground: S_base0 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground:S_base01 -*pointerColorForeground:S_base1 +#define base00 #282c34 +#define base01 #353b45 +#define base02 #3e4451 +#define base03 #545862 +#define base04 #565c64 +#define base05 #abb2bf +#define base06 #b6bdca +#define base07 #c8ccd4 +#define base08 #e06c75 +#define base09 #d19a66 +#define base0A #e5c07b +#define base0B #98c379 +#define base0C #56b6c2 +#define base0D #61afef +#define base0E #c678dd +#define base0F #be5046 -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 +*.foreground: base05 +#ifdef background_opacity +*.background: [background_opacity]base00 +#else +*.background: base00 +#endif +*.cursorColor: base05 -!! black dark/light -*color0: S_base02 -*color8: S_base03 +*.color0: base00 +*.color1: base08 +*.color2: base0B +*.color3: base0A +*.color4: base0D +*.color5: base0E +*.color6: base0C +*.color7: base05 -!! red dark/light -*color1: S_red -*color9: S_orange - -!! green dark/light -*color2: S_green -*color10: S_base01 - -!! yellow dark/light -*color3: S_yellow -*color11: S_base00 - -!! blue dark/light -*color4: S_blue -*color12: S_base0 - -!! magenta dark/light -*color5: S_magenta -*color13: S_violet - -!! cyan dark/light -*color6: S_cyan -*color14: S_base1 - -!! white dark/light -*color7: S_base2 -*color15: S_base3 +*.color8: base03 +*.color9: base09 +*.color10: base01 +*.color11: base02 +*.color12: base04 +*.color13: base06 +*.color14: base0F +*.color15: base07 !! Some extra xterm settings ! Font diff --git a/files/.config/i3/config b/files/.config/i3/config index baece77..fc73372 100644 --- a/files/.config/i3/config +++ b/files/.config/i3/config @@ -37,11 +37,6 @@ bindsym $mod+Shift+j move down bindsym $mod+Shift+k move up 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 bindsym $mod+f fullscreen toggle @@ -148,8 +143,8 @@ bindsym $mod+Shift+9 move container to workspace number $ws9 bindsym $mod+Shift+0 move container to workspace number $ws10 # ============================== Monitor -workspace $ws1 output left -workspace $ws10 output right +workspace $ws1 output right +workspace $ws10 output left bindsym $mod+Ctrl+1 move workspace to output left bindsym $mod+Ctrl+2 move workspace to output right @@ -157,6 +152,9 @@ bindsym $mod+Ctrl+2 move workspace to output right bindsym $mod+Ctrl+Left move workspace to output left bindsym $mod+Ctrl+Right move workspace to output right +bindsym $mod+Ctrl+h move workspace to output left +bindsym $mod+Ctrl+l move workspace to output right + # ============================== Design # Remove title new_window 1pixel diff --git a/files/.config/polybar/config b/files/.config/polybar/config index d1ac2c3..1d6b79b 100644 --- a/files/.config/polybar/config +++ b/files/.config/polybar/config @@ -15,7 +15,6 @@ font-3 = "Wuncon Siji:size=7;1" height = 27px width = 100% - module-margin-right = 1 module-margin-left = 1 @@ -40,7 +39,7 @@ wm-restack = i3 [bar/desktop] inherit = bar/laptop -modules-right = update_yay networkupdown volume date +modules-right = update_yay volume date [bar/desktop_second] inherit = bar/desktop @@ -93,7 +92,7 @@ label-maxlen = 100 [module/date] type = internal/date -date = %a, %d %H:%M +date = %a, %d.%m %H:%M [module/backlight] type = internal/backlight @@ -168,8 +167,8 @@ label-connected =  %upspeed%  %downspeed% [module/update_yay] type = custom/script exec = ~/.config/polybar/scripts/yay_updates.sh -format-prefix = " " -click-left = alacritty -e yay -Syu +tail = true +format-prefix = " " interval = 60 [module/spotify]