1. firefly
  2. dotfiles

Commits

firefly  committed c409803

Updated hlwm config + various minor changes. Added altgr numpad to xkb.

  • Participants
  • Parent commits 57f5e75
  • Branches default

Comments (0)

Files changed (7)

File herbstluftwm/autostart

View file
 
 export HC_BACKGROUND='#02080F'
 xsetroot -solid "$HC_BACKGROUND"
-#feh --bg-fill $HOME/annat/diverse/wallpapers/internet-nodes.jpg
+#feh --bg-fill $HOME/annat/diverse/wallpapers/current
 #feh --bg-fill "$HOME/pics/copland-os/copland-os_768.png"
 
 
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' tag=float
 hc rule windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK)' manage=off
+hc rule class='PANEL' manage=off
 
 # unlock, just to be sure
 hc unlock
 # auto-detect connected monitors
 hc detect_monitors
 
+#--- Panel ------------------
+# TODO: make prettier--this is terribly hacky :|
+#ps x | grep 'pangoterm --class=PANEL' | awk '{print $1}' | xargs kill
+panel_script=/home/firefly/annat/diverse/term-panel/panel.sh
+ps x | grep "/bin/bash $panel_script" | awk '{print $1}' | xargs kill
+SHELL="$panel_script" pangoterm --class=PANEL --profile=panel
+
 # find the panel
-panel=~/.config/herbstluftwm/panel.sh
-#[ -x "$panel" ] || panel=/etc/xdg/herbstluftwm/panel.sh
-for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
-    # start it on each monitor
-    $panel $monitor &
-done
+#panel=~/.config/herbstluftwm/panel.sh
+##[ -x "$panel" ] || panel=/etc/xdg/herbstluftwm/panel.sh
+#for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
+#    # start it on each monitor
+#    $panel $monitor &
+#done
 
 # Prepare a (virtual) monitor + tag for floating windows (we do this after the
 # panel etc. have been added, because we don't want these for the

File herbstluftwm/panel.sh

View file
 #panel_width=${geometry[2]}
 panel_height=14
 
-font="Envy Code R-6"
+#font="Envy Code R-8"
+font="Nokia Sans-8"
 bgcolor="$HC_BACKGROUND"
 fgcolor='#EFEFEF'
 selbg="$(herbstclient get window_border_active_color)"
 selfg="$fgcolor"
 
 
-# Output is piped through this function before reaching the panel
-function pre_filter {
-  cat
-}
-
 function uniq_linebuffered() {
   awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
 }
 
   # tick
   while true; do echo tick; sleep 20; done &
-  tick_pid=$!
+# tick_pid=$!
 
   # date
   while true; do
     date +'date ^fg()%H^fg(#909090):^fg()%M^fg(#909090), %Y-%m-^fg()%d'
     sleep 1 || break
   done > >(uniq_linebuffered) &
-  date_pid=$!
+# date_pid=$!
 
   # hlwm events
   herbstclient --idle
 
   # exiting; kill stray event-emitting processes
-  kill $date_pid $mpc_pid $tick_pid $stalonetray_pid
+# kill $date_pid $mpc_pid $tick_pid $stalonetray_pid
 
 } 2>/dev/null | {
   # Default values for the panel-drawing part
   windowtitle=""
 
   Default="^fg()--"
-  sep="^bg()^fg($selbg) "
+  sep="^bg()^fg($selbg)   "
 
   # fields of the right panel
   date="$Default"
          * )  echo -n "^bg()^fg(#ababab)"         ;; # Default
       esac
 
-      echo -n "^ca(1,herbstclient focus_monitor $monitor && "'herbstclient use "'${i:1}'") '"${i:1} ^ca()"
+      # Don't draw empty tags, to conserve space.
+      # echo -n "^bg()^fg(#ababab) · "
+      if [ "${i:0:1}" != '.' ]; then
+        echo -n "^ca(1,herbstclient focus_monitor $monitor && "'herbstclient use "'${i:1}'") '"${i:1} ^ca()"
+      fi
     done
 
     # Then, draw the rest of the left panel
     esac
   done
 } 2>/dev/null \
-  1> >(pre_filter | dzen2  -fn "$font"  -y $y  -h $panel_height  -expand right \
+  1> >(dzen2  -fn "$font"  -y $y  -h $panel_height  -expand right \
           -fg "$fgcolor" -bg "$bgcolor") \
-  3> >(pre_filter | dzen2  -fn "$font"  -y $y  -h $panel_height  -expand left \
+  3> >(dzen2  -fn "$font"  -y $y  -h $panel_height  -expand left \
           -fg "$fgcolor" -bg "$bgcolor")
 

File shellrc

View file
 export BROWSER=luakit
 
 export GREP_OPTIONS='--color=auto' # -P
-export GREP_COLORS='cx=37'
+#export GREP_COLORS='cx=37'
+export GREP_COLORS="mt=38;5;208:cx=38;5;246"
 
 # see termcap(5)
 export LESS_TERMCAP_md=$'\e[1;33m'

File vim/.netrwhist

View file
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =5
-let g:netrw_dirhist_1='/home/firefly/.ghc'
-let g:netrw_dirhist_2='/home/firefly/Dropbox/prog/lang/clj/wyke'
-let g:netrw_dirhist_3='/home/firefly/.config/herbstluftwm'
-let g:netrw_dirhist_4='/home/firefly/Dropbox/web/js/rendy'
-let g:netrw_dirhist_5='/home/firefly/Dropbox/prog/repos/dotfiles/vim/bundle/vim-airline/autoload/airline'
+let g:netrw_dirhist_cnt =8
+let g:netrw_dirhist_1='/home/firefly/.config'
+let g:netrw_dirhist_2='/home/firefly/.config/herbstluftwm'
+let g:netrw_dirhist_3='/home/firefly/Dropbox/prog/own/loggy'
+let g:netrw_dirhist_4='/home/firefly/Dropbox/prog/lang/clj/clodis/src/clodis/irc'
+let g:netrw_dirhist_5='/home/firefly/Dropbox/prog/lang/clj/clodis/src/clodis/olds'
+let g:netrw_dirhist_6='/home/firefly/Dropbox/prog/lang/clj/clodis/src/clodis/irc'
+let g:netrw_dirhist_7='/home/firefly/annat/kth/kurser/åk3/diskmat13'
+let g:netrw_dirhist_8='/home/firefly/Dropbox/prog/repos/dotfiles/herbstluftwm'

File vim/vimrc

View file
 
 """" Mappings """""""""""""""""""""""""""""""""""""""""""""""""""""""
 let mapleader = "-"
-noremap å :
+
+noremap ä :
 
 " Bind C-h to fully dedent (clear all leading whitespace)
 noremap  <C-h> :s/^\s*//<CR>
 "set formatoptions+=ro           " Auto-continue comments on <CR>/o/O
 set formatoptions+=n            " Indent numbered lists in comments better
 set formatoptions+=l            " Don't wrap lines that were already long
-set formatoptions+=j            " Remove comment leaders when joining
+if v:version >= 703 || v:version ==# 703 && has('patch541')
+  set formatoptions+=j            " Remove comment leaders when joining
+endif
 
 set comments=s1:/*,mb:*,ex:*/,O://,bO:#,:%,n:>,fb:-
 
 au BufRead,BufNewFile {*.selfml}             setf selfml
 au BufRead,BufNewFile {*.ijx}                setf j
 au BufRead,BufNewFile {*.om}                 setf om
-au BufRead,BufNewFile {*.vimp}               setf vimperator
+au BufRead,BufNewFile {*.vimp,*.penta}       setf vimperator
 au BufRead            {*/xchatlogs/*.log}    setf irclog | set ro noma
 
 " Custom filetype-dependent metadata

File xkb/firefly.symbols

View file
 
 //-- Complete layout ------------------------------------------------
 default partial alphanumeric_keys xkb_symbols "firefly" {
+  include "se(basic)"
+//include "us(dvorak-intl)"
+
   name[Group1]="FireFly - Svorak";
   name[Group2]="FireFly - Greek";
 
-  include "se(basic)"
   include "firefly(svorak-a1-base)"
   include "firefly(firefly-altgr-mixin)"
+//include "firefly(svdvorak-base)"
 //include "firefly(spacecadet-altgr-mixin)"
   include "firefly(greek-grp2)"
   include "firefly(keycap-symbols)"
 // │     │ !   │ "   │ #   │ ¤   │ %   │ &   │ /   │ ( ≤ │ ) ≥ │ = ° │ ?   │ è ¬ ┃         ┃
 // │     │ 1 ¡ │ 2 @ │ 3 £ │ 4 $ │ 5   │ 6   │ 7 { │ 8 [ │ 9 ] │ 0 } │ + \ │ é ± ┃   BS    ┃
 // ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃   ∀ │   ∃ │   ∈ │   ⊆ │     │     │   ∞ │   ⊤ │     │   → │ ; ę │ ê ^ ┃       ┃
-// ┃ Tab   ┃ å ∧ │ ä ∨ │ ö ∩ │ p ∪ │ y   │ f   │ g ∘ │ c ⊥ │ r   │ l → │ , √ │ ë ~ ┃       ┃
+// ┃       ┃   ∀ │   ∃ │   ∈ │   ⊆ │     │     │   ∞ │   ⊥ │   ⊤ │   → │ ; ę │ ê ^ ┃       ┃
+// ┃ Tab   ┃ å ∧ │ ä ∨ │ ö ∩ │ p ∪ │ y   │ f   │ g ∘ │ c 7 │ r 8 │ l 9 │ , √ │ ë ~ ┃       ┃
 // ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  CR  ┃
 // ┃ (Esc)  ┃   Æ │   Ø │   ≈ │     │   ≅ │     │   ← │     │     │     │ _ ē │ * × ┃      ┃
-// ┃ Ctrl_L ┃ a æ │ o ø │ e ≠ │ u   │ i ≡ │ d   │ h ← │ t   │ n   │ s   │ - ẹ │ ' ` ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ >   │ : ė │   ⌈ │   ↓ │   ↑ │     │     │     │     │     │     ┃             ┃
-// ┃ Shift ┃ < | │ . · │ q ⌊ │ j ↓ │ k ↑ │ x   │ b   │ m µ │ w   │ v   │ z   ┃             ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃                                   ┃       ┃       ┃       ┃
-// ┃       ┃ Mod4  ┃  Alt  ┃               Space               ┃ AltGr ┃ Greek ┃       ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+// ┃ Ctrl_L ┃ a æ │ o ø │ e ≠ │ u   │ i ≡ │ d   │ h   │ t 4 │ n 5 │ s 6 │ - ẹ │ ' ` ┃      ┃
+// ┣━━━━━━┳━┹───┬─┴───┬─┴───┬─┴───┬─┴───┬─┴───┬─┴───┬─┴───┬─┴───┬─┴───┬─┴───┲━┷━━━━━┻━━━━━━┫
+// ┃      ┃ >   │ : ė │   ⌈ │   ↓ │   ↑ │     │     │     │     │     │     ┃              ┃
+// ┃ Shift┃ < | │ . · │ q ⌊ │ j ↓ │ k ↑ │ x   │ b   │ m 0 │ w 1 │ v 2 │ z 3 ┃              ┃
+// ┣━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━━┛
+// ┃      ┃       ┃       ┃                                   ┃       ┃       ┃       ┃
+// ┃      ┃ Mod4  ┃  Alt  ┃               Space               ┃ AltGr ┃ Greek ┃Compose┃
+// ┗━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
 //
 //   The uppercase variant of letter keys is omitted for sake of brevity.
 //
   key <AB01> { [     period,       colon ] };
 };
 
+// Base sv-Dvorak
+hidden partial alphanumeric_keys xkb_symbols "svdvorak-base" {
+  replace key <AC01> { [ a, A,      aring,       Aring ] };
+  replace key <AC02> { [ o, O, adiaeresis,  Adiaeresis ] };
+  replace key <AC03> { [ e, E, odiaeresis,  Odiaeresis ] };
+};
+
 // Greek (mapped to dvorak), as group 2
 partial alphanumeric_keys alternate_group xkb_symbols "greek-grp2" {
   key <AD04> { [], [      Greek_pi,      Greek_PI ] };
   key <AD05> { [ _, _,           at,           at ] };
   key <AD06> { [ _, _,           at,           at ] };
   key <AD07> { [ _, _,          jot,     infinity ] }; // ∘ ∞
-  key <AD08> { [ _, _,       uptack,     downtack ] }; // ⊥ ⊤
-  key <AD09> { [ _, _,           at,           at ] };
-  key <AD10> { [ _, _,        Right,   rightarrow ] }; //   →
+  key <AD08> { [ _, _,         KP_7,       uptack ] }; // 7 ⊥
+  key <AD09> { [ _, _,         KP_8,     downtack ] }; // 8 ⊤
+  key <AD10> { [ _, _,         KP_9,   rightarrow ] }; // 9 →
   key <AD11> { [ _, _,      radical,  dead_ogonek ] }; // √ ę
   key <AD12> { [ _, _,   asciitilde,  asciicircum ] }; // ~ ^
 
   key <AC04> { [ _, _,           at,           at ] };
   key <AC05> { [ _, _,    identical,        U2245 ] }; // ≡ ≅
   key <AC06> { [ _, _,           at,           at ] };
-  key <AC07> { [ _, _,         Left,    leftarrow ] }; //   ←
-  key <AC08> { [ _, _,           at,           at ] };
-  key <AC09> { [ _, _,           at,           at ] };
-  key <AC10> { [ _, _,           at,           at ] };
+  key <AC07> { [ _, _,           at,    leftarrow ] }; //   ←
+  key <AC08> { [ _, _,         KP_4,           at ] }; // 4
+  key <AC09> { [ _, _,         KP_5,           at ] }; // 5
+  key <AC10> { [ _, _,         KP_6,           at ] }; // 6
   key <AC11> { [ _, _, dead_belowdot, dead_macron ] }; // ẹ ē
   key <BKSL> { [ _, _,         grave,    multiply ] }; // ` ×
 
   key <AB04> { [ _, _,           Up,      uparrow ] }; //   ↑
   key <AB05> { [ _, _,           at,           at ] };
   key <AB06> { [ _, _,           at,           at ] };
-  key <AB07> { [ _, _,           mu,           at ] }; // µ
-  key <AB08> { [ _, _,           at,           at ] };
-  key <AB09> { [ _, _,           at,           at ] };
-  key <AB10> { [ _, _,           at,           at ] };
+  key <AB07> { [ _, _,         KP_0,           at ] }; // 0
+  key <AB08> { [ _, _,         KP_1,           at ] }; // 1
+  key <AB09> { [ _, _,         KP_2,           at ] }; // 2
+  key <AB10> { [ _, _,         KP_3,           at ] }; // 3
 };
 
 // Old altgr layout

File zshrc

View file
 setopt PROMPT_SUBST
 
 PROMPT='%{$fg[$prompt_color]%}%n@%m%{$reset_color%} %~
-%{${fg[yellow]}%}%# %{$reset_color%}'
+%{${fg[yellow]}%}%# '
 RPROMPT='%{$up%}$(rprompt)%{$down%}'
-PS2="${fg[yellow]}» $reset_color"
+PS2="%{${fg[yellow]}%}» "
 
 # see also: `precmd` above (for pseudo-RPROMPT)