Skip to content

Commit

Permalink
panel corner cases, ttrss theme enhancement, dmenu headings, arm build
Browse files Browse the repository at this point in the history
  • Loading branch information
sdothum committed Jan 10, 2017
1 parent 4fa0003 commit 0e98db7
Show file tree
Hide file tree
Showing 27 changed files with 341 additions and 119 deletions.
2 changes: 1 addition & 1 deletion X11/.Xresources
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ URxvt*saveLines: 9000 ! non-tmux window scroll back
! text
! URxvt*font: xft:Input Mono Compressed:size=10
! URxvt*font: xft:PragmataPro:size=10
URxvt*font: xft:Iosevka Term:size=10
URxvt*font: xft:Iosevka:size=10
! URxvt*letterSpace: -1 ! xft adjustment (for vanilla urxvt)
! URxvt*linespace: 0 ! pixels between lines for added readability
URxvt*internalBorder: 10 ! pixels from frame edge
Expand Down
12 changes: 0 additions & 12 deletions alot/.config/alot/hooks.py

This file was deleted.

8 changes: 4 additions & 4 deletions bin/bin/dmenu
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ else
padsize $width 11 1
fi

hlwm && monitor=$(herbstclient list_monitors | grep '\[FOCUS\]' | cut -d: -f1) ||
monitor=0
hlwm && display=$(herbstclient list_monitors | grep '\[FOCUS\]' | cut -d: -f1) ||
display=0

# ............................................................... Available apps

Expand Down Expand Up @@ -151,7 +151,7 @@ dmenu() {
# piped input precludes single eval usage to contruct select clause
if [ $row ] ;then
input=$(sed "s/^/$INDENT/" |
rofi -monitor $monitor \
rofi -monitor $display \
-bw 0 \
-font "$MONOFONT $fontsize" \
-eh 1 \
Expand All @@ -174,7 +174,7 @@ dmenu() {
)
else
input=$(sed "s/^/$INDENT/" |
rofi -monitor $monitor \
rofi -monitor $display \
-bw 0 \
-font "$MONOFONT $fontsize" \
-eh 1 \
Expand Down
35 changes: 35 additions & 0 deletions bin/bin/functions/dmenu/diagnostic
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# sdothum - 2016 (c) wtfpl

# X11 Dynamic Menu
# ▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂

# ............................................................ System diagnostic

# list of potential system tools, verified by dmenu apps
diagnostics="glances \
htop \
iftop \
iotop \
mtr \
nethogs \
xrestop \
"

interface() {
ip link show | grep '^[0-9]' | cut -d: -f2 | dmenu 'Interface' -no-custom || exit
}

diagnostic=$(previous diagnostic)
while diagnostic=$(apps "$diagnostics" | dmenu 'Diagnostic' $diagnostic -no-custom) || exit
do
history diagnostic $diagnostic
case $diagnostic in
iftop ) term "$diagnostic" $diagnostic $(interface) ;;
iotop ) term "$diagnostic" SHELL $diagnostic ;;
nethogs) term "$diagnostic" sudo $diagnostic $(interface) ;;
* ) term "$diagnostic" $diagnostic ;;
esac
exit
done

# vim: set ft=sh: #
23 changes: 0 additions & 23 deletions bin/bin/functions/dmenu/monitor

This file was deleted.

38 changes: 13 additions & 25 deletions bin/bin/functions/dmenu/system
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,19 @@

# ............................................................... System monitor

# list of potential system tools, verified by dmenu apps
monitors="glances \
htop \
iftop \
iotop \
mtr \
nethogs \
xrestop \
"
# meta dmenu menu!
system=$(previous system)
system=$(echo "journal ^$SEP inspect\njournal ^$SEP watch\nlog ^$SEP inspect\nlog ^$SEP watch\nsystem ^$SEP diagnostic" |
column -s^ -t |
dmenu 'System' "$system" -no-custom) || exit

interface() {
ip link show | grep '^[0-9]' | cut -d: -f2 | dmenu 'Interface' -no-custom || exit
}

monitor=$(previous system)
while monitor=$(apps "$monitors" | dmenu 'Monitor' $monitor -no-custom) || exit
do
history system $monitor
case $monitor in
iftop ) term "$monitor" $monitor $(interface) ;;
iotop ) term "$monitor" SHELL $monitor ;;
nethogs) term "$monitor" sudo $monitor $(interface) ;;
* ) term "$monitor" $monitor ;;
esac
exit
done
history system "$system"
case $system in
journal*inspect ) command dmenu journals ;;
journal*watch ) command dmenu journals watch ;;
log*inspect ) command dmenu logs ;;
log*watch ) command dmenu logs watch ;;
system*diagnostic) command dmenu diagnostic ;;
esac

# vim: set ft=sh: #
2 changes: 1 addition & 1 deletion bin/bin/functions/file/swap
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if ([ -e $target ] && [ -e $destination ]) || ([ -d $target ] && [ -d $destinati
mv $target $hold
mv $destination $target
mv $hold $destination
ditto "$destination -> <- $target"
ditto "$destination -> $target -> $destination"
fi

# vim: set ft=sh: #
9 changes: 5 additions & 4 deletions bin/bin/functions/termfont
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@

# .................................................................... Term font

# adjust font for various displays and video cards on this system
# see urxvt wrapper

# adjust font for various displays and video cards on this system
if macbook ;then
# test arm first to avoid spurious lspci messages
if arm ;then
size=9
elif macbook ;then
size=9
elif nvidia ;then
is display +1680 && size=10 || size=9
elif arm ;then
size=9
elif laptop ;then
size=9
else
Expand Down
2 changes: 1 addition & 1 deletion bin/bin/x
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if console ;then

herbstluftwm) pkill -KILL -f 'herbst'
killall -KILL weechat 2>/dev/null
rm -rf /tmp/herbst* ;;
[ -e $HOME/.debug ] || rm -rf /tmp/herbst* ;;

gnome ) ;;
i3 ) ;;
Expand Down
4 changes: 2 additions & 2 deletions build/build/archlinux/bundle/110-networking
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
= proxies
# ▔▔▔▔▔▔▔
# adsuck
# polipo
# privoxy
# polipo [server]
# privoxy [server]
# squid


Expand Down
26 changes: 17 additions & 9 deletions build/build/archlinux/bundle/200-desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,22 @@
# xflux


= desktop
# ▔▔▔▔▔▔▔
# conky-lua
conky-lua-archers [laptop]
conky-lua-nv [! laptop]
# lemonbar-git
lemonbar-xft-git


= desktop utilities
# ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
autokey-gtk
# autokey-py3
# clipit
# colorgrab
colors-git
# conky-lua
conky-lua-archers [laptop]
conky-lua-nv [! laptop]
# "stest contained in dmenu package"
dmenu
# dmenu-xft-height
Expand Down Expand Up @@ -84,16 +90,16 @@
# 2bwm
# budgie-desktop-git
# herbstluftwm
# lemonbar-git
lemonbar-xft-git
# libwm-git
# openbox
# wmutils-git


= window properties
# ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
# libwm-git
# sprop-git
sutils-git
# sxhkd
# sxhkd-git
# wmname
# wmutils-git
# xdo-git
xtitle-git
# xwinfo-git
Expand All @@ -104,6 +110,8 @@
# bspwm
# bspwm-git
# lua-posix
# sxhkd
# sxhkd-git


= gnome
Expand Down
2 changes: 2 additions & 0 deletions build/build/archlinux/bundle/600-applications
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
# ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
gcstar
# kodi [server]
# minidlna [server]
# plex-media-server-plexpass [server]
# plex-media-server [server]
# xbmc
Expand Down Expand Up @@ -151,6 +152,7 @@
mpv
# smplayer
# smplayer-themes
# totem
# umplayer
# vlc
# xvba-video [server]
Expand Down
22 changes: 20 additions & 2 deletions build/build/archlinux/bundle/pi-bundle
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,19 @@ g term-ansicolor
syncthing-inotify


= appearance
# ▔▔▔▔▔▔▔▔▔▔
compton
? setroot
? unclutter-xfixes-git


= desktop
# ▔▔▔▔▔▔▔
" add armv7h to arch in pkgbuild
? lemonbar-xft-git


= desktop utilities
# ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
# "stest contained in dmenu package"
Expand All @@ -194,12 +207,17 @@ g term-ansicolor
# paper-icon-theme-git


= window properties
# ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
" add armv7h to arch in pkgbuild
? sutils-git
? xtitle-git


= x11
# ▔▔▔
autocutsel
" add armv7h to arch in pkgbuild
? setroot
? unclutter-xfixes-git
xdotool
xf86-input-keyboard
xf86-input-mouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -665,12 +665,12 @@ void persistant_default_layer_set(uint16_t default_layer)
void clear_layers()
{
layer_off (_COLEMAK);
#ifdef QWERTY
#ifdef QWERTY
layer_off (_QWERTY);
#endif
#ifdef DVORAK
#endif
#ifdef DVORAK
layer_off (_DVORAK);
#endif
#endif
layer_off (_PLOVER);
layer_off (_NUMBER);
layer_off (_NUMSYM);
Expand Down
Loading

0 comments on commit 0e98db7

Please sign in to comment.