diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 4657ceee..15b308e5 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -343,22 +343,9 @@ globalkeys = awful.util.table.join( -- Screenshot awful.key({}, "Print", function () awful.util.spawn("scrot 'screen-%Y-%m-%d-%H%M%S.png' -e 'mkdir -p ~/temp && mv $f ~/temp/'") end), - -- Sound Volume - awful.key({ modkey, }, "KP_Subtract", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), - awful.key({ modkey, }, "KP_Add", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), - awful.key({ modkey, }, "KP_Enter", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), - awful.key({ modkey, "Mod1" }, "KP_Subtract", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end), - awful.key({ modkey, "Mod1" }, "KP_Add", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), - - awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), - awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), - awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), - awful.key({ "Mod1" }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), - awful.key({ "Mod1" }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end), - -- Touchpad awful.key({ }, "XF86TouchpadToggle", function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end), - awful.key({ }, "XF86Tools", function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end), + awful.key({ }, "XF86Tools", function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end), -- Mouse control -- Bind ''Meta4+Ctrl+m'' to move the mouse to the coordinates set above. @@ -440,7 +427,39 @@ globalkeys = awful.util.table.join( awful.util.eval, nil, awful.util.getdir("cache") .. "/history_eval") end) - ) +) + + -- Sound Volume +if ostype == "Linux" then + globalkeys = awful.util.table.join( + awful.key({ modkey, }, "KP_Subtract", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), + awful.key({ modkey, }, "KP_Add", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), + awful.key({ modkey, }, "KP_Enter", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), + awful.key({ modkey, "Mod1" }, "KP_Subtract", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end), + awful.key({ modkey, "Mod1" }, "KP_Add", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), + + awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), + awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), + awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), + awful.key({ "Mod1" }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), + awful.key({ "Mod1" }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end) + ) +elseif ostype == "FreeBSD" then + globalkeys = awful.util.table.join( + awful.key({ modkey, }, "KP_Subtract", function () awful.util.spawn("mixer vol -5 >/dev/null") end), + awful.key({ modkey, }, "KP_Add", function () awful.util.spawn("mixer vol +5 >/dev/null") end), + awful.key({ modkey, }, "KP_Enter", function () awful.util.spawn("mixer vol ^ >/dev/null") end), + awful.key({ modkey, "Mod1" }, "KP_Subtract", function () awful.util.spawn("mixer pcm -5 >/dev/null") end), + awful.key({ modkey, "Mod1" }, "KP_Add", function () awful.util.spawn("mixer pcm +5 >/dev/null") end), + + awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("mixer vol -5 >/dev/null") end), + awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("mixer vol +5 >/dev/null") end), + awful.key({ }, "XF86AudioMute", function () awful.util.spawn("mixer vol ^ >/dev/null") end), + awful.key({ "Mod1" }, "XF86AudioRaiseVolume", function () awful.util.spawn("mixer pcm -5 >/dev/null") end), + awful.key({ "Mod1" }, "XF86AudioLowerVolume", function () awful.util.spawn("mixer pcm +5 >/dev/null") end) + ) +end + -- Client keys clientkeys = awful.util.table.join( diff --git a/.pkg-texlive b/.pkg-texlive deleted file mode 100644 index 15cbafd1..00000000 --- a/.pkg-texlive +++ /dev/null @@ -1,36 +0,0 @@ -amscls -amsfonts -amsmath -beamer -bigfoot -collection-latex -colortbl -easylist -ec -enctex -eso-pic -etoolbox -eukdate -eurosym -fancyhdr -fix2col -geometry -glyphlist -graphics -hyperref -lipsum -listings -lm -marvosym -mdwtools -microtype -moderncv -needspace -oberdiek -pgf -url -was -wrapfig -xargs -xcolor -zapfding \ No newline at end of file diff --git a/.pkg-texlive-FreeBSD-edf23ads b/.pkg-texlive-FreeBSD-edf23ads index 666cb958..9c7a6510 100644 --- a/.pkg-texlive-FreeBSD-edf23ads +++ b/.pkg-texlive-FreeBSD-edf23ads @@ -1,57 +1,6 @@ - - amsfonts - bibtex - bibtex.amd64-freebsd - cm - collection-basic - collection-documentation-base - dvipdfm - dvipdfm.amd64-freebsd - dvipdfmx - dvipdfmx-def - dvipdfmx.amd64-freebsd - dvips - dvips.amd64-freebsd - enctex - etex - etex-pkg - glyphlist - gsftopk - gsftopk.amd64-freebsd - hyph-utf8 - hyphen-base - ifluatex - ifxetex - kpathsea - kpathsea.amd64-freebsd - lua-alt-getopt - luatex - luatex.amd64-freebsd - makeindex - makeindex.amd64-freebsd - metafont - metafont.amd64-freebsd - mflogo - mfware - mfware.amd64-freebsd - misc - pdftex - pdftex.amd64-freebsd - plain - scheme-minimal - tetex - tetex.amd64-freebsd - tex - tex.amd64-freebsd - texconfig - texconfig.amd64-freebsd - texlive-common - texlive-docindex - texlive-en - texlive-msg-translations - texlive-scripts - texlive-scripts.amd64-freebsd - texlive.infra - texlive.infra.amd64-freebsd - xdvi - xdvi.amd64-freebsd +collection-basic +marvosym +scheme-minimal +texlive-common +texlive-docindex +texlive-en diff --git a/.save b/.save index 82723a26..f1b53ff8 100755 --- a/.save +++ b/.save @@ -29,7 +29,7 @@ SCRIPTPATH="$(readlink -f $(dirname "$0"))" COMPRESSION="gz" ARCHIVENAME="$HOME/home-config-$(date "+%y-%m-%d-%H%M%S")" ARCEXT="tar.gz" -ARCOPT="cvzf" +ARCOPT="czf" print_help() { @@ -77,15 +77,15 @@ shift $(($OPTIND - 1)) case $COMPRESSION in "gz") ARCEXT="tar.gz" - ARCOPT="cvzf" + ARCOPT="czf" ;; "xz") ARCEXT="tar.xz" - ARCOPT="cvJf" + ARCOPT="cJf" ;; *) ARCEXT="tar.gz" - ARCOPT="cvzf" + ARCOPT="czf" ;; esac @@ -134,10 +134,15 @@ fi if type tlmgr >/dev/null 2>&1; then HOST=$(hostname) - TEXLIVE_BASIC="$(tlmgr info collection-basic --list | sed -n '/^\s\+/{s/\s\+//g;p;}' | sort)" - TEXLIVE_ALL="$(tlmgr info --only-installed | grep -v 'x86_64' | cut -d' ' -f2 | cut -f1 -d':' | sort)" + # TEXLIVE_BASIC="$(tlmgr info collection-basic --list | sed -n '/^\s\+/{s/\s\+//g;p;}' | sort)" + TEXLIVE_BASIC="$(tlmgr info collection-basic --list | sed -n '/^ /{s/ //g;p;}' | sort)" + TEXLIVE_ALL="$(tlmgr info --only-installed | grep -v 'x86_64\|amd64' | cut -d' ' -f2 | cut -f1 -d':' | sort)" - comm -3 <(echo "$TEXLIVE_BASIC") <(echo "$TEXLIVE_ALL") | sed 's/\s\+//g' >"$HOME/.pkg-texlive-$(uname)-${HOST}" + echo $TEXLIVE_BASIC + echo + echo $TEXLIVE_ALL + + comm -3 <(echo "$TEXLIVE_BASIC") <(echo "$TEXLIVE_ALL") | sed 's/ //g' >"$HOME/.pkg-texlive-$(uname)-${HOST}" fi ##============================================================================== @@ -238,11 +243,13 @@ FILELIST=(${FILELIST[*]} ".Xresources") ## Archiving ##============================================================================== -if [ "$DEBUG" = "yes" ]; then - tar ${ARCOPT} "${ARCHIVENAME}.${ARCEXT}" -C "$HOME" ${FILELIST[*]} -C "$SCRIPTPATH" "$(basename "$0")" -else - tar ${ARCOPT} "${ARCHIVENAME}.${ARCEXT}" -C "$HOME" ${FILELIST[*]} -C "$SCRIPTPATH" "$(basename "$0")" >/dev/null -fi +tar ${ARCOPT} "${ARCHIVENAME}.${ARCEXT}" -C "$HOME" ${FILELIST[*]} -C "$SCRIPTPATH" "$(basename "$0")" + +# if [ "$DEBUG" = "yes" ]; then +# tar ${ARCOPT} "${ARCHIVENAME}.${ARCEXT}" -C "$HOME" ${FILELIST[*]} -C "$SCRIPTPATH" "$(basename "$0")" +# else +# tar ${ARCOPT} "${ARCHIVENAME}.${ARCEXT}" -C "$HOME" ${FILELIST[*]} -C "$SCRIPTPATH" "$(basename "$0")" >/dev/null +# fi ##============================================================================== ## Cleaning diff --git a/.shell.d/alias_freebsd b/.shell.d/alias_freebsd index a6642fad..4185f6d0 100644 --- a/.shell.d/alias_freebsd +++ b/.shell.d/alias_freebsd @@ -1,7 +1,8 @@ ## -*- mode:sh -*- # alias pa='sudo pkg_add -r' -alias pd='sudo pkg_delete' +# alias pd='sudo pkg_delete' +alias pd='sudo pkg_deinstall -cd' alias pi='pkg_info -RrcdsD -l "::"' alias pil='pkg_info -L' @@ -17,5 +18,6 @@ alias psr='pkg_search -r' alias pv='pkg_version -Il "<"' ## Port tree +alias mi='sudo make install' alias mid='sudo make install distclean' alias mc='sudo make config' diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc index bf68a76b..b8f0753a 100644 --- a/.shell.d/alias_rc +++ b/.shell.d/alias_rc @@ -134,7 +134,7 @@ alias xmorphzi='xrandr --output $(xrandr | grep "\" | cut -f1 -d" ") ## TeXlive if [ -d "/usr/local/texlive" ]; then - alias tlu="sudo bash -c 'umask 022 && tlmgr update --self'" + alias tlu="sudo sh -c 'umask 022 && tlmgr update --self'" alias tls="tlmgr search --global" alias tll="tlmgr show --list" fi diff --git a/.shell.d/funs_rc b/.shell.d/funs_rc index c9238fa7..62739c52 100644 --- a/.shell.d/funs_rc +++ b/.shell.d/funs_rc @@ -891,14 +891,14 @@ if [ -d "/usr/local/texlive" ]; then tli () { for i ; do - sudo bash -c 'umask 022 && tlmgr install "$0"' "$i" + sudo sh -c 'umask 022 && tlmgr install "$0"' "$i" done } tlr () { for i ; do - sudo bash -c 'umask 022 && tlmgr remove "$0"' "$i" + sudo sh -c 'umask 022 && tlmgr remove "$0"' "$i" done }