Reformat with tabs and more consistent style

master
Pierre Neidhardt 2014-11-12 18:00:08 +01:00
parent 3b5e714c13
commit d13548540a
18 changed files with 392 additions and 405 deletions

View File

@ -1,7 +1,7 @@
#!javascript
Signal.connect("documentLoaded", function (wv) {
if (wv.uri == "about:blank") {
wv.inject("document.body.style.background = '#000';");
}
if (wv.uri == "about:blank") {
wv.inject("document.body.style.background = '#000';");
}
});

View File

@ -1,8 +1,7 @@
//!javascript
Signal.connect("changeMode", function(wv, mode) {
if (mode == Modes.NormalMode)
{
wv.focusedFrame.inject("document.activeElement.blur();");
}
if (mode == Modes.NormalMode) {
wv.focusedFrame.inject("document.activeElement.blur();");
}
});

View File

@ -5,7 +5,7 @@
var regex = new RegExp("http(.*)://www.youtube.com/watch\\?(.*&)*v=.*");
Signal.connect("navigation", function (wv, frame, request) {
if (wv.mainFrame == frame && regex.test(request.uri))
system.spawn("sh -c 'mpv \"$(youtube-dl -g " + request.uri + ")\"'");
return false;
if (wv.mainFrame == frame && regex.test(request.uri))
system.spawn("sh -c 'mpv \"$(youtube-dl -g " + request.uri + ")\"'");
return false;
});

View File

@ -1,12 +1,12 @@
<!-- Webkit ugly bitmap font fix when Clean tag is set-->
<fontconfig>
<selectfont>
<rejectfont>
<pattern>
<patelt name="family">
<string>Clean</string>
</patelt>
</pattern>
</rejectfont>
</selectfont>
<selectfont>
<rejectfont>
<pattern>
<patelt name="family">
<string>Clean</string>
</patelt>
</pattern>
</rejectfont>
</selectfont>
</fontconfig>

View File

@ -91,7 +91,7 @@ ext nes, has fceux, X = fceux "$1"
ext exe = wine "$1"
name ^[mM]akefile$ = make
ext texi = "$EDITOR" -- "$@"
ext js = "$EDITOR" -- "$@"
ext js|json = "$EDITOR" -- "$@"
#--------------------------------------------
# Code
@ -139,6 +139,9 @@ mime ^video, terminal, !X, has mplayer = mplayer -- "$@"
#-------------------------------------------
# Image Viewing:
#-------------------------------------------
ext svg, has dwb, X, flag f = dwb -- "$@"
ext svg, has inkscape, X, flag f = inkscape -- "$@"
mime ^image, has sxiv, X, flag f = sxiv -f -- "$@"
mime ^image, has feh, X, flag f = feh -- "$@"
mime ^image, has mirage, X, flag f = mirage -- "$@"
@ -147,8 +150,6 @@ mime ^image, has gimp, X, flag f = gimp -- "$@"
ext xcf, X, flag f = gimp -- "$@"
ext tga, X, flag f = sxiv -f -- "$@"
ext svg, has dwb, X, flag f = dwb -- "$@"
ext svg, has inkscape X, flag f = inkscape -- "$@"
#-------------------------------------------
# Documents

View File

@ -43,71 +43,71 @@ trim() { head -n "$maxln"; }
highlight() { command highlight "$@"; test $? = 0 -o $? = 141; }
case "$extension" in
# Archive extensions:
# We ignore compressed tared files as it is too slow.
# bz|bz2|t7z|tbz|tbz2|tgz|tlz|txz|tZ|xz|gz|
a|ace|alz|arc|arj|cab|cpio|deb|jar|lha|lz|lzh|lzma|lzo|\
rpm|rz|tar|tzo|war|xpi|Z|zip)
try als "$path" && { dump | trim; exit 0; }
try acat "$path" && { dump | trim; exit 3; }
try bsdtar -lf "$path" && { dump | trim; exit 0; }
exit 1;;
rar)
try unrar -p- lt "$path" && { dump | trim; exit 0; } || exit 1;;
# Archive extensions:
# We ignore compressed tared files as it is too slow.
# bz|bz2|t7z|tbz|tbz2|tgz|tlz|txz|tZ|xz|gz|
a|ace|alz|arc|arj|cab|cpio|deb|jar|lha|lz|lzh|lzma|lzo|\
rpm|rz|tar|tzo|war|xpi|Z|zip)
try als "$path" && { dump | trim; exit 0; }
try acat "$path" && { dump | trim; exit 3; }
try bsdtar -lf "$path" && { dump | trim; exit 0; }
exit 1;;
rar)
try unrar -p- lt "$path" && { dump | trim; exit 0; } || exit 1;;
# PDF documents:
pdf)
try pdftotext -l 10 -nopgbrk -q "$path" - && \
{ dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
# PDF documents:
pdf)
try pdftotext -l 10 -nopgbrk -q "$path" - && \
{ dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
# BitTorrent Files
torrent)
try transmission-show "$path" && { dump | trim; exit 5; } || exit 1;;
# BitTorrent Files
torrent)
try transmission-show "$path" && { dump | trim; exit 5; } || exit 1;;
# HTML Pages:
htm|html|xhtml)
try w3m -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
try lynx -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
try elinks -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
;; # fall back to highlight/cat if the text browsers fail
# HTML Pages:
htm|html|xhtml)
try w3m -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
try lynx -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
try elinks -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
;; # fall back to highlight/cat if the text browsers fail
## CUSTOM SUPPORT
ogg)
try mediainfo "$path" && { dump | sed 's/ \+:/: /;' | trim | fmt -s -w $width; exit 4; } ;;
mkv)
try mediainfo "$path" && { dump | sed 's/ \+:/: /;' | trim | fmt -s -w $width; exit 4; } ;;
doc)
try antiword "$path" && { dump | trim | fmt -s -w $width; exit 0; }
try catdoc "$path" && { dump | trim | fmt -s -w $width; exit 0; }
exit 1;;
docx)
try docx2txt.pl "$path" - && { dump | trim | fmt -s -w $width; exit 0; }
try catdoc "$path" && { dump | trim | fmt -s -w $width; exit 0; }
exit 1;;
rtf)
try unrtf --text "$path" && { dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
odt)
try odt2txt "$path" && { dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
tga)
try mediainfo "$path" && { dump | trim | sed 's/ \+:/: /;'; exit 5; } || exit 1;;
## CUSTOM SUPPORT
ogg)
try mediainfo "$path" && { dump | sed 's/ \+:/: /;' | trim | fmt -s -w $width; exit 4; } ;;
mkv)
try mediainfo "$path" && { dump | sed 's/ \+:/: /;' | trim | fmt -s -w $width; exit 4; } ;;
doc)
try antiword "$path" && { dump | trim | fmt -s -w $width; exit 0; }
try catdoc "$path" && { dump | trim | fmt -s -w $width; exit 0; }
exit 1;;
docx)
try docx2txt.pl "$path" - && { dump | trim | fmt -s -w $width; exit 0; }
try catdoc "$path" && { dump | trim | fmt -s -w $width; exit 0; }
exit 1;;
rtf)
try unrtf --text "$path" && { dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
odt)
try odt2txt "$path" && { dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
tga)
try mediainfo "$path" && { dump | trim | sed 's/ \+:/: /;'; exit 5; } || exit 1;;
esac
case "$mimetype" in
# Syntax highlight for text files:
text/* | */xml)
try highlight --out-format=xterm256 -s clarity "$path" && { dump | trim; exit 5; } || exit 2;;
# Syntax highlight for text files:
text/* | */xml)
try highlight --out-format=xterm256 -s clarity "$path" && { dump | trim; exit 5; } || exit 2;;
# Ascii-previews of images:
image/*)
exiftool "$path" && exit 5
# # Use sed to remove spaces so the output fits into the narrow window
try mediainfo "$path" && { dump | trim | sed 's/ \+:/: /;'; exit 5; } || exit 1;;
# Ascii-previews of images:
image/*)
exiftool "$path" && exit 5
# # Use sed to remove spaces so the output fits into the narrow window
try mediainfo "$path" && { dump | trim | sed 's/ \+:/: /;'; exit 5; } || exit 1;;
# Display information about media files:
video/* | audio/*)
exiftool "$path" && exit 5
# Use sed to remove spaces so the output fits into the narrow window
try mediainfo "$path" && { dump | trim | sed 's/ \+:/: /;'; exit 5; } || exit 1;;
# Display information about media files:
video/* | audio/*)
exiftool "$path" && exit 5
# Use sed to remove spaces so the output fits into the narrow window
try mediainfo "$path" && { dump | trim | sed 's/ \+:/: /;'; exit 5; } || exit 1;;
esac
exit 1

View File

@ -1,56 +1,56 @@
# -*- mode:conf -*-
[user]
email = ambrevar@gmail.com
name = Pierre Neidhardt
email = ambrevar@gmail.com
name = Pierre Neidhardt
[color]
ui = true
ui = true
[alias]
b = branch -vva
c = commit
ca = commit -a
co = checkout
d = diff --color-words
dc = diff --color-words --cached
l = log --stat
lol = log --graph --decorate --pretty=format:'%C(yellow)%h %Cgreen%cd%C(bold red)%d%Creset %s' --abbrev-commit --date=short
m = mergetool
r = remote -v
s = status -uno
su = status -uno -u
b = branch -vva
c = commit
ca = commit -a
co = checkout
d = diff --color-words
dc = diff --color-words --cached
l = log --stat
lol = log --graph --decorate --pretty=format:'%C(yellow)%h %Cgreen%cd%C(bold red)%d%Creset %s' --abbrev-commit --date=short
m = mergetool
r = remote -v
s = status -uno
su = status -uno -u
[push]
default = current
default = current
## Ediff merge tool.
## See:
## http://kerneltrap.org/mailarchive/git/2007/7/1/250424
## http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool
[mergetool.ediff]
cmd = emacs --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
cmd = emacs --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
[merge]
tool = ediff
tool = ediff
[sendemail]
smtpencryption = tls
smtpserver = smtp.gmail.com
smtpuser = ambrevar@gmail.com
smtpserverport = 587
to = pacman-dev@archlinux.org
suppresscc = author
# sendemail.confir = auto
aliasfiletype = mutt
# aliasesfile = ~/.mutt.d/aliases
smtpencryption = tls
smtpserver = smtp.gmail.com
smtpuser = ambrevar@gmail.com
smtpserverport = 587
to = pacman-dev@archlinux.org
suppresscc = author
# sendemail.confir = auto
aliasfiletype = mutt
# aliasesfile = ~/.mutt.d/aliases
[tig]
line-graphics = "utf-8"
author-width = 12
show-author = "abbreviated"
show-date = "short"
show-id = true
line-number-interval = 1
line-graphics = "utf-8"
author-width = 12
show-author = "abbreviated"
show-date = "short"
show-id = true
line-number-interval = 1
[tig "bind"]
main = C !git checkout %(commit)
main = ^D !git diff %(prompt) %(commit)
main = C !git checkout %(commit)
main = ^D !git diff %(prompt) %(commit)
[tig "color"]
date = yellow default
date = yellow default
date = yellow default
date = yellow default

View File

@ -3,29 +3,29 @@
## Install all map files in .kbd folder
if [ $(id -u) -ne 0 ]; then
echo "You must be root to run this script."
exit
echo "You must be root to run this script."
exit
fi
_install ()
{
FULLPATH="$(realpath "$1")"
NAME="${FULLPATH##*/}"
FULLPATH="$(realpath "$1")"
NAME="${FULLPATH##*/}"
BUF="${FULLPATH%/*}"
CAT="${BUF##*/}"
BUF="${BUF%/*}"
CAT="${BUF##*/}/$CAT"
BUF="${FULLPATH%/*}"
CAT="${BUF##*/}"
BUF="${BUF%/*}"
CAT="${BUF##*/}/$CAT"
umask 022
echo "Installing [$FULLPATH] to [/usr/share/kbd/keymaps/$CAT/$NAME.gz]"
gzip -c "$FULLPATH" > "/usr/share/kbd/keymaps/$CAT/$NAME.gz"
umask 022
echo "Installing [$FULLPATH] to [/usr/share/kbd/keymaps/$CAT/$NAME.gz]"
gzip -c "$FULLPATH" > "/usr/share/kbd/keymaps/$CAT/$NAME.gz"
}
SOURCE_PATH="$(realpath "$0")"
SOURCE_PATH="${SOURCE_PATH%/*}"
while IFS= read -r i; do
_install "$i"
_install "$i"
done<<EOF
$(find "$SOURCE_PATH" -iname '*.map' -type f)
EOF

View File

@ -1,171 +1,170 @@
<head>
<title>dwb - %s</title>
<link rel='icon' type='image/x-icon'
href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeEAQAAADBqbpqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAANUSURBVEjH7ZR7TFN3FMc/9wEFQkWpIEwWplUS39EuMINbAdHEZSmawNSQ+WiixOka3dw/Gtkjezi3ZWEmCzhRo5tETSU+olMCUZnLNGi1Yz7Gio+owyIK0sBa2/72RxmPpXcZY2HJxje5yb3nfM/3e3/nnHthCP91SFqJx2UAEXG8GGH2p/JrqyeQG3zWu186Qp3RqMVnJURtwyrndCSheO77TNIt/+ZwfDmc6QcNsHatXrl8+8Pnr3fUum9drd0UbP/sNWWKWq/1ovqVYHdMGn31kj3xuv10dUtL7Svy1wWx/WqD/n2ItloXjC0K/DD+OSHyrglRb6pxPnBGJLlcWlXK+vhme1raeSHGGYR4Ty/E3e3r0rT4arhg+0aAuB8bkScDxGZDUAZ1FuDQMpa/epgw4uTDrqcH20E+CGRrsPvVin8Q/z9jtb8F+qPQ9qViAPVNsmjyPENM8M6T5KfHiGXAjb9s3Dp75HHfuqwc9umaUSkHGFYZODT/skn5JvUPpm3i46y6yJ83n3vdHWPPKxXzAnujL0iSbuo7G6DqGPBRdyt3gpppitP7F81wL1fyABgO4gZ0lINaZNrmmPhT3mppsezCTTGAcpNilHBz8VvOJb/kWHr27YVRr+qaAsNhtRvyjQmTQBzvzXVcg7LdheeDZwvB3BX8FKJmQe4vADohkIUA7Wt6shDO0TVOITBC4ZreuXd3CeEuLVwDGKHG+Wc6IET8IyFOWIRQ8Q7uUnXPuPvODCnNxLY9cb3Q3vDYAKOa4Kmqvyuc8DKguzenec/9JBjWAsYzgKdnbF2QgPX1/tRjh20HID0AW00DOVHBF3Di1FZTSMt2APx9VrXnO46HaKuonjiuc6Z1g78CvJUDMY70QfJ33sqNHf4K6JwJojq8MaBMkSulKrOhbK/FNid7WkZPAiItiVt8n+eXLNyRvqJPjQ2UCekrXKX5JaNciVu6hReBenFaxqYUi+0Nu9kglch9DiKFtg34FpakweR2kBbAaQ8cbQyRUt6Cok8gKgfqlsC+gh6B+TGQOR18xVCuQuPsUDw3A+Z+D+yEhoRQLjgP4h9BxdLexoOE343/zX/1lVWDaSiPlUyde65MUCEzcjCNpVwiWg96pYErDWEIGvgNdLVGBQKQtg8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTEtMDItMDhUMjA6NDU6MjMrMDE6MDAWGaRfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDExLTAyLTA4VDIwOjQ1OjIzKzAxOjAwZ0Qc4wAAAABJRU5ErkJggg==' >
<style type="text/css">
body {
background : #444;
font: normal 14px helvetica;
}
<title>dwb - %s</title>
<link rel='icon' type='image/x-icon' href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeEAQAAADBqbpqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAANUSURBVEjH7ZR7TFN3FMc/9wEFQkWpIEwWplUS39EuMINbAdHEZSmawNSQ+WiixOka3dw/Gtkjezi3ZWEmCzhRo5tETSU+olMCUZnLNGi1Yz7Gio+owyIK0sBa2/72RxmPpXcZY2HJxje5yb3nfM/3e3/nnHthCP91SFqJx2UAEXG8GGH2p/JrqyeQG3zWu186Qp3RqMVnJURtwyrndCSheO77TNIt/+ZwfDmc6QcNsHatXrl8+8Pnr3fUum9drd0UbP/sNWWKWq/1ovqVYHdMGn31kj3xuv10dUtL7Svy1wWx/WqD/n2ItloXjC0K/DD+OSHyrglRb6pxPnBGJLlcWlXK+vhme1raeSHGGYR4Ty/E3e3r0rT4arhg+0aAuB8bkScDxGZDUAZ1FuDQMpa/epgw4uTDrqcH20E+CGRrsPvVin8Q/z9jtb8F+qPQ9qViAPVNsmjyPENM8M6T5KfHiGXAjb9s3Dp75HHfuqwc9umaUSkHGFYZODT/skn5JvUPpm3i46y6yJ83n3vdHWPPKxXzAnujL0iSbuo7G6DqGPBRdyt3gpppitP7F81wL1fyABgO4gZ0lINaZNrmmPhT3mppsezCTTGAcpNilHBz8VvOJb/kWHr27YVRr+qaAsNhtRvyjQmTQBzvzXVcg7LdheeDZwvB3BX8FKJmQe4vADohkIUA7Wt6shDO0TVOITBC4ZreuXd3CeEuLVwDGKHG+Wc6IET8IyFOWIRQ8Q7uUnXPuPvODCnNxLY9cb3Q3vDYAKOa4Kmqvyuc8DKguzenec/9JBjWAsYzgKdnbF2QgPX1/tRjh20HID0AW00DOVHBF3Di1FZTSMt2APx9VrXnO46HaKuonjiuc6Z1g78CvJUDMY70QfJ33sqNHf4K6JwJojq8MaBMkSulKrOhbK/FNid7WkZPAiItiVt8n+eXLNyRvqJPjQ2UCekrXKX5JaNciVu6hReBenFaxqYUi+0Nu9kglch9DiKFtg34FpakweR2kBbAaQ8cbQyRUt6Cok8gKgfqlsC+gh6B+TGQOR18xVCuQuPsUDw3A+Z+D+yEhoRQLjgP4h9BxdLexoOE343/zX/1lVWDaSiPlUyde65MUCEzcjCNpVwiWg96pYErDWEIGvgNdLVGBQKQtg8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTEtMDItMDhUMjA6NDU6MjMrMDE6MDAWGaRfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDExLTAyLTA4VDIwOjQ1OjIzKzAxOjAwZ0Qc4wAAAABJRU5ErkJggg==' />
<style type="text/css">
body {
background : #444;
font: normal 14px helvetica;
}
#dwb_main_container {
top: 20px;
bottom: 20px;
margin-top: 30px;
background: black;
margin-left: auto;
margin-right: auto;
min-width: 600px;
max-width : 90%;
border: 1px solid #999;
-webkit-border-radius: 10px;
padding: 30px;
}
#dwb_main_container {
top: 20px;
bottom: 20px;
margin-top: 30px;
background: black;
margin-left: auto;
margin-right: auto;
min-width: 600px;
max-width : 90%;
border: 1px solid #999;
-webkit-border-radius: 10px;
padding: 30px;
}
#dwb_info_table {
position: relative;
display: table;
margin-left: auto;
margin-right: auto;
width: 95%;
color: white;
border-collapse: collapse;
}
#dwb_info_table {
position: relative;
display: table;
margin-left: auto;
margin-right: auto;
width: 95%;
color: white;
border-collapse: collapse;
}
textarea {
display:block;
width:100%;
margin-top: 10px;
}
textarea {
display:block;
width:100%;
margin-top: 10px;
}
tr > td {
margin-bottom: 3px;
}
tr > td {
margin-bottom: 3px;
}
.dwb_table_row, .table_row_odd {
padding-top: 5px;
margin-left: auto;
margin-right: auto;
background-color: black;
}
.dwb_table_row, .table_row_odd {
padding-top: 5px;
margin-left: auto;
margin-right: auto;
background-color: black;
}
.dwb_table_row_even {
padding-top: 5px;
margin-left: auto;
margin-right: auto;
background-color: #333;
}
.dwb_table_row_even {
padding-top: 5px;
margin-left: auto;
margin-right: auto;
background-color: #333;
}
.dwb_ellipsize {
position: absolute;
text-overflow:ellipsis;
white-space:nowrap;
overflow:hidden;
color: inherit;
font: inherit;
top:2px;
width: 100%;
}
.dwb_ellipsize {
position: absolute;
text-overflow:ellipsis;
white-space:nowrap;
overflow:hidden;
color: inherit;
font: inherit;
top:2px;
width: 100%;
}
.dwb_table_cell_left {
position: relative;
display: block;
margin-right: auto;
font: normal 12px helvetica;
text-align: left;
padding-left: 5px;
border-bottom: 1px solid black;
width: 50%;
}
.dwb_table_cell_left {
position: relative;
display: block;
margin-right: auto;
font: normal 12px helvetica;
text-align: left;
padding-left: 5px;
border-bottom: 1px solid black;
width: 50%;
}
.dwb_table_cell_middle {
position: relative;
padding-left: 10px;
padding-right: 10px;
font: normal 12px helvetica;
border-bottom: 1px solid black;
width: 45%;
}
.dwb_table_cell_middle {
position: relative;
padding-left: 10px;
padding-right: 10px;
font: normal 12px helvetica;
border-bottom: 1px solid black;
width: 45%;
}
.dwb_table_cell_right {
position: relative;
padding-left: 10px;
padding-right: 10px;
text-align:right;
border-bottom: 1px solid black;
width: 5%;
}
.dwb_table_cell_right {
position: relative;
padding-left: 10px;
padding-right: 10px;
text-align:right;
border-bottom: 1px solid black;
width: 5%;
}
.dwb_table_headline {
font: bold 12px helvetica;
border-bottom: 2px solid #ebeffa;
border-top: 1px solid black;
text-align: left;
background-color: #ebeffa;
/* background-color: #222; */
margin: 4px;
color: #000;
}
.dwb_table_headline {
font: bold 12px helvetica;
border-bottom: 2px solid #ebeffa;
border-top: 1px solid black;
text-align: left;
background-color: #ebeffa;
/* background-color: #222; */
margin: 4px;
color: #000;
}
#dwb_headline {
width: 98%;
margin-left: auto;
margin-right: auto;
margin-bottom: 30px;
border-bottom: 1px solid #ccc;
}
#dwb_headline {
width: 98%;
margin-left: auto;
margin-right: auto;
margin-bottom: 30px;
border-bottom: 1px solid #ccc;
}
#dwb_headline > a {
margin-left: 10px;
margin-right: 10px;
font: bold 14px helvetica;
}
#dwb_headline > a {
margin-left: 10px;
margin-right: 10px;
font: bold 14px helvetica;
}
.desc {
font: normal 12px helvetica;
}
.desc {
font: normal 12px helvetica;
}
.commandLine {
border: 1px dashed #ccc;
font: normal 12px monospace;
padding: 5px 15px;
margin: 10px 5px;
display: inline-block;
}
.commandLine {
border: 1px dashed #ccc;
font: normal 12px monospace;
padding: 5px 15px;
margin: 10px 5px;
display: inline-block;
}
.commandLineContainer {
display: block;
}
.commandLineContainer {
display: block;
}
a {
color: #ddd;
text-decoration: none;
font: bold 12px helvetica;
}
a {
color: #ddd;
text-decoration: none;
font: bold 12px helvetica;
}
a:hover {
text-decoration: underline;
}
a:hover {
text-decoration: underline;
}
td {
font: bold 12px helvetica;
}
td {
font: bold 12px helvetica;
}
tr {
min-height: 50px;
}
tr {
min-height: 50px;
}
.dwb_qm {
font-weight:normal;
color: yellow;
padding-right: 8px;
text-align: center;
display: inline-block;
}
.dwb_qm {
font-weight:normal;
color: yellow;
padding-right: 8px;
text-align: center;
display: inline-block;
}
.footnote {
font : normal 10px monospace;
padding : 15px;
}
</style>
.footnote {
font : normal 10px monospace;
padding : 15px;
}
</style>
</head>

View File

@ -2,7 +2,7 @@
## 8/16 colors
if [ $(tput colors) -ne 256 ]; then
cat <<EOF
cat <<EOF
set my_bg = default
set my_new = brightwhite
set my_old = red

View File

@ -7,7 +7,7 @@
## If graphical emacs is used, we need to use a non-terminating client.
if [ "$EDITOR" = "em" ]; then
cat <<EOF
cat <<EOF
set editor="emc"
EOF
fi

View File

@ -2,7 +2,7 @@
## Set sidebar options only if sidebar patch is installed.
if [ -n "$(man muttrc | grep sidebar)" ]; then
cat <<'EOF'
cat <<'EOF'
set sidebar_visible = yes
set sidebar_width = 24
set sidebar_sort = yes

View File

@ -16,17 +16,17 @@ umask 027
## to PATH, not prepend them.
appendpath()
{
[ $# -eq 2 ] && PATHVAR=$2 || PATHVAR=PATH
if [ -z "$(eval echo \$$PATHVAR | grep "\(:\|^\)$1\(:\|$\)")" ]; then
eval export $PATHVAR="\$$PATHVAR:$1"
fi
[ $# -eq 2 ] && PATHVAR=$2 || PATHVAR=PATH
if [ -z "$(eval echo \$$PATHVAR | grep "\(:\|^\)$1\(:\|$\)")" ]; then
eval export $PATHVAR="\$$PATHVAR:$1"
fi
}
prependpath()
{
[ $# -eq 2 ] && PATHVAR=$2 || PATHVAR=PATH
if [ -z "$(eval echo \$$PATHVAR | grep "\(:\|^\)$1\(:\|$\)")" ]; then
eval export $PATHVAR="$1:\$$PATHVAR"
fi
[ $# -eq 2 ] && PATHVAR=$2 || PATHVAR=PATH
if [ -z "$(eval echo \$$PATHVAR | grep "\(:\|^\)$1\(:\|$\)")" ]; then
eval export $PATHVAR="$1:\$$PATHVAR"
fi
}
appendpath "${HOME}/.launchers/"
@ -37,21 +37,21 @@ prependpath "${HOME}/.hackpool/"
## TeXlive
TEXDIR="${TEXDIR:-/usr/local/texlive}"
if [ -d "${TEXDIR}" ]; then
TEXYEAR=$(/bin/ls -1r "${TEXDIR}" | grep -m1 "[0-9]\{4\}")
TEXDISTRO=$(uname -m)-$(uname | tr "[[:upper:]]" "[[:lower:]]")
TEXFOLDER="${TEXDIR}/${TEXYEAR}/bin/${TEXDISTRO}/"
if [ -d "${TEXFOLDER}" ]; then
appendpath $TEXFOLDER
prependpath ${TEXDIR}/${TEXYEAR}/texmf/doc/info INFOPATH
TEXYEAR=$(/bin/ls -1r "${TEXDIR}" | grep -m1 "[0-9]\{4\}")
TEXDISTRO=$(uname -m)-$(uname | tr "[[:upper:]]" "[[:lower:]]")
TEXFOLDER="${TEXDIR}/${TEXYEAR}/bin/${TEXDISTRO}/"
if [ -d "${TEXFOLDER}" ]; then
appendpath $TEXFOLDER
prependpath ${TEXDIR}/${TEXYEAR}/texmf/doc/info INFOPATH
## BSD uses 'manpath' utility, so MANPATH variable may be empty.
if [ "$OSTYPE" = "linux-gnu" ]; then
prependpath ${TEXDIR}/${TEXYEAR}/texmf/doc/man MANPATH
fi
fi
unset TEXYEAR
unset TEXDISTRO
unset TEXFOLDER
## BSD uses 'manpath' utility, so MANPATH variable may be empty.
if [ "$OSTYPE" = "linux-gnu" ]; then
prependpath ${TEXDIR}/${TEXYEAR}/texmf/doc/man MANPATH
fi
fi
unset TEXYEAR
unset TEXDISTRO
unset TEXFOLDER
fi
unset TEXDIR
export BIBINPUTS=~/personal/dataperso/bibliography
@ -59,10 +59,10 @@ export BIBINPUTS=~/personal/dataperso/bibliography
## Plan9
PLAN9DIR="/opt/plan9"
if [ -d "$PLAN9DIR" ]; then
appendpath "$PLAN9DIR/bin"
if [ "$OSTYPE" = "linux-gnu" ]; then
appendpath "$PLAN9DIR/share/man" MANPATH
fi
appendpath "$PLAN9DIR/bin"
if [ "$OSTYPE" = "linux-gnu" ]; then
appendpath "$PLAN9DIR/share/man" MANPATH
fi
fi
unset PLAN9DIR
@ -87,22 +87,22 @@ export TIME_STYLE=+"|%Y-%m-%d %H:%M:%S|"
## System locale
if [ "$USER" = "peter" ]; then
LANG=sv_SE.UTF-8
LC_CTYPE="sv_SE.UTF-8"
LC_NUMERIC="sv_SE.UTF-8"
LC_TIME="sv_SE.UTF-8"
LC_COLLATE="sv_SE.UTF-8"
LC_MONETARY="sv_SE.UTF-8"
LC_MESSAGES=sv_SE.UTF-8
LC_PAPER="sv_SE.UTF-8"
LC_NAME="sv_SE.UTF-8"
LC_ADDRESS="sv_SE.UTF-8"
LC_TELEPHONE="sv_SE.UTF-8"
LC_MEASUREMENT="sv_SE.UTF-8"
LC_IDENTIFICATION="sv_SE.UTF-8"
LANG=sv_SE.UTF-8
LC_CTYPE="sv_SE.UTF-8"
LC_NUMERIC="sv_SE.UTF-8"
LC_TIME="sv_SE.UTF-8"
LC_COLLATE="sv_SE.UTF-8"
LC_MONETARY="sv_SE.UTF-8"
LC_MESSAGES=sv_SE.UTF-8
LC_PAPER="sv_SE.UTF-8"
LC_NAME="sv_SE.UTF-8"
LC_ADDRESS="sv_SE.UTF-8"
LC_TELEPHONE="sv_SE.UTF-8"
LC_MEASUREMENT="sv_SE.UTF-8"
LC_IDENTIFICATION="sv_SE.UTF-8"
# LC_ALL=
LC_ALL=sv_SE.UTF-8
# LC_ALL=
LC_ALL=sv_SE.UTF-8
fi
## Default text editor
@ -113,8 +113,8 @@ GIT_EDITOR="$EDITOR"
## 'em' is a script for emacsclient. See '.scripts/em'.
if command -v em >/dev/null 2>&1; then
EDITOR='em'
GIT_EDITOR='emc'
EDITOR='em'
GIT_EDITOR='emc'
fi
export EDITOR
@ -122,7 +122,7 @@ export GIT_EDITOR
## Internet Browser
for i in dwb luakit google-chrome; do
command -v $i >/dev/null 2>&1 && export BROWSER=$i && break
command -v $i >/dev/null 2>&1 && export BROWSER=$i && break
done
## SSH-Agent
@ -141,8 +141,8 @@ export WINEDLLOVERRIDES="mscoree,mshtml="
## Go
if [ -d "$HOME/.go" ]; then
export GOPATH=~/.go
appendpath "$GOPATH/bin"
export GOPATH=~/.go
appendpath "$GOPATH/bin"
fi
## Hook. Should be sourced last

View File

@ -1,20 +1,14 @@
#!/bin/sh
################################################################################
## XINITRC
################################################################################
## Source environment config.
[ -f ~/.xprofile ] && . ~/.xprofile
##==============================================================================
## Launch session
##==============================================================================
## Note: we do not 'exec' as we want to clean the session on exit.
if [ $# -eq 1 ] && command -v $1 >/dev/null 2>&1; then
$1
$1
else
awesome
awesome
fi
## TODO: This is not needed since all forked processes will be killed anyway

View File

@ -36,65 +36,65 @@
partial alphanumeric_keys xkb_symbols "usim" {
name[Group1]= "English international with dead keys extended";
name[Group1]= "English international with dead keys extended";
// Alphanumeric section
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
key <AE02> { [ 2, at, twosuperior, dead_doubleacute ] };
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
key <AE04> { [ 4, dollar, sterling, currency ] };
key <AE05> { [ 5, percent, EuroSign, cent ] };
key <AE06> { [ 6, asciicircum, yen, dead_circumflex ] };
key <AE07> { [ 7, ampersand, onehalf, onequarter ] };
key <AE08> { [ 8, asterisk, doublelowquotemark, threequarters ] };
key <AE09> { [ 9, parenleft, leftdoublequotemark, dead_breve ] };
key <AE10> { [ 0, parenright, rightdoublequotemark, division ] };
key <AE11> { [ minus, underscore, 0x10022C5, multiply ] };
key <AE12> { [ equal, plus, notequal, plusminus ] };
// Alphanumeric section
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
key <AE02> { [ 2, at, twosuperior, dead_doubleacute ] };
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
key <AE04> { [ 4, dollar, sterling, currency ] };
key <AE05> { [ 5, percent, EuroSign, cent ] };
key <AE06> { [ 6, asciicircum, yen, dead_circumflex ] };
key <AE07> { [ 7, ampersand, onehalf, onequarter ] };
key <AE08> { [ 8, asterisk, doublelowquotemark, threequarters ] };
key <AE09> { [ 9, parenleft, leftdoublequotemark, dead_breve ] };
key <AE10> { [ 0, parenright, rightdoublequotemark, division ] };
key <AE11> { [ minus, underscore, 0x10022C5, multiply ] };
key <AE12> { [ equal, plus, notequal, plusminus ] };
key <AD01> { [ q, Q, agrave, Agrave ] };
key <AD02> { [ w, W, egrave, Egrave ] };
key <AD03> { [ e, E, eacute, Eacute ] };
key <AD04> { [ r, R, registered, registered ] };
key <AD05> { [ t, T, copyright, trademark ] };
key <AD06> { [ y, Y, ugrave, Ugrave ] };
key <AD07> { [ u, U, uacute, Uacute ] };
key <AD08> { [ i, I, iacute, Iacute ] };
key <AD09> { [ o, O, oacute, Oacute ] };
key <AD10> { [ p, P, aring, Aring ] };
key <AD11> { [ bracketleft, braceleft, guillemotleft, leftsinglequotemark ] };
key <AD12> { [ bracketright, braceright, guillemotright, rightsinglequotemark ] };
key <AD01> { [ q, Q, agrave, Agrave ] };
key <AD02> { [ w, W, egrave, Egrave ] };
key <AD03> { [ e, E, eacute, Eacute ] };
key <AD04> { [ r, R, registered, registered ] };
key <AD05> { [ t, T, copyright, trademark ] };
key <AD06> { [ y, Y, ugrave, Ugrave ] };
key <AD07> { [ u, U, uacute, Uacute ] };
key <AD08> { [ i, I, iacute, Iacute ] };
key <AD09> { [ o, O, oacute, Oacute ] };
key <AD10> { [ p, P, aring, Aring ] };
key <AD11> { [ bracketleft, braceleft, guillemotleft, leftsinglequotemark ] };
key <AD12> { [ bracketright, braceright, guillemotright, rightsinglequotemark ] };
key <AC01> { [ a, A, aacute, Aacute ] };
key <AC02> { [ s, S, ssharp, section ] };
key <AC03> { [ d, D, acircumflex, Acircumflex ] };
key <AC04> { [ f, F, ecircumflex, Ecircumflex ] };
key <AC05> { [ g, G, icircumflex, Icircumflex ] };
key <AC06> { [ h, H, ocircumflex, Ocircumflex ] };
key <AC07> { [ j, J, ucircumflex, Ucircumflex ] };
key <AC08> { [ k, K, oe, OE ] };
key <AC09> { [ l, L, ae, AE ] };
key <AC10> { [ semicolon, colon, degree, dead_abovering ] };
key <AC11> { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
key <AC01> { [ a, A, aacute, Aacute ] };
key <AC02> { [ s, S, ssharp, section ] };
key <AC03> { [ d, D, acircumflex, Acircumflex ] };
key <AC04> { [ f, F, ecircumflex, Ecircumflex ] };
key <AC05> { [ g, G, icircumflex, Icircumflex ] };
key <AC06> { [ h, H, ocircumflex, Ocircumflex ] };
key <AC07> { [ j, J, ucircumflex, Ucircumflex ] };
key <AC08> { [ k, K, oe, OE ] };
key <AC09> { [ l, L, ae, AE ] };
key <AC10> { [ semicolon, colon, degree, dead_abovering ] };
key <AC11> { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
key <AB01> { [ z, Z, adiaeresis, Adiaeresis ] };
key <AB02> { [ x, X, ediaeresis, Ediaeresis ] };
key <AB03> { [ c, C, idiaeresis, Idiaeresis ] };
key <AB04> { [ v, V, odiaeresis, Odiaeresis ] };
key <AB05> { [ b, B, udiaeresis, Udiaeresis ] };
key <AB06> { [ n, N, ntilde, Ntilde ] };
key <AB07> { [ m, M, mu, mu ] };
key <AB08> { [ comma, less, ccedilla, Ccedilla ] };
key <AB09> { [ period, greater, 0x1002026, 0x1002026 ] };
key <AB10> { [ slash, question, paragraph, questiondown ] };
key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
key <AB01> { [ z, Z, adiaeresis, Adiaeresis ] };
key <AB02> { [ x, X, ediaeresis, Ediaeresis ] };
key <AB03> { [ c, C, idiaeresis, Idiaeresis ] };
key <AB04> { [ v, V, odiaeresis, Odiaeresis ] };
key <AB05> { [ b, B, udiaeresis, Udiaeresis ] };
key <AB06> { [ n, N, ntilde, Ntilde ] };
key <AB07> { [ m, M, mu, mu ] };
key <AB08> { [ comma, less, ccedilla, Ccedilla ] };
key <AB09> { [ period, greater, 0x1002026, 0x1002026 ] };
key <AB10> { [ slash, question, paragraph, questiondown ] };
key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
key <SPCE> { [ space, space, space, nobreakspace ] };
key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] };
key <SPCE> { [ space, space, space, nobreakspace ] };
key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] };
key <CAPS> { [ Control_L ] };
key <LCTL> { [ Caps_Lock ] };
key <CAPS> { [ Control_L ] };
key <LCTL> { [ Caps_Lock ] };
include "level3(ralt_switch)"
include "level3(ralt_switch)"
};

View File

@ -1,9 +1,9 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+usim+inet(evdev)" };
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+usim+inet(evdev)" };
// Geometry is completely optional.
// Geometry is completely optional.
// xkb_geometry { include "pc(pc104)" };
};

View File

@ -1,7 +1,4 @@
#!/bin/sh
################################################################################
## XPROFILE
################################################################################
## This file is sourced by some DM and should not contain any desktop execution.
## X config (for URxvt, etc.)
@ -14,11 +11,11 @@ numlockx on
xkbcomp -I"$HOME/.xkb" "$HOME/.xkb/usim.xkb" $DISPLAY
if [ "$OSTYPE" = "linux-gnu" ] ; then
## Set sound volume.
[ -n "$(amixer 2>/dev/null | grep PCM)" ] && amixer set PCM 80%
## Set sound volume.
[ -n "$(amixer 2>/dev/null | grep PCM)" ] && amixer set PCM 80%
## External device auto-mounting.
command -v udiskie >/dev/null 2>&1 && udiskie &
## External device auto-mounting.
command -v udiskie >/dev/null 2>&1 && udiskie &
fi
## This env variable is used by some programs (like ranger and awesome) to get

13
.zshrc
View File

@ -1,20 +1,17 @@
################################################################################
## Shell Config -- Master File
################################################################################
## Note that 'ps -o command= $$' gives the same result with parameters.
[ -z "$SHELL_CURRENT" ] && readonly SHELL_CURRENT="$(ps -o comm= $$)"
[ -z "$SHELL_DIR" ] && readonly SHELL_DIR="$HOME/.shell.d"
## .profile is sourced automatically by most login managers, but we need to
## source it manually to TTY.
## source it manually if in TTY.
[ -z "$DISPLAY" ] && [ -f "$HOME/.profile" ] && . "$HOME/.profile"
loadrc()
{
for i; do
[ -f "${SHELL_DIR}/$i" ] && . "${SHELL_DIR}/$i"
done
loadrc () {
for i; do
[ -f "${SHELL_DIR}/$i" ] && . "${SHELL_DIR}/$i"
done
}
## main and options should be sourced first.