From c10637935f7092621d1a34acab1a513b273e9c9d Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdb@jdb-labs.com>
Date: Wed, 10 May 2017 12:05:58 -0500
Subject: [PATCH] Update fluxbox keys file, install and use slock (X screen
 locker).

---
 .fluxbox/keys | 59 ++++++++++++++++++++++++++++++++++-----------------
 setup.sh      |  2 +-
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/.fluxbox/keys b/.fluxbox/keys
index 6339320..92a165a 100644
--- a/.fluxbox/keys
+++ b/.fluxbox/keys
@@ -65,7 +65,7 @@ Mod1 F1 :Exec x-terminal-emulator
 #Mod4 e	:Exec nautilus --no-desktop
 Mod4 e	:Exec thunar
 
-Mod4 l  :Exec gnome-screensaver-command -l
+Mod4 l  :Exec slock
 # open a dialog to run programs
 Mod4 r	:Exec fbrun
 Mod1 F2 :Exec fbrun
@@ -97,23 +97,42 @@ Mod1 F11 :Fullscreen
 Mod4 Left :MacroCmd {ResizeTo 960 *} {MaximizeVertical} {MoveTo 0 0 TopLeft}
 Mod4 Right :MacroCmd {ResizeTo 960 *} {MaximizeVertical} {MoveTo 0 0 TopRight}
 
-Mod4 1 :MacroCmd {SetDecor NONE} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
-Mod4 2 :MacroCmd {SetDecor NONE} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
-Mod4 3 :MacroCmd {SetDecor NONE} {ResizeTo 720 *} { MaximizeVertical} {MoveTo 1200 0 TopLeft}
-Mod4 4 :MacroCmd {SetDecor NONE} {ResizeTo 1200 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
-Mod4 5 :MacroCmd {SetDecor NONE} {ResizeTo 1320 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
+Mod4 1  :ResizeTo 960 *  # 1/4 width
+Mod4 2  :ResizeTo 1920 * # 1/2 width
+Mod4 3  :ResizeTo 2880 * # 3/4 width
+Mod4 4  :ResizeTo 3840 * # full width
+Mod4 5  :ResizeTo * 540  # 1/4 height
+Mod4 6  :ResizeTo * 1080 # 1/2 height
+Mod4 7  :ResizeTo * 1620 # 3/4 height
+Mod4 8  :ResizeTo * 2160 # full height
 
-Mod4 Shift 1 :MacroCmd {SetDecor TOOL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
-Mod4 Shift 2 :MacroCmd {SetDecor TOOL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
-Mod4 Shift 3 :MacroCmd {SetDecor TOOL} {ResizeTo 720 *} { MaximizeVertical} {MoveTo 1200 0 TopLeft}
-Mod4 Shift 4 :MacroCmd {SetDecor TOOL} {ResizeTo 1200 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
-Mod4 Shift 5 :MacroCmd {SetDecor TOOL} {ResizeTo 1320 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
+Mod4 Mod1 1 :SetDecor NONE
+Mod4 Mod1 2 :SetDecor TOOL
+Mod4 Mod1 3 :SetDecor NORMAL
 
-Mod4 Mod1 Shift 1 :MacroCmd {SetDecor NORMAL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
-Mod4 Mod1 Shift 2 :MacroCmd {SetDecor NORMAL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 604 0 TopLeft}
-Mod4 Mod1 Shift 3 :MacroCmd {SetDecor NORMAL} {ResizeTo 712 *} { MaximizeVertical} {MoveTo 1208 0 TopLeft}
-Mod4 Mod1 Shift 4 :MacroCmd {SetDecor NORMAL} {ResizeTo 1204 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
-Mod4 Mod1 Shift 5 :MacroCmd {SetDecor NORMAL} {ResizeTo 1346 *} { MaximizeVertical} {MoveTo 572 0 TopLeft}
+#Mod4 1 :MacroCmd {SetDecor NONE} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
+#Mod4 2 :MacroCmd {SetDecor NONE} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
+#Mod4 3 :MacroCmd {SetDecor NONE} {ResizeTo 720 *} { MaximizeVertical} {MoveTo 1200 0 TopLeft}
+#Mod4 4 :MacroCmd {SetDecor NONE} {ResizeTo 1200 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
+#Mod4 5 :MacroCmd {SetDecor NONE} {ResizeTo 1320 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
+
+#Mod4 Shift 1 :MacroCmd {SetDecor TOOL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
+#Mod4 Shift 2 :MacroCmd {SetDecor TOOL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
+#Mod4 Shift 3 :MacroCmd {SetDecor TOOL} {ResizeTo 720 *} { MaximizeVertical} {MoveTo 1200 0 TopLeft}
+#Mod4 Shift 4 :MacroCmd {SetDecor TOOL} {ResizeTo 1200 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
+#Mod4 Shift 5 :MacroCmd {SetDecor TOOL} {ResizeTo 1320 *} { MaximizeVertical} {MoveTo 600 0 TopLeft}
+
+#Mod4 Mod1 Shift 1 :MacroCmd {SetDecor NORMAL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
+#Mod4 Mod1 Shift 2 :MacroCmd {SetDecor NORMAL} {ResizeTo 600 *} { MaximizeVertical} {MoveTo 604 0 TopLeft}
+#Mod4 Mod1 Shift 3 :MacroCmd {SetDecor NORMAL} {ResizeTo 712 *} { MaximizeVertical} {MoveTo 1208 0 TopLeft}
+#Mod4 Mod1 Shift 4 :MacroCmd {SetDecor NORMAL} {ResizeTo 1204 *} { MaximizeVertical} {MoveTo 0 0 TopLeft}
+#Mod4 Mod1 Shift 5 :MacroCmd {SetDecor NORMAL} {ResizeTo 1346 *} { MaximizeVertical} {MoveTo 572 0 TopLeft}
+
+Mod4 Control 0      :MoveTo 0 0 TopLeft
+Mod4 Control Left   :MoveLeft 960
+Mod4 Control Right  :MoveRight 960
+Mod4 Control Up     :MoveUp 540
+Mod4 Control Down   :MoveDown 540
 
 # open568 the window menu
 Mod1 space :WindowMenu
@@ -127,12 +146,12 @@ Mod1 Mod4 Left :PrevWorkspace
 Mod1 Mod4 Right :NextWorkspace
 
 # send the current window to previous/next workspace
-Shift Mod4 Left :SendToPrevWorkspace
-Shift Mod4 Right :SendToNextWorkspace
+Control Shift Mod4 Left :SendToPrevWorkspace
+Control Shift Mod4 Right :SendToNextWorkspace
 
 # send the current window and follow it to previous/next workspace
-Control Mod4 Left :TakeToPrevWorkspace
-Control Mod4 Right :TakeToNextWorkspace
+Shift Control Mod4 Left :TakeToPrevWorkspace
+Shift Control Mod4 Right :TakeToNextWorkspace
 
 # change to a specific workspace
 Mod4 F1 :Workspace 1
diff --git a/setup.sh b/setup.sh
index 0f7f607..ae1c034 100644
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
 pushd ~
 
 sudo apt-get update
-sudo apt-get install vim tmux git fluxbox aptitude default-jdk default-jdk-doc fontconfig apt-file thefuck libxft-dev python-setuptools vlc keepassx tree unison lilypond  htop synaptic dmsetup
+sudo apt-get install vim tmux git fluxbox aptitude default-jdk default-jdk-doc fontconfig apt-file thefuck libxft-dev python-setuptools vlc keepassx tree unison lilypond  htop synaptic dmsetup suckless-tools
 sudo apt-file update
 mkdir ~/projects ~/programs ~/temp
 git clone _git@git.jdb-labs.com:jdb/dotfile temp/dotfiles