Tweaked pentadactyl colors and restructured i3wm configuration

3 files changed, 26 insertions, 34 deletions

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 25b4f6f..890af25 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -7,7 +7,7 @@ alias ccat='pygmentize -f console256 -g'
 alias csi='csi -q'
 
 if status --is-login
-    if test -z "$DISPLAY" -a $XDG_VTNR = 1
-        exec startx
-    end
+	if test -z "$DISPLAY" -a $XDG_VTNR = 1
+		exec startx
+	end
 end
diff --git a/i3wm/.i3/config b/i3wm/.i3/config
index 8d474d9..34f6ea1 100644
--- a/i3wm/.i3/config
+++ b/i3wm/.i3/config
@@ -1,9 +1,10 @@
 set $mod Mod4
 set $alt Mod1
 
-floating_modifier $mod
-
 bindsym $mod+Shift+Q kill
+bindsym $mod+Shift+C reload
+bindsym $mod+Shift+R restart
+bindsym $mod+Shift+E exit
 
 bindsym $mod+h focus left
 bindsym $mod+j focus down
@@ -15,11 +16,6 @@ bindsym $mod+Shift+J move down
 bindsym $mod+Shift+K move up
 bindsym $mod+Shift+L move right
 
-bindsym $mod+Shift+Left  move left
-bindsym $mod+Shift+Down  move down
-bindsym $mod+Shift+Up    move up
-bindsym $mod+Shift+Right move right
-
 bindsym $mod+y split h
 bindsym $mod+x split v
 bindsym $mod+f fullscreen
@@ -28,11 +24,12 @@ bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout default
 
-bindsym $mod+Shift+space floating toggle
-
 bindsym $mod+a focus parent
 bindsym $mod+d focus child
 
+floating_modifier $mod
+bindsym $mod+Shift+space floating toggle
+
 bindsym $mod+1 workspace 1
 bindsym $mod+2 workspace 2
 bindsym $mod+3 workspace 3
@@ -59,10 +56,6 @@ bindsym $mod+Shift+parenleft  move container to workspace 8
 bindsym $mod+Shift+parenright move container to workspace 9
 bindsym $mod+Shift+equal      move container to workspace 10
 
-bindsym $mod+Shift+C reload
-bindsym $mod+Shift+R restart
-bindsym $mod+Shift+E exit
-
 bindsym $mod+r mode "resize"
 
 mode "resize" {
diff --git a/pentadactyl/.pentadactylrc b/pentadactyl/.pentadactylrc
index 823debf..9a06002 100644
--- a/pentadactyl/.pentadactylrc
+++ b/pentadactyl/.pentadactylrc
@@ -12,24 +12,23 @@ hi clear
 hi s_greenfont     color:#aadb0f;
 hi s_palegreenfont color:#909737;
 hi s_grayback      background:#161616;
-hi s_grayback2     background:#121212;
 hi s_normal        font-size:14px; font-family:Droid Sans Mono;
-hi s_bottomline    border-bottom:1px solid #909737; margin-bottom:0;
 
-hi -link=s_normal,s_grayback,s_palegreenfont              Normal
-hi -link=s_normal,s_grayback,s_palegreenfont,s_bottomline StatusLine
-hi -link=s_normal,s_grayback,s_palegreenfont,s_bottomline StatusLineBroken
-hi -link=s_normal,s_grayback,s_palegreenfont,s_bottomline StatusLineExtended
-hi -link=s_normal,s_grayback,s_palegreenfont,s_bottomline StatusLineSecure
-hi -link=s_normal,s_grayback,s_palegreenfont              CompTitle
-hi                                                        CompTitleSep                             background:#909737;height:1px;
-hi                                                        Comp                                     border:0;margin:0;
-hi -link=s_normal,s_grayback,s_palegreenfont              CompItem
-hi -link=s_normal,s_grayback,s_palegreenfont              CompItem[selected]                       background:#909737;color:#161616;
-hi -link=s_normal,s_grayback2,s_palegreenfont             CompItem:nth-child(2n+1)
-hi -link=s_normal,s_grayback,s_palegreenfont              CompItem:nth-child(2n+1)[selected]       background:#909737;color:#161616;
+hi -link=s_normal,s_grayback,s_palegreenfont Normal                                   border-top:1px solid #909737;
+hi -link=s_normal,s_grayback,s_palegreenfont StatusLine
+hi -link=s_normal,s_grayback,s_palegreenfont StatusLineNormal
+hi -link=s_normal,s_grayback,s_palegreenfont StatusLineBroken
+hi -link=s_normal,s_grayback,s_palegreenfont StatusLineExtended
+hi -link=s_normal,s_grayback,s_palegreenfont StatusLineSecure
+hi -link=s_normal,s_grayback,s_palegreenfont CompTitle
+hi                                           CompTitleSep                             background:#909737;height:1px;
+hi                                           Comp                                     border:0;margin:0;
+hi -link=s_normal,s_grayback,s_palegreenfont CompItem
+hi -link=s_normal,s_grayback,s_palegreenfont CompItem[selected]                       background:#909737;color:#161616;
+hi -link=s_normal,s_palegreenfont            CompItem:nth-child(2n+1)                 background:#121212;
+hi -link=s_normal,s_grayback,s_palegreenfont CompItem:nth-child(2n+1)[selected]       background:#909737;color:#161616;
 
-hi -link=s_normal,s_greenfont,s_grayback                  Hint                                     font-weight:bold; padding:2px;
-hi                                                        HintElem                                 background:#a5a5a5;
-hi                                                        Hint[active]                             background:#aadb0f;color:#161616;
-hi                                                        HintActive                               background:#aadb0f;
+hi -link=s_normal,s_greenfont,s_grayback     Hint                                     font-weight:bold; padding:2px;
+hi                                           HintElem                                 background:#a5a5a5;
+hi                                           Hint[active]                             background:#aadb0f;color:#161616;
+hi                                           HintActive                               background:#aadb0f;