5 files changed, 78 insertions, 23 deletions
diff --git a/configs/linux/misc/.config/i3/config b/configs/linux/misc/.config/i3/config
index e4a241677d1f..33505dcbdaa1 100644
--- a/configs/linux/misc/.config/i3/config
+++ b/configs/linux/misc/.config/i3/config
@@ -18,8 +18,8 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
 
 # screen brightness controls
-bindsym XF86MonBrightnessUp exec xbacklight -inc 20
-bindsym XF86MonBrightnessDown exec xbacklight -dec 20
+bindsym XF86MonBrightnessUp   exec light -A 10
+bindsym XF86MonBrightnessDown exec light -U 10
 
 # ensure wallpaper
 exec --no-startup-id feh --bg-scale ~/pictures/blurred.jpg
@@ -28,22 +28,37 @@ exec --no-startup-id feh --bg-scale ~/pictures/blurred.jpg
 bindsym $mod+Return exec terminator
 
 # no title bars
-for_window [class="^.*"] border pixel 0
+for_window [class="^.*"] border pixel 3
 
 # disable mouse hover focus
 focus_follows_mouse no
 
 # kill focused window
-bindsym $mod+q exec ~/.config/i3/i3-navigate-emacs quit
+bindsym $mod+q exec ~/.config/i3/i3-and-emacs quit
 
 # start dmenu (a program launcher)
 bindsym Mod4+space exec --no-startup-id i3-dmenu-desktop --dmenu='rofi -i -dmenu -width 40 -lines 8'
 
+# GTK Themes
+exec --no-startup-id gnome-settings-daemon
+
+# wireless selection mechanism
+exec --no-startup-id nm-applet
+
+# lock the screen
+bindsym $mod+Shift+o exec "gnome-screensaver-command --lock "
+
+# sound applet
+exec --no-startup-id gnome-sound-applet
+
+# polybar
+exec_always --no-startup-id $HOME/.config/polybar/launch.sh
+
 # change focus
-bindsym $mod+h exec ~/.config/i3/i3-navigate-emacs left
-bindsym $mod+j exec ~/.config/i3/i3-navigate-emacs down
-bindsym $mod+k exec ~/.config/i3/i3-navigate-emacs up
-bindsym $mod+l exec ~/.config/i3/i3-navigate-emacs right
+bindsym $mod+h exec ~/.config/i3/i3-and-emacs left
+bindsym $mod+j exec ~/.config/i3/i3-and-emacs down
+bindsym $mod+k exec ~/.config/i3/i3-and-emacs up
+bindsym $mod+l exec ~/.config/i3/i3-and-emacs right
 
 # move focused window
 bindsym $mod+Shift+h move left
@@ -115,10 +130,12 @@ bindsym $mod+Shift+0 move container to workspace $ws10
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+# lock screen
+bindsym $mod+Control+BackSpace exec "i3lock -c 232423"
+# implemented a sleeping KBD
+# sudo pm-suspend
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -126,17 +143,17 @@ mode "resize" {
         bindsym j resize shrink height 10 px or 10 ppt
         bindsym k resize grow height 10 px or 10 ppt
         bindsym l resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape or $mod+r
         bindsym Return mode "default"
         bindsym Caps_Lock mode "default"
-        bindsym $mod+r mode "default"
+        bindsym $mod+Shift+r mode "default"
 }
 
-bindsym $mod+r mode "resize"
+bindsym $mod+Shift+r mode "resize"
 
-bar {
-        status_command i3status
-        position top
-        font pango:monospace 12
-}
+# Colors
+set $foreground #e60053
+set $background #dfdfdf
+
+# window borders
+# Format:      border      background  text        indicator   child_border
+client.focused $foreground $background $foreground $foreground $foreground
diff --git a/configs/linux/misc/.config/i3/i3-navigate-emacs b/configs/linux/misc/.config/i3/i3-and-emacs
index f973c6667f74..ed912b7da830 100755
--- a/configs/linux/misc/.config/i3/i3-navigate-emacs
+++ b/configs/linux/misc/.config/i3/i3-and-emacs
@@ -10,6 +10,10 @@ get_focused_window() {
 perform_close() {
   if [ "$(get_focused_window)" = "Emacs" ]; then
     emacsclient -e "(delete-window)"
+    result=$?
+    if [ $result -ne 0 ]; then
+      i3-msg kill
+    fi
   else
     i3-msg kill
   fi
diff --git a/configs/linux/misc/.config/terminator/config b/configs/linux/misc/.config/terminator/config
index 8409b74f32e5..5e62b9d4be5c 100644
--- a/configs/linux/misc/.config/terminator/config
+++ b/configs/linux/misc/.config/terminator/config
@@ -11,9 +11,10 @@
 [plugins]
 [profiles]
   [[default]]
+    background_type = transparent
     cursor_color = "#aaaaaa"
     cursor_shape = ibeam
-    font = Monospace 14
-    use_system_font = False
-    scrollbar_position = "disabled"
+    font = Source Code Pro 12
+    scrollbar_position = hidden
     show_titlebar = False
+    use_system_font = False
diff --git a/configs/linux/misc/.irssi/config b/configs/linux/misc/.irssi/config
new file mode 100644
index 000000000000..d5f23df69722
--- /dev/null
+++ b/configs/linux/misc/.irssi/config
@@ -0,0 +1,33 @@
+servers = (
+  {
+    address = "chat.freenode.net";
+    chatnet = "Freenode";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+    autoconnect = "yes";
+  }
+);
+
+chatnets = {
+  Freenode = {
+    type = "IRC";
+    autosendcmd = "/msg nickserv identify wpcarro ]3Fwus]YF7yXPB6Re/Me";
+  };
+};
+
+channels = (
+  { name = "#nixos"; chatnet = "Freenode"; autojoin = "Yes"; },
+  { name = "#i3"; chatnet = "Freenode"; autojoin = "No"; },
+  { name = "#haskell"; chatnet = "GameSurge"; autojoin = "No"; },
+);
+
+settings = {
+  core = {
+    real_name = "William Carroll's account";
+    user_name = "wpcarro";
+    nick = "wpcarro";
+  };
+  "fe-text" = { actlist_sort = "refnum"; };
+  "fe-common/core" = { theme = "default"; };
+};
diff --git a/configs/linux/xinit/.xinitrc b/configs/linux/xinit/.xinitrc
index a0e8dea3a363..ef0cff44c3ca 100644
--- a/configs/linux/xinit/.xinitrc
+++ b/configs/linux/xinit/.xinitrc
@@ -1 +1 @@
-startkde
+xrdb ~/.Xresources