From 155dde3daf868ae7690062727d4592d1f014cbc9 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Sat, 7 Nov 2015 18:25:32 -0800
Subject: [PATCH] More stuff

---
 README.md                                       | 16 +++++-----------
 dotfiles/config/i3/config                       |  8 ++++++++
 scripts/sysinstall/install_packages.sh          |  7 +++++++
 scripts/sysinstall/services/10-physlock         |  7 +++++++
 scripts/sysinstall/services/screensaver.service | 10 ++++++++++
 5 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 scripts/sysinstall/services/10-physlock
 create mode 100644 scripts/sysinstall/services/screensaver.service

diff --git a/README.md b/README.md
index e577309..b0811c8 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,6 @@ repository for the same thing. The directory structure is as follows:
 Take care with the dotfiles. My configurations change the terminal colors to be solarized dark. If you do not like them
 they can be easily changed in the Xresources dotfile.
 
-
-
 # Issues
 
 There are of course a things that aren't covered (yet).
@@ -32,7 +30,8 @@ There are of course a things that aren't covered (yet).
 
 # Software To Install
 
-Below is a not comprehensive list of software you should install and configure
+Below is a not a comprehensive list of software you should install and configure. The *install_packages.sh* script is
+a work in progress that will get the system up and running with everything I am using.
 
 
 ## Package Management
@@ -50,15 +49,10 @@ background to show the wallpaper. If you use sh instead of zsh, change it approp
 ## Display
 1. xorg
 2. xorg-xinit
-3. xmonad
-4. xmonad-contrib
-5. bar
+3. i3
 
 ## Screen Locking
-1. Physlock
-
-## Compositing
-1. Compton
+1. Physlock 
 
 ## Fonts
 1. infinality-bundle
@@ -72,5 +66,5 @@ background to show the wallpaper. If you use sh instead of zsh, change it approp
 1. GVim
 
 ## Browsing
-1. Google Chrome (With a dark theme)
+1. Google Chrome
 
diff --git a/dotfiles/config/i3/config b/dotfiles/config/i3/config
index 6b0608e..7a3f404 100644
--- a/dotfiles/config/i3/config
+++ b/dotfiles/config/i3/config
@@ -11,6 +11,8 @@
 
 set $mod Mod4
 
+for_window [class="^.*"] border pixel 1
+
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 font pango:Inconsolata 8
@@ -40,6 +42,12 @@ bindsym $mod+t exec urxvt -geometry 80x30 -e htop
 # kill focused window
 bindsym $mod+Shift+q kill
 
+# Lock screen and TTYs
+bindsym $mod+Mod1+l exec physlock -d
+
+# Lock and hibernate
+bindsym $mod+Mod1+h exec physlock -d & systemctl hibernate
+
 # start dmenu (a program launcher)
 bindsym $mod+d exec dmenu_run
 # There also is the (new) i3-dmenu-desktop which only displays applications
diff --git a/scripts/sysinstall/install_packages.sh b/scripts/sysinstall/install_packages.sh
index 87ea89f..f15ae86 100755
--- a/scripts/sysinstall/install_packages.sh
+++ b/scripts/sysinstall/install_packages.sh
@@ -77,7 +77,14 @@ done
 sudo sed -i -e 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen  
 sudo locale-gen
 
+
+# TODO: This section
+
 # install dotfiles
 # run dotfile installer script
 
 # configure physlock
+# copy services/screensaver.service into /etc/systemd/system/ after
+# copy services/10-physlock to /etc/pm/sleep.d/10-vlock
+# replacing USERNAME with their name via sed.
+# remember to use sudo
diff --git a/scripts/sysinstall/services/10-physlock b/scripts/sysinstall/services/10-physlock
new file mode 100644
index 0000000..538d608
--- /dev/null
+++ b/scripts/sysinstall/services/10-physlock
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+case $1 in
+  resume | thaw)
+    physlock -d &
+  ;;
+esac
\ No newline at end of file
diff --git a/scripts/sysinstall/services/screensaver.service b/scripts/sysinstall/services/screensaver.service
new file mode 100644
index 0000000..c8268dd
--- /dev/null
+++ b/scripts/sysinstall/services/screensaver.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Lock session
+Before=sleep.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/physlock -d -u USERNAME
+
+[Install]
+WantedBy=sleep.target
\ No newline at end of file