From 5bda0fb49fca350ac63fe912107ba6625f4720c2 Mon Sep 17 00:00:00 2001
From: CramMK <ma_tho@web.de>
Date: Mon, 3 Aug 2020 15:53:04 +0200
Subject: [PATCH] Update dotfiles

---
 README.md                  |  1 -
 config.yaml                | 15 ++-------------
 dotfiles/config/i3/config  | 39 +++-----------------------------------
 dotfiles/config/picom.conf |  1 +
 dotfiles/zshrc             |  3 ++-
 5 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index 4e755dc..44bdda0 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ My personal configurations, managed with the 'dotdrop' submodule.
 + Audio Control: `playerctl and pactl`
 + Backlight: `light`
 + Bar: `polybar`
-+ Browser: `firefox`
 + Filebrowser: `ranger`
 + Image-Viewer: `feh`
 + Locking: `i3lock-color`
diff --git a/config.yaml b/config.yaml
index 7abb98c..4cd71d0 100644
--- a/config.yaml
+++ b/config.yaml
@@ -77,7 +77,7 @@ profiles:
     - vim
     - nvim
     - i3
-    - x11
+    - xresources
     - font
     - picom
     - tmux
@@ -96,17 +96,6 @@ profiles:
     - ranger
     - dir_colors
     - scripts
-  work:
-    include:
-    - zsh
-    - vim
-    - x11
-    - i3
-    - font
-    - picom
-    - tmux
-    - dir_colors
-    - scripts
   dev:
     include:
     - zsh
@@ -123,7 +112,7 @@ profiles:
   vim:
     dotfiles:
     - f_vimrc
-  x11:
+  xresources:
     dotfiles:
     - f_xresources
   i3:
diff --git a/dotfiles/config/i3/config b/dotfiles/config/i3/config
index 2572374..6893006 100644
--- a/dotfiles/config/i3/config
+++ b/dotfiles/config/i3/config
@@ -39,7 +39,7 @@ bindsym $mod+f fullscreen toggle
 bindsym $mod+Shift+space floating toggle
 
 # Layout
-bindsym $mod+s layout stacking
+bindsym $mod+s layout toggle stacking splith
 
 # Create splits just like in vim
 bindsym $mod+Shift+s split v
@@ -51,7 +51,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 '#5E81AC'"
+bindsym $mod+d exec "dmenu_run -fn 'InconsolataLGC Nerd Font Mono' -nb '#2E3440' -sb '#5E81AC' -nf '#ECEFF4' -sf '#ECEFF4'
 
 bindsym --release $mod+Shift+p exec"import ~/screenshots/Screenshot-$(date '+%Y%m%d-%H%M%S').png"
 
@@ -128,42 +128,11 @@ set $red "#bf616a"
 
 # class                 border  backgr. text    indicator child_border
 client.focused          $blue3  $blue3 $frost2 $blue3    $blue3
-client.focused_inactive $nord0  $blue3 $nord0  $frost2   $nord0
+client.focused_inactive $nord0  $blue3 $nord0  $nord0    $nord0
 client.unfocused        $nord0  $nord0 $frost0 $blue1    $nord0
 client.urgent           $red    $red   $frost2 $red      $red
 client.background       #ffffff
 
-{%@@ if profile == "work" @@%}
-# work start
-bar {
-    position bottom
-    colors {
-        background #2e3440
-        statusline #2e3440
-        separator #2e3440
-
-        # class                 border  backgr. text
-        focused_workspace       #2e3440 #a3be8c #2e3440
-        active_workspace        #2e3440 #2e3440 #eceff4
-        inactive_workspace      #2e3440 #2e3440 #eceff4
-        urgent_workspace       #2e3440 #bf616a #eceff4
-    }
-    status_command i3status
-}
-
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Itterasshai!' -B 'Hai!' 'i3-msg exit'"
-
-# Locking
-bindsym $mod+Shift+BackSpace exec "~/scripts/lock-work"
-
-# Monitors
-set $monitor1 "HDMI-1"
-set $monitor2 "HDMI-2"
-# work end
-{%@@ endif @@%}
-
-{%@@ if profile == "laptop" @@%}
-# laptop start
 exec "~/scripts/startup-laptop"
 # i3 doesnt let me put this in the startscript
 exec_always --no-startup-id ~/.config/polybar/start.sh &amp;
@@ -181,8 +150,6 @@ set $monitor2 "HDMI-1"
 gaps inner 8
 # polybar height + gaps inner
 gaps top 35
-# laptop end
-{%@@ endif @@%}
 
 bindsym $mod+Ctrl+1 move workspace to output $monitor1
 bindsym $mod+Ctrl+2 move workspace to output $monitor2
diff --git a/dotfiles/config/picom.conf b/dotfiles/config/picom.conf
index d750378..825f414 100644
--- a/dotfiles/config/picom.conf
+++ b/dotfiles/config/picom.conf
@@ -1,4 +1,5 @@
 # Opacity
 opacity-rule = [
     "95:class_g *?= 'Rofi'",
+    "95:class_g *?= 'XTerm'",
 ];
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index b6771d3..7ccd036 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -43,6 +43,7 @@ alias gsh="git show"
 alias gd="git diff"
 alias gc="git commit -v"
 alias gc!="git commit -v --amend"
+alias gco="git checkout"
 alias gl="git pull"
 alias gp="git push"
 alias glog="git log --oneline --decorate --graph"
@@ -148,5 +149,5 @@ test -r "~/.dir_colors" && eval $(dircolors ~/.dir_colors)
 
 ## Syntax Highlighting
 if [ -f ~/.zsh-highlighting/zsh-syntax-highlighting.zsh ]; then
-    source /home/marc/.zsh-highlighting/zsh-syntax-highlighting.zsh
+    source $HOME/.zsh-highlighting/zsh-syntax-highlighting.zsh
 fi