From 3dff76e578c2cf61d41df93d47c6370e906710aa Mon Sep 17 00:00:00 2001
From: Marco Thomas <mail@marco-thomas.net>
Date: Wed, 3 Feb 2021 17:01:05 +0100
Subject: [PATCH] Update some things

---
 files/.Xresources               | 35 ++++++-------
 files/.config/i3/config         | 87 +++++++++++++++++----------------
 files/.zshrc                    |  4 +-
 files/scripts/run_on_startup.sh | 20 ++++++++
 4 files changed, 82 insertions(+), 64 deletions(-)
 create mode 100755 files/scripts/run_on_startup.sh

diff --git a/files/.Xresources b/files/.Xresources
index 1132013..c83abfd 100644
--- a/files/.Xresources
+++ b/files/.Xresources
@@ -1,22 +1,19 @@
-! Base16 OneDark
-! Scheme: Lalit Magant (http://github.com/tilal6991)
-
-#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 base00 #1C1B1D
+#define base01 #98C379
+#define base02 #E5C07B
+#define base03 #D8D8D8
+#define base04 #61AFEF
+#define base05 #D8D8D8
+#define base06 #C678DD
+#define base07 #D8D8D8
+#define base08 #E06C75
+#define base09 #E06C75
+#define base0A #E5C07B
+#define base0B #98C379
+#define base0C #56B6C2
+#define base0D #61AFEF
+#define base0E #C678DD
+#define base0F #56B6C2
 
 *.foreground:   base05
 #ifdef background_opacity
diff --git a/files/.config/i3/config b/files/.config/i3/config
index 9d0a236..61b71f2 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -15,7 +15,29 @@ floating_modifier $mod
 # Font for Window Titles
 font pango:Product Sans 10
 
-# ============================== Keybinds (except workspaces)
+# Remove title
+new_window 1pixel
+
+for_window [class="^.*"] border pixel 0
+
+# Colors
+set $text "#ffffff"
+set $red "#e06c75"
+set $termbg "#1C1B1D"
+set $border "#D8D8D8"
+set $acc "#98C379"
+
+# Class                 Border  Backgr. Text  Indic.  Child_border
+client.focused          $acc    $termbg $text $border $border
+client.focused_inactive $acc    $termbg $text $termbg $termbg
+client.unfocused        $termbg $termbg $text $termbg $termbg
+client.urgent           $red    $termbg $text $red    $red
+client.background       $border
+
+# i3-gaps
+gaps inner 4
+
+# ============================== Keybinds
 #Terminal
 bindsym $mod+Return exec --no-startup-id alacritty
 bindsym $mod+Ctrl+Return exec --no-startup-id xterm
@@ -40,7 +62,8 @@ bindsym $mod+Shift+q kill
 bindsym $mod+f fullscreen toggle
 bindsym $mod+Shift+space floating toggle
 
-bindsym $mod+s layout toggle splith splitv
+bindsym $mod+s split v
+bindsym $mod+v split h
 
 bindsym $mod+comma workspace prev
 bindsym $mod+period workspace next
@@ -53,7 +76,7 @@ set $font 'Product Sans:pixelsize=15'
 bindsym $mod+d exec "dmenu_run -b -fn $font -nb $bg -sb $bg -nf $fg -sf $accent"
 
 # Screenhot
-bindsym $mod+Shift+p exec "flameshot gui"
+bindsym $mod+Shift+s exec "flameshot gui"
 
 # Screen brightness with light
 bindsym XF86MonBrightnessUp exec light -A 5 # increase
@@ -71,14 +94,14 @@ bindsym XF86AudioPause exec playerctl pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
-# ============================== Monitor
+# Monitor control
 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
 
-# ======================================== Open Applications
+# Launch Applications
 bindsym $mod+e exec alacritty -e ranger
 
 bindsym $mod+Ctrl+c exec google-calendar-dark
@@ -91,7 +114,7 @@ bindsym $mod+Ctrl+p exec pavucontrol
 bindsym $mod+Ctrl+s exec spotify
 bindsym $mod+Ctrl+t exec telegram-desktop
 
-# ======================================== Shutdown
+# Shutdown
 bindsym $mod+BackSpace exec "~/scripts/lock.sh"
 bindsym $mod+Shift+BackSpace exec "i3-nagbar -t warning -m 'Logout?' -B 'Yes!' 'i3-msg exit'"
 
@@ -131,42 +154,20 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
 
-# ============================== Design
-# Remove title
-new_window 1pixel
+# ============================== Startup
+exec ~/scripts/run_on_startup.sh
 
-# Set Border
-for_window [class="^.*"] border pixel 0
-for_window [class="Alacritty"] border pixel 0
-for_window [class="xterm"] border pixel 1
 
-set $red "#e06c75"
-set $termbg "#1C1B1D"
-set $border "#D8D8D8"
-set $acc "#98C379"
-
-# Class                 Border  Backgr. Text    Indic.  Child_border
-client.focused          $acc    $termbg #ffffff $border $border
-client.focused_inactive $acc    $termbg #ffffff $termbg $termbg
-client.unfocused        $termbg $termbg #ffffff $termbg $termbg
-client.urgent           $red    $termbg #ffffff $red    $red
-client.background       $border
-
-# i3-gaps
-gaps inner 4
-#smart_gaps on
-
-# ============================== Start
-exec setxkbmap -layout za
-
-# Launch Programs at start
-exec fcitx -d
-exec nextcloud
-exec dunst
-exec picom
-exec nm-applet
-
-exec feh --bg-scale $HOME/data/nextcloud/Wallpaper/wallpaper.png
-
-exec ~/scripts/fix_screens.sh
-exec ~/scripts/polybar.sh
+#exec setxkbmap -layout za
+#
+## Launch Programs at start
+#exec fcitx -d
+#exec nextcloud
+#exec dunst
+#exec picom
+#exec nm-applet
+#
+#exec feh --bg-scale $HOME/data/nextcloud/Wallpaper/wallpaper.png
+#
+#exec ~/scripts/fix_screens.sh
+#exec ~/scripts/polybar.sh
diff --git a/files/.zshrc b/files/.zshrc
index e93d904..8df4b12 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -20,14 +20,14 @@ LN=$'\n'
 ICON="%(?.%{$fg[green]%}.%{$fg[red]%})➜"
 DIR="%{$fg[blue]%}%~"
 GIT_ICON=""
-GIT="%{$fg[cyan]%}\$vcs_info_msg_0_"
+GIT="%{$fg[red]%}\$vcs_info_msg_0_"
 
 if [[ -n "$SSH_CONNECTION" ]]; then
     NAME="%{$fg[yellow]%}%m "
 fi
 
 export PROMPT="${NAME}${DIR}${GIT} ${ICON} %{$reset_color%}"
-zstyle ':vcs_info:git:*' formats '  %b'
+zstyle ':vcs_info:git:*' formats ' ( %b)'
 
 # ============================== Exports
 export EDITOR="nvim"
diff --git a/files/scripts/run_on_startup.sh b/files/scripts/run_on_startup.sh
new file mode 100755
index 0000000..a1c146c
--- /dev/null
+++ b/files/scripts/run_on_startup.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# set keyboard layout
+setxkbmap -layout za
+
+# start programs
+fcitx -d &
+nextcloud &
+dunst &
+picom &
+nm-applet &
+
+# wallpaper
+feh --bg-scale $HOME/data/nextcloud/Wallpaper/wallpaper.png
+
+# adjust screens on nazarick
+~/scripts/fix_screens.sh
+
+# launch polybar
+~/scripts/polybar.sh &