From 7553d3a3fcf877457ea1c93d2d7ab1e3ba11487a Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Sun, 11 Nov 2018 11:21:25 +0100 Subject: [PATCH] clean, autolock, updated pkg, laptop --- clean/.local/bin/install_clean.sh | 4 ++++ config.h/dwm/config.h | 4 ++-- config.h/st/config.h | 2 +- pkgs.sh | 2 -- shell/.config/neofetch/config.conf | 6 +++--- x/.local/bin/bar | 6 +++--- x/.xinitrc | 14 ++++++++++++++ 7 files changed, 27 insertions(+), 11 deletions(-) create mode 100755 clean/.local/bin/install_clean.sh diff --git a/clean/.local/bin/install_clean.sh b/clean/.local/bin/install_clean.sh new file mode 100755 index 0000000..acf04f0 --- /dev/null +++ b/clean/.local/bin/install_clean.sh @@ -0,0 +1,4 @@ +#!/bin/sh +mv /opt/clean /opt/clean.bak +curl ftp://ftp.cs.ru.nl/pub/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz | tar -xz +mv clean-bundle-complete /opt/clean diff --git a/config.h/dwm/config.h b/config.h/dwm/config.h index 3ebd358..81e60a4 100644 --- a/config.h/dwm/config.h +++ b/config.h/dwm/config.h @@ -65,9 +65,9 @@ static const char *passmenu[] = { "/usr/share/doc/pass/examples/dmenu/passmenu" static const char *passmenu_type[] = { "/usr/share/doc/pass/examples/dmenu/passmenu", "--type", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *scr[] = { "scr", NULL }; static const char *scr_sel[] = { "scr", "selection", NULL }; -static const char *lock[] = { "slock", NULL }; +static const char *lock[] = { "xautolock", "-locknow", NULL }; static const char *brightup[] = { "xbacklight", "-inc", "5", NULL }; -static const char *brightdown[] = { "xbacklight", "-inc", "5", NULL }; +static const char *brightdown[] = { "xbacklight", "-dec", "5", NULL }; static const char *volume_mute[] = {"pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL}; static const char *volume_dec[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL}; static const char *volume_inc[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL}; diff --git a/config.h/st/config.h b/config.h/st/config.h index 260a441..d4306dc 100644 --- a/config.h/st/config.h +++ b/config.h/st/config.h @@ -176,7 +176,7 @@ static Shortcut shortcuts[] = { { TERMMOD, XK_V, clippaste, {.i = 0} }, { TERMMOD, XK_Y, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - { TERMMOD, XK_I, iso14755, {.i = 0} }, +// { TERMMOD, XK_I, iso14755, {.i = 0} }, }; /* diff --git a/pkgs.sh b/pkgs.sh index 4cee859..29086a6 100644 --- a/pkgs.sh +++ b/pkgs.sh @@ -6,13 +6,11 @@ sudo apt-get install \ firefox-esr \ git \ imagemagick\ - khal \ khard \ libnotify-bin \ man-db \ msmtp \ mutt \ - ncmpcpp \ notmuch \ notmuch-mutt \ offlineimap \ diff --git a/shell/.config/neofetch/config.conf b/shell/.config/neofetch/config.conf index ba7f79c..154fb07 100644 --- a/shell/.config/neofetch/config.conf +++ b/shell/.config/neofetch/config.conf @@ -26,7 +26,7 @@ print_info() { # info "GPU Driver" gpu_driver # Linux/macOS only # info "CPU Usage" cpu_usage info "Disk" disk -# info "Battery" battery + info "Battery" battery # info "Font" font # info "Song" song # info "Local IP" local_ip @@ -34,8 +34,8 @@ print_info() { # info "Users" users # info "Locale" locale # This only works on glibc systems. # - prin "Audio Interface" "Roland DUO-CAPTURE EX 24-bit DIGITAL" - prin "Speakers" "2x JBL Series 3 LSR305" +# prin "Audio Interface" "Roland DUO-CAPTURE EX 24-bit DIGITAL" +# prin "Speakers" "2x JBL Series 3 LSR305" info line_break info cols diff --git a/x/.local/bin/bar b/x/.local/bin/bar index 8655630..00da72e 100755 --- a/x/.local/bin/bar +++ b/x/.local/bin/bar @@ -13,12 +13,12 @@ if ip -br a | grep -q '^wlp'; then fi fi -eval $(xdotool search --onlyvisible trayer getwindowgeometry --shell) +#eval $(xdotool search --onlyvisible trayer getwindowgeometry --shell) echo \ "W $wlan"\ "♪ $(pactl list sinks | grep -Po "(?<=Volume: front)[^%]*" | grep -o "[0-9]\?[0-9][0-9]$") |"\ "⚡$bat"\ "Dsk: $(df -h | grep '/$' | awk '{print $4"/"$2}') |"\ - "$(date +"%Y-%m-%d %H:%M:%S") "\ - "$(printf "% $((WIDTH/20+1))s")" + "$(date +"%Y-%m-%d %H:%M:%S") " +# "$(printf "% $((WIDTH/20+1))s")" diff --git a/x/.xinitrc b/x/.xinitrc index 23df7c9..685a75a 100755 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -1,12 +1,23 @@ #!/bin/bash #To fix java applications in tiling (e.g. arduino) export _JAVA_AWT_WM_NONREPARENTING=1 + +# notifications dunst & + +# tray icons # trayer --align right --widthtype request --SetPartialStrut false --height 22 & +# gpg agent eval "$(gpg-agent --daemon)" + +# XResources xrdb -merge ~/.Xresources +# auto locking +xautolock -locker slock -time 10 & + +# Other system wide xinit files if [ -d /etc/X11/xinit/xinitrc.d ] ; then for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do [ -x "$f" ] && . "$f" @@ -14,5 +25,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi +# status bar while true; do xsetroot -name "$(bar)"; sleep 1m; done & + +# wm while true; do dwm 1>/tmp/dwm.log 2>&1; done -- 2.20.1