From 661dffd464e9a6836d212176d3029ffa6a45db23 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 3 May 2019 02:26:28 +0000 Subject: [PATCH] init a server branch --- Local-config.yoga2 | 5 -- Xresources | 18 ------ blog.bash | 18 ------ chrome | 6 -- cmus-stats.sh | 23 ------- dwm-start.sh | 13 ---- dwm.config.h | 156 --------------------------------------------- dwmstatus.sh | 117 ---------------------------------- hdmi-plug.sh | 11 ---- power.sh | 22 ------- redshift | 13 ---- termite.config | 47 -------------- twmn.conf | 31 --------- xinitrc | 43 ------------- xinitrc.old | 8 --- 15 files changed, 531 deletions(-) delete mode 100644 Local-config.yoga2 delete mode 100644 Xresources delete mode 100755 blog.bash delete mode 100755 chrome delete mode 100755 cmus-stats.sh delete mode 100755 dwm-start.sh delete mode 100644 dwm.config.h delete mode 100755 dwmstatus.sh delete mode 100755 hdmi-plug.sh delete mode 100755 power.sh delete mode 100644 redshift delete mode 100644 termite.config delete mode 100644 twmn.conf delete mode 100644 xinitrc delete mode 100644 xinitrc.old diff --git a/Local-config.yoga2 b/Local-config.yoga2 deleted file mode 100644 index b5700a8..0000000 --- a/Local-config.yoga2 +++ /dev/null @@ -1,5 +0,0 @@ -kernel cmdline altered in /boot/refind.conf -added: i915.enable_psr=0 to workaround intel drm bug(appeared with kernel 4.6) - -removed xf86-video-intel in attempt to fix above bug, system appears 'smoother' without -it, so leaving it out for now. diff --git a/Xresources b/Xresources deleted file mode 100644 index 3026585..0000000 --- a/Xresources +++ /dev/null @@ -1,18 +0,0 @@ -!Xft settings -Xft*dpi:192 -Xft*antialias: true -Xft*hinting: true -Xft*hintstyle: full -Xft*rgba: rgb - -!Xcursor -Xcursor.theme: Bluecurve -Xcursor.size: 42 - -!xterm -xterm*termName: xterm-256color -xterm*locale: true -xterm*savelines: 4096 -xterm*VT100.geometry: 80x32 -xterm*faceName: incosolata-10 -xterm*utf8: 1 diff --git a/blog.bash b/blog.bash deleted file mode 100755 index fc08d58..0000000 --- a/blog.bash +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -#script to make blogging easier - -#activate nikola -source ~/nikola/bin/activate - -#create a new post -cd ~/myblog -nikola new_post -e - -#build the new site -nikola build - -#deploy -rsync -av --delete output/ ewpt3ch.com:/srv/http/ewpt3ch.com/blog/ - -#deactivate nikola -deactivate diff --git a/chrome b/chrome deleted file mode 100755 index 1a5c6e3..0000000 --- a/chrome +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -<<<<<<< HEAD -exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache" -======= -exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache/chrome" ->>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898 diff --git a/cmus-stats.sh b/cmus-stats.sh deleted file mode 100755 index 9412f4a..0000000 --- a/cmus-stats.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -if [ -x /usr/bin/cmus-remote ] -then - status=`cmus-remote -Q | grep status | awk '{print $2}'` - if [ $status == "paused" ] - then -<<<<<<< HEAD - status="ç" -======= - status="→" ->>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898 - else - status="æ" - fi - duration=`cmus-remote -Q | grep duration | awk '{print $2}'` - position=`cmus-remote -Q | grep position | awk '{print $2}'` - ((timeleft = $duration - $position)) - ((timelefth = timeleft / 60)) - ((timeleftm = timeleft % 60)) - artist=`cmus-remote -Q | grep -w artist | cut -d ' ' -f3-` - song=`cmus-remote -Q | grep title | cut -d ' ' -f3-` - echo $artist'-'$song $status $timelefth':'$timeleftm -fi diff --git a/dwm-start.sh b/dwm-start.sh deleted file mode 100755 index 4308cf8..0000000 --- a/dwm-start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# Script to start dwm in loop - -while true; do - $HOME/bin/dwmstatus - sleep 2 -done & - -while true; do - dwm >/dev/null - # to log stderrors to a file - #dwm 2> /tmp/dwm.log -done diff --git a/dwm.config.h b/dwm.config.h deleted file mode 100644 index b9f4abb..0000000 --- a/dwm.config.h +++ /dev/null @@ -1,156 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -/*includes*/ -#include /*Needed for mulitmedia keys*/ - -/* appearance */ -static const char font[] = "Inconsolataicon-12"; - -<<<<<<< HEAD -#define NUMCOLORS 9 -======= -#define NUMCOLORS 9 ->>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898 -static const char colors[NUMCOLORS][ColLast][9] = { - // border foreground background - { "#212121", "#00FFFF", "#2F4F4F" }, // 0 = normal - { "#696969", "#ADFF2F", "#2F4F4F" }, // 1 = selected -<<<<<<< HEAD - { "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent - { "#212121", "#90EE90", "#778899" }, // 3 = important - { "#212121", "#FFFF00", "#2F4F4F" }, // 4 = yellow - { "#212121", "#00BFFF", "#2F4F4F" }, // 5 = blue - { "#212121", "#00FFFF", "#2F4F4F" }, // 6 = cyan - { "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta -======= - { "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent - { "#212121", "#90EE90", "#778899" }, // 3 = important - { "#212121", "#FFFF00", "#2F4F4F" }, // 4 = yellow - { "#212121", "#00BFFF", "#2F4F4F" }, // 5 = blue - { "#212121", "#00FFFF", "#2F4F4F" }, // 6 = cyan - { "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta ->>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898 - { "#212121", "#F5F5F5", "#2F4F4F" }, // 8 = grey - }; -static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const Bool showbar = True; /* False means no bar */ -static const Bool topbar = True; /* False means bottom bar */ - -/* tagging */ -static const char *tags[] = { "\u01A0", "\u01a5", "\u01A1 ", "\u01A2", "\u01A3 " }; - -static const Rule rules[] = { - /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 0, False, -1 }, -}; - -/* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const Bool resizehints = True; /* True means respect size hints in tiled resizals */ - -static const Layout layouts[] = { - /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ - { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, -}; - -/* key definitions */ -#define MODKEY Mod1Mask -#define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, - -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - -/* commands */ -<<<<<<< HEAD -static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL }; -======= -static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL }; ->>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898 -static const char *termcmd[] = { "termite", NULL }; -/*functions for volume control*/ -static const char *upvol[] = { "volumeset", "up", NULL }; -static const char *downvol[] = { "volumeset", "down", NULL }; -static const char *mute[] = { "volumeset", "mute", NULL }; -/*cmus functions*/ -static const char *cmusplaypause[] = { "cmus-remote", "-u", NULL}; -static const char *cmusnext[] = { "cmus-remote", "--next", NULL}; -static const char *cmusprev[] = { "cmus-remote", "--prev", NULL}; -/*screenshot*/ -static const char *screenshot[] = { "scrot", NULL}; -/*multi-head*/ -static const char *multihead[] = { "hdmi-plug.sh", NULL}; - -static Key keys[] = { - /* modifier key function argument */ - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol} }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol} }, - { 0, XF86XK_AudioMute, spawn, {.v = mute } }, -<<<<<<< HEAD - { MODKEY, XK_u, spawn, {.v = cmusplaypause} }, - { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, - { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, -======= - { 0, XF86XK_AudioPlay, spawn, {.v = cmusplaypause} }, - { 0, XF86XK_AudioPause, spawn, {.v = cmusplaypause} }, - { MODKEY, XK_u, spawn, {.v = cmusplaypause} }, - { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, - { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, - { MODKEY|ControlMask, XK_s, spawn, {.v = screenshot} }, - { MODKEY|ControlMask, XK_m, spawn, {.v = multihead} }, ->>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898 - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - { MODKEY|ShiftMask, XK_q, quit, {0} }, -}; - -/* button definitions */ -/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static Button buttons[] = { - /* click event mask button function argument */ - { ClkLtSymbol, 0, Button1, setlayout, {0} }, - { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, - { ClkClientWin, MODKEY, Button1, movemouse, {0} }, - { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, - { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, - { ClkTagBar, 0, Button1, toggleview, {0} }, - { ClkTagBar, 0, Button3, view, {0} }, - { ClkTagBar, MODKEY, Button1, tag, {0} }, - { ClkTagBar, MODKEY, Button3, toggletag, {0} }, -}; - diff --git a/dwmstatus.sh b/dwmstatus.sh deleted file mode 100755 index 710642d..0000000 --- a/dwmstatus.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash -# status script for dwm -# influenced by: -# https://bitbucket.org/jasonwryan/shiv/Scripts/dwm-status -# https://github.com/w0ng/bin/blob/master/dwm-statusbar -######################## -## eric@ewpt3ch.com #### -## dwmstatus ########### -######################## - -# colors from dwm.config.h -color_normal="\x01" #normal -color_selected="\x02" #selected -color_urgent="\x03" #urgent -color_important="\x04" #important -color_yellow="\x05" #yellow -color_blue="\x06" #blue -color_cyan="\x07" #cyan -color_magenta="\x08" #magenta -color_grey="\x09" #grey - -# Icon glyphs from Inconsolataicon -glyph_cpu="\u01B0" -glyph_mem="\u01B1" -glyph_dl="\u01A5" -glyph_pow="\u01B2" -glyph_clk="\u01Af" -glyph_bln="\u01AA" -glyph_msc="\u01AB" -glyph_vol="\u01AC" -glyph_mute="\u01B4" -glyph_mail="\u01AD" -glyph_wifi="\u01AE" -glyph_plug="\u01A4" - -# Song info -msc(){ - if [ -x /usr/bin/cmus-remote ] - then - artist=`cmus-remote -Q | grep -w artist | cut -d ' ' -f3-` - song=`cmus-remote -Q | grep title | cut -d ' ' -f3-` - song_info=${artist}-${song} - fi - - echo -ne "${color_selected}${glyph_msc} ${song_info}${color_normal}" -} - -#Date -dte(){ - datetime="$(date "+%F %T")" - echo -ne "${color_selected}${glyph_clk} ${datetime}${color_normal}" -} - -#Power and Battery -bat(){ - on1="$( /dev/null && - echo -ne "${glyph_wifi}" || echo -ne "${color_important}${glyph_wifi}${color_normal}" -} - -# Pipe to statusbar -xsetroot -name "$(msc) $(vol) $(load) $(mem) $(int) $(bat) $(dte) " diff --git a/hdmi-plug.sh b/hdmi-plug.sh deleted file mode 100755 index 5dd7d3a..0000000 --- a/hdmi-plug.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -status=$(cat /sys/class/drm/card0-HDMI-A-1/status) - -if [ $status = 'connected' ]; then - xrandr --output eDP-1 --auto --output HDMI-1 --auto --scale 2x2 --right-of eDP-1 - twmnc -t 'display' -c 'HDMI plugged' -else - xrandr --output HDMI-1 --off - twmnc -t 'display' -c 'HDMI unplugged' -fi diff --git a/power.sh b/power.sh deleted file mode 100755 index 2fee9cf..0000000 --- a/power.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -if `acpi -a | grep -q on` -then - echo "Â" -else - bat=`acpi -b | awk '{print $4}'` - bat="${bat%%%*}" #remove percent - if [[ $bat -gt 75 ]] - then - echo "ó" - elif [[ $bat -gt 25 ]] - then - if [[ $bat -gt 45 ]] - then - echo "ò" - else - echo "ò" $bat"%" - fi - else - echo "ñ" $bat"%" - fi -fi diff --git a/redshift b/redshift deleted file mode 100644 index 72384de..0000000 --- a/redshift +++ /dev/null @@ -1,13 +0,0 @@ -;Global Settings -[redshift] -temp-day=6300 -temp-night=4000 -transition=1 -location-provider=manual - - -[manual] -;denver -lat=39.898700 -lon=-105.040452 - diff --git a/termite.config b/termite.config deleted file mode 100644 index f2f5ef7..0000000 --- a/termite.config +++ /dev/null @@ -1,47 +0,0 @@ -#Customizations -[options] -font = Inconsolata 12 -urgent_on_bell = true - -# Solarized dark color scheme - -[colors] - -# special -foreground = #93a1a1 -foreground_bold = #93a1a1 -cursor = #93a1a1 -background = #002b36 - -# black -color0 = #002b36 -color8 = #657b83 - -# red -color1 = #dc322f -color9 = #dc322f - -# green -color2 = #859900 -color10 = #859900 - -# yellow -color3 = #b58900 -color11 = #b58900 - -# blue -color4 = #268bd2 -color12 = #268bd2 - -# magenta -color5 = #6c71c4 -color13 = #6c71c4 - -# cyan -color6 = #2aa198 -color14 = #2aa198 - -# white -color7 = #93a1a1 -color15 = #fdf6e3 - diff --git a/twmn.conf b/twmn.conf deleted file mode 100644 index 58569e8..0000000 --- a/twmn.conf +++ /dev/null @@ -1,31 +0,0 @@ -[gui] -absolute_position= -always_on_top=true -background_color=#4B0082 -bounce=true -bounce_duration=500 -font=Inconsolataicon -font_size=50 -font_variant=medium -foreground_color=#7FF000 -height=55 -in_animation=38 -in_animation_duration=1000 -opacity=100 -out_animation=13 -out_animation_duration=1000 -position=top_right -screen= - -[icons] -critical_icon= -info_icon= -warning_icon= - -[main] -activate_command= -duration=3000 -enable_shortcuts=true -host=127.0.0.1 -port=9797 -sound_command= diff --git a/xinitrc b/xinitrc deleted file mode 100644 index fff5ad1..0000000 --- a/xinitrc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - - xrdb -merge $sysresources - -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - - xrdb -merge "$userresources" - -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -redshift & -unclutter -noevents & -setxkbmap -layout us -option ctrl:nocaps & -twmnd & -exec $HOME/bin/dwm-start diff --git a/xinitrc.old b/xinitrc.old deleted file mode 100644 index 54cb151..0000000 --- a/xinitrc.old +++ /dev/null @@ -1,8 +0,0 @@ -[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources -tresorit --hidden & -redshift & -start-pulseaudio-x11 & -google-musicmanager & -unclutter -noevents & -setxkbmap -layout us -option ctrl:nocaps & -exec dbus-launch --exit-with-session --sh-syntax $HOME/bin/dwm-start