From 7d225a77f1ae6d0170cd8cf7a46552d0c353b6fe Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Fri, 12 Oct 2018 00:08:44 -0500
Subject: [PATCH] i3: Renovate i3 config

---
 .config/i3/config | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/.config/i3/config b/.config/i3/config
index 292871bb..4d9bba14 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -47,17 +47,18 @@ set_from_resource $fg color15 #ebdbb2
 font pango:Roboto 10
 
 # Titlebar and borders
-new_window pixel 4
-for_window [class=".*"] border pixel 4
+new_window pixel 2
+for_window [class=".*"] border pixel 2
 for_window [class=".*"] title_format "%title"
 
 # Miscellaneous window rules
-for_window [class="Waterfox"] move to workspace $w1
+for_window [class="Firefox"] move to workspace $w1
+for_window [class="Firefox-esr"] move to workspace $w1
 for_window [class="discord"] move to workspace $w7
 for_window [class="Spotify"] move to workspace $w8
 
 # i3-gaps configs
-gaps inner 6
+gaps inner 8
 gaps outer 0
 
 # Apply colors to i3
@@ -73,7 +74,7 @@ gaps outer 0
 ## Unified configuration script
 ###################
 
-exec_always --no-startup-id "~/.config/dtfscripts/wmstartup.sh"
+exec_always --no-startup-id "~/.concession/conspiracy"
 
 ###################
 ## Keybindings
@@ -94,7 +95,7 @@ bindsym $mod+Return exec "i3-sensible-terminal"
 bindsym $mod+q kill
 bindsym $mod+space exec "rofi -show drun"
 bindsym $mod+backslash exec "rofi -show ssh"
-bindsym $mod+Tab exec "rofi -show"
+bindsym $mod+Tab exec "rofi -show window"
 
 # Pulse controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
@@ -106,7 +107,7 @@ bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness
 bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightness
 
 # mpv-xwinwrap controls
-bindsym $mod+p exec --no-startup-id "~/.local/bin/mpv-xwinwrap"
+bindsym $mod+p exec --no-startup-id "~/.local/bin/tubetop2"
 bindsym $mod+$shift+p exec --no-startup-id "pkill xwinwrap"
 
 # Miscellaneous non-movement hotkeys
@@ -120,29 +121,17 @@ bindsym $mod+j focus down
 bindsym $mod+k focus up
 bindsym $mod+l focus right
 
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
 # move focused window
 bindsym $mod+$shift+h move left
 bindsym $mod+$shift+j move down
 bindsym $mod+$shift+k move up
 bindsym $mod+$shift+l move right
 
-# alternatively, you can use the cursor keys:
-bindsym $mod+$shift+Left move left
-bindsym $mod+$shift+Down move down
-bindsym $mod+$shift+Up move up
-bindsym $mod+$shift+Right move right
-
 # move focused workspace between monitors
-bindsym $sup+Left move workspace to output left
-bindsym $sup+Down move workspace to output down
-bindsym $sup+Up move workspace to output up
-bindsym $sup+Right move workspace to output right
+bindsym $sup+h move workspace to output left
+bindsym $sup+j move workspace to output down
+bindsym $sup+k move workspace to output up
+bindsym $sup+l move workspace to output right
 
 # split in horizontal orientation
 bindsym $mod+semicolon split h
@@ -150,6 +139,9 @@ bindsym $mod+semicolon split h
 # split in vertical orientation
 bindsym $mod+v split v
 
+# toggle tiling / floating
+bindsym $mod+f floating toggle
+
 # enter fullscreen mode for the focused container
 bindsym $mod+$shift+f fullscreen toggle
 
@@ -158,9 +150,6 @@ bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
-# toggle tiling / floating
-bindsym $mod+f floating toggle
-
 # focus the parent container
 bindsym $mod+a focus parent
 
@@ -181,9 +170,6 @@ bindsym $mod+8 workspace $w8
 bindsym $mod+. workspace next
 bindsym $mod+, workspace prev
 
-bindsym $ctl+$mod+Right workspace next
-bindsym $ctl+$mod+Left workspace prev
-
 # move focused container to workspace
 bindsym $mod+$shift+1 move container to workspace $w1
 bindsym $mod+$shift+2 move container to workspace $w2