Merge branch 'master' of tesuji.6.orbekk.com:/storage/projects/dotfiles

2 files changed, 52 insertions, 66 deletions

diff --git a/i3/config b/i3/config
index 9e49a23..d7a985e 100644
--- a/i3/config
+++ b/i3/config
@@ -13,100 +13,85 @@
 # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 font xft:Droid Sans Bold 7
 
-# use Mouse+Mod4 to drag floating windows to their wanted position
-floating_modifier Mod4
+# i3 modifier key.
+set $mod Mod1
+
+# use Mouse+Mod1 to drag floating windows to their wanted position
+floating_modifier $mod
 
 # start a terminal
-bindsym Mod4+Return exec gnome-terminal
+bindsym $mod+Return exec gnome-terminal
 
 bindsym Pause exec i3lock -c 2A3462
 
 # kill focused window
-bindsym Mod4+Shift+q kill
+bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym Mod4+d exec $HOME/bin/dmenu_run.sh
+bindsym $mod+d exec $HOME/bin/dmenu_run.sh
 
 # change focus
-bindsym Mod4+h focus left
-bindsym Mod4+j focus down
-bindsym Mod4+k focus up
-bindsym Mod4+l focus right
-
-# alternatively, you can use the cursor keys:
-bindsym Mod4+Left focus left
-bindsym Mod4+Down focus down
-bindsym Mod4+Up focus up
-bindsym Mod4+Right focus right
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
 
 # move focused window
-bindsym Mod4+Shift+h move left
-bindsym Mod4+Shift+j move down
-bindsym Mod4+Shift+k move up
-bindsym Mod4+Shift+l move right
-
-# alternatively, you can use the cursor keys:
-bindsym Mod4+Shift+Left move left
-bindsym Mod4+Shift+Down move down
-bindsym Mod4+Shift+Up move up
-bindsym Mod4+Shift+Right move right
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
 
 # split in horizontal orientation
-bindsym Mod4+minus split h
+bindsym $mod+minus split h
 
 # split in vertical orientation
-bindsym Mod4+v split v
+bindsym $mod+v split v
 
 # enter fullscreen mode for the focused container
-bindsym Mod4+f fullscreen
+bindsym $mod+f fullscreen
 
 # change container layout (stacked, tabbed, default)
-bindsym Mod4+s layout stacking
-bindsym Mod4+w layout tabbed
-bindsym Mod4+e layout default
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout default
 
 # toggle tiling / floating
-bindsym Mod4+Shift+space floating toggle
+bindsym $mod+Shift+space floating toggle
 
 # change focus between tiling / floating windows
-bindsym Mod4+space focus mode_toggle
-
-# focus the parent container
-# bindsym Mod4+a focus parent
-
-# focus the child container
-#bindsym Mod4+d focus child
+bindsym $mod+space focus mode_toggle
 
 # switch to workspace
-bindsym Mod4+1 workspace 1
-bindsym Mod4+2 workspace 2
-bindsym Mod4+3 workspace 3
-bindsym Mod4+4 workspace 4
-bindsym Mod4+5 workspace 5
-bindsym Mod4+6 workspace 6
-bindsym Mod4+7 workspace 7
-bindsym Mod4+8 workspace 8
-bindsym Mod4+9 workspace 9
-bindsym Mod4+0 workspace 10
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
 
 # move focused container to workspace
-bindsym Mod4+Shift+1 move workspace 1
-bindsym Mod4+Shift+2 move workspace 2
-bindsym Mod4+Shift+3 move workspace 3
-bindsym Mod4+Shift+4 move workspace 4
-bindsym Mod4+Shift+5 move workspace 5
-bindsym Mod4+Shift+6 move workspace 6
-bindsym Mod4+Shift+7 move workspace 7
-bindsym Mod4+Shift+8 move workspace 8
-bindsym Mod4+Shift+9 move workspace 9
-bindsym Mod4+Shift+0 move workspace 10
+bindsym $mod+Shift+1 move workspace 1
+bindsym $mod+Shift+2 move workspace 2
+bindsym $mod+Shift+3 move workspace 3
+bindsym $mod+Shift+4 move workspace 4
+bindsym $mod+Shift+5 move workspace 5
+bindsym $mod+Shift+6 move workspace 6
+bindsym $mod+Shift+7 move workspace 7
+bindsym $mod+Shift+8 move workspace 8
+bindsym $mod+Shift+9 move workspace 9
+bindsym $mod+Shift+0 move workspace 10
 
 # reload the configuration file
-bindsym Mod4+Shift+c reload
+bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym Mod4+Shift+r restart
+bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym Mod4+Shift+e exit
+bindsym $mod+Shift+e exit
 
 # # class                 border  backgr. text    indicator
 client.focused          #000000 #6a9fb5 #f5f5f5 #2e9ef4
@@ -153,12 +138,12 @@ mode "resize" {
 }
 
 # NOTE(orbekk): Disable resize mode: I never use it and sometimes I accidentally trigger it.
-# bindsym Mod4+r mode "resize"
+# bindsym $mod+r mode "resize"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-        status_command i3blocks
+        status_command i3blocks || i3status
         font xft:Droid Sans Mono 8
 }
 
diff --git a/spacemacs b/spacemacs
index 3223e41..703f9af 100644
--- a/spacemacs
+++ b/spacemacs
@@ -28,13 +28,13 @@ values."
      emacs-lisp
      shell
      c-c++
-     semantic
+     ;; semantic
      haskell
      html
      javascript
      markdown
      haskell
-     git
+     ;; git
      markdown
      org
      ;; (shell :variables
@@ -220,6 +220,7 @@ layers configuration. You are free to put any user code."
    vc-follow-symlinks nil
    web-mode-code-indent-offset 2)
   (nyan-mode)
+  (load-file "~/.spacemacs.local")
   )
 ;; Do not write anything past this comment. This is where Emacs will
 ;; auto-generate custom variable definitions.