2 Commits

Author SHA1 Message Date
ewpt3ch b30bdd1cf7 Merge branch 'master' of ssh://gitea.ewpt3ch.dev:25213/ewpt3ch/dotfiles-old 2019-05-19 04:38:09 -06:00
ewpt3ch 4362914cce merged repo marker 2019-05-19 04:13:58 -06:00
23 changed files with 350 additions and 238 deletions
-7
View File
@@ -6,10 +6,3 @@ currently the repo is .dotfiles in ~ with symlinks from the default file to it's
#### naming conventions
Kernels: kernel.*machine-name* ie kernel.yoga2
<<<<<<< HEAD
=======
#### Local config
Notes on local configuration stuff are in Local-config.*machine-name* ir Local-config.yoga2
Things included kernel cmdline, Xorg config, other customizations for working around bugs
or hardware issues.
>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898
+73
View File
@@ -0,0 +1,73 @@
!Xft settings
Xft*dpi: 96
Xft*antialias: true
Xft*hinting: true
Xft*hintstyle: full
Xft*rgba: rgb
!Xcursor
Xcursor.theme: gentoo-blue
Xcursor.size: 22
!xterm
xterm*termName: xterm-256color
xterm*locale: true
xterm*savelines: 4096
xterm*VT100.geometry: 80x32
xterm*faceName: incosolata-10
xterm*utf8: 1
#define S_base03 #002b36
#define S_base02 #073642
#define S_base01 #586e75
#define S_base00 #657b83
#define S_base0 #839496
#define S_base1 #93a1a1
#define S_base2 #eee8d5
#define S_base3 #fdf6e3
#define S_yellow #b58900
#define S_orange #cb4b16
#define S_red #dc322f
#define S_magenta #d33682
#define S_violet #6c71c4
#define S_blue #268bd2
#define S_cyan #2aa198
#define S_green #859900
*background: S_base03
*foreground: S_base00
*cursorColor: S_base1
*pointerColorBackground:S_base01
*pointerColorForeground:S_base1
!! black dark/light
*color0: S_base02
*color8: S_base03
!! red dark/light
*color1: S_red
*color9: S_orange
!! green dark/light
*color2: S_green
*color10: S_base01
!! yellow dark/light
*color3: S_yellow
*color11: S_base00
!! blue dark/light
*color4: S_blue
*color12: S_base0
!! magenta dark/light
*color5: S_magenta
*color13: S_violet
!! cyan dark/light
*color6: S_cyan
*color14: S_base1
!! white dark/light
*color7: S_base2
*color15: S_base3
-6
View File
@@ -1,6 +0,0 @@
#!/bin/bash
alias pacman='sudo pacman'
alias pacupg='pacman -Syu'
alias pacins='pacman -U'
alias pacdiff='sudo pacdiff'
-22
View File
@@ -1,22 +0,0 @@
#!/bin/bash
#script to update packages installed from aur
#uses cower -ud and makepkg -i
#written because meat stopped working
#path variables
AURBUILD=/tmp/makepkg
#create necessary dirs if not exist
mkdir -p ${AURBUILD}
cower --update --download --target=${AURBUILD}
cd ${AURBUILD}
for dir in ${AURBUILD}/*
do
cd ${dir}
twmnc -t "aur-build" -c "building ${dir}" -d 5000
makepkg --install
cd ${AURBUILD}
rm -r ${dir}
done
+25 -23
View File
@@ -12,34 +12,36 @@ if [[ $- != *i* ]] ; then
return
fi
#Shell Variables
export GOPATH="/home/ewpt3ch/go"
PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${GOPATH}/bin:${PATH}:./:"
export EDITOR=nvim
export PAGER=less
#Create dirs for things that won't themselves
mkdir -p /tmp/makepkg
# Put your fun stuff here.
#source /etc/profile.d/bash-completion.sh
#source ~/bin/npm_completion
#bring in aliases for arch
source ~/.dotfiles/archalias.bash
#alias
alias vim='nvim'
source ~/todo.txt-cli/todo_completion
#pacman aliases
alias pacman='sudo pacman'
alias pacupg='pacman -Syu'
alias pacins='pacman -U'
#
alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg'
alias nano='nano -w'
alias ls='ls --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
complete -F _todo t
PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:"
export VMWARE_USE_SHIPPED_GTK="yes"
export EDITOR=vim
export PAGER=less
export LIBVA_DRIVER_NAME=vdpau
#create cache-dir for chrome
mkdir -p /tmp/ewpt3ch-cache
eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519)
#export NVM_DIR="/home/ewpt3ch/.nvm"
#[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
#[[ -r $NVM_DIR/bash_completion ]] && . $NVM_DIR/bash_completion
# Only load Liquid Prompt in interactive shells, not from a script or from scp
[[ $- = *i* ]] && source ~/liquidprompt/liquidprompt
exec fish
eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa)
#Check if dropbox is running
if dropbox.py running ; then
#start dropbox
~/bin/dropbox.py start
fi
#check if btsync running and start
#if ! ps -A | grep -q btsync ; then
#start btsync
# btsync --config ~/.config/btsync/btsync.conf
#fi
Executable
+2
View File
@@ -0,0 +1,2 @@
#!/bin/bash
exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache"
Executable
+19
View File
@@ -0,0 +1,19 @@
#!/bin/bash
if [ -x /usr/bin/cmus-remote ]
then
status=`cmus-remote -Q | grep status | awk '{print $2}'`
if [ $status == "paused" ]
then
status="ç"
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
+15
View File
@@ -0,0 +1,15 @@
# Check http://conky.sf.net for an up-to-date-list.
background no
format_human_readable yes
out_to_console yes
out_to_x no
#use_xft yes
#xftfont DroidSansMono:size=10
#xftalpha 0.8
update_interval 2
total_run_times 0
use_spacer none
TEXT
${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${exec ~/bin/power.sh} ${wireless_essid wlp0s29f7u1} ${addr wlp0s29f7u1} $time
-1
View File
@@ -97,7 +97,6 @@ TERM xterm-256color
TERM xterm-88color
TERM xterm-color
TERM xterm-debian
TERM xterm-termite
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
EIGHTBIT 1
-28
View File
@@ -1,28 +0,0 @@
#!/bin/bash
#based on https://github.com/cdown/passmenu
#and jasnowryan.com/blog
shopt -s nullglob globstar
nb='#2F4F4F'
nf='#00FFFF'
sb='#2F4F4F'
sf='#ADFF2F'
font="Inconsolataicon-12"
dmenucmd=( dmenu -i -fn "$font" -nb "$nb" -nf "$nf" -sb "$sb" -sf "$sf" )
prefix=${PASSWORD_STORE_DIR:-~/.password-store}
files=( "$prefix"/**/*.gpg )
files=( "${files[@]#"$prefix"/}" )
files=( "${files[@]%.gpg}" )
fbase=( "${files[@]##*/}" )
word=$(printf '%s\n' "${fbase[@]}" | "${dmenucmd[@]}" "$@")
if [[ -n $word ]]; then
for match in "${files[@]}"; do
if [[ $word == ${match#*/} ]]; then
/usr/bin/pass show -c "$match" 2>/dev/null
fi
done
fi
+125
View File
@@ -0,0 +1,125 @@
/* See LICENSE file for copyright and license details. */
/*includes*/
#include <X11/XF86keysym.h> /*Needed for mulitmedia keys*/
/* appearance */
static const char font[] = "Inconsolataicon-12";
#define NUMCOLORS 9
static const char colors[NUMCOLORS][ColLast][9] = {
// border foreground background
{ "#212121", "#00FFFF", "#2F4F4F" }, // 0 = normal
{ "#696969", "#ADFF2F", "#2F4F4F" }, // 1 = selected
{ "#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", "#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 */
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 *termcmd[] = { "termite", NULL };
/*functions for volume control*/
static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL};
static const char *downvol[] = { "amixer", "sset", "Master", "1%-", NULL};
static const char *mute[] = { "amixer", "sset", "Master", "toggle", 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};
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 } },
{ MODKEY, XK_u, spawn, {.v = cmusplaypause} },
{ MODKEY, XK_bracketright, spawn, {.v = cmusnext} },
{ MODKEY, XK_bracketleft, spawn, {.v = cmusprev} },
{ 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} },
};
-19
View File
@@ -1,19 +0,0 @@
####How to install and maintain GPG keys on my Yubikey
From: [PGP and SSH on Yubikey](https://www.esev.com/blog/post/2015-01-pgp-ssh-key-on-yubikey-neo/)
We want to keep out Master Key on a USB drive that a) doesn't leave the house or office and b) is rarely connected to a computer. You can also use a livecd and airgapped machine for even more security. I deem for my attack profile that having the Master Key offline most of the time is good enough. This may change in the future. My USB drive is also used to back up sensitive info so gpg stuff is under gnupg/
```bash
#Store Master key on USB drive
mv .gnupg .gnupg.orig
ln -s /PATHTOUSBDRIVE/gnupg .gnupg
#Check gpg.conf for strong hash and encryption preferences
cert-digest-algo SHA512
default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES
#generate a Master key if there isn't one
#if we have a secret key
-71
View File
@@ -1,71 +0,0 @@
## | InterobangRC
## |
## | Lines starting with a # are ignored as comments, but this file is
## | not processed by a shell interpreter.
## BASIC CONFIGURATION
#set font = fixed
set font = -*-terminus-medium-*-*-*-32-*-*-*-*-*-*-*
set geometry = top
set geometry = 3200x35-1+0
set colors = #00FFFF #2F4F4F #48E084 #242424 #64FFAA #484848
set border = 0px #BBE0EE
set bangchar = !
set run_hook = %s
#set run_hook = %s || (notify-send "Error: command not found";interrobang)
#set autocomp = 1
set list = true
set last = true
set margin = -80
set shell = /bin/bash
set flags = -c
## COMMON BANGS AND COMPLETITON OPTIONS
bang term = termite -e %s
bang web = ewpt3chfirefox %s
bang pdf = mupdf %s
bang man = termite -e man %s
bang ddg = ewpt3chfirefox https://duckduckgo.com/?q=%s
bang calc = echo "interrobang ignored \"%s\""
bang ? = echo "interrobang ignored \"%s\""
tab default = percontation "%s" %s | sort -u
tab calc = str="%s%s"; echo "!calc $(echo ${str#\!calc} | bc -l)"
tab ? = ignore="%s%s"; awk '/^bang/ {print "!"$2" ";}' ~/.interrobangrc
## EXAMPLES OF COMPLEX COMPLETION OR SCRIPTING
#####
## percontation can find .desktop files:
## path: (default) show binaries in $PATH
## desktop: list desktop files that match
## desktop+: same as above, plus substring matching with comments
## NOTE: see the desktop bang definition below
## compgen uses bash's default completion
#tab default = percontation desktop path "%s" %s | sort -u
#tab default = percontation desktop+ path "%s" %s | sort -u
#tab default = compgen -P "%s" -cf %s
#####
## Example logout tool:
## uncomment the following bang and tab lines
#bang logout = case "%s" in shutdown) sudo systemctl poweroff ;; sleep) sudo systemctl suspend ;; reboot) sudo systemctl reboot ;; logout) killall xinit ;; cancel) exit ;; esac
#tab logout = echo -e "cancel\nshutdown\nsleep\nreboot\nlogout" | grep "^%s%s"
#####
## desktop bangs
## The first version ignores any parameters to the desktop file and
## just executes the associated binary
## The second version passes parameters and parses the desktop file
## properly, but requires an external tool to do so. This tool
## is not included in the interrobang package.
#bang desktop = ARG="%s"; FILE=$(find /usr/share/applications/ -name ${ARG%% *}.desktop | head -1); $(awk '/^Exec=/ {sub(/Exec=/,"",$1); print $1;}' $FILE)
#bang desktop = ARG="%s"; FILE=$(find /usr/share/applications/ -name ${ARG%% *}.desktop | head -1); PARAM=${ARG#* }; desktop-exec $FILE $PARAM
+1 -1
View File
@@ -5,7 +5,7 @@
# If you want to use different themes and features,
# you can load the corresponding files here:
source ~/liquidprompt/liquid.theme
#source ~/code/liquidprompt/nojhan.theme
#LP_PS1_FILE="~/code/liquidprompt/nojhan.ps1"
#############
-29
View File
@@ -1,29 +0,0 @@
#fetch passwords
source "gpg -dq $HOME/.mutt/zoho-mutt-pass.gpg |"
#ewpt3ch.com imap
set folder = imaps://imappro.zoho.com
set imap_user = eric@ewpt3ch.com
set imap_pass = $my_pass
set spoolfile = +INBOX
mailboxes = +INBOX
set imap_keepalive = 300
set mail_check = 120
#ewpt3ch.com smtp
set realname = 'Eric W Phillips'
set from = eric@ewpt3ch.com
set use_from = yes
set smtp_url=smtps://$imap_user:$imap_pass@smtp.zoho.com
#options for gpgme
set crypt_use_gpgme = yes
set crypt_replysign = yes
set crypt_replyencrypt = yes
set crypt_replysignencrypted = yes
set crypt_verify_sig = yes
#view html in a browser
set mailcap_path = ~/.mutt/mailcap
alternative_order text/plain text/html
auto_view text/html
Executable
+22
View File
@@ -0,0 +1,22 @@
#!/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
+11
View File
@@ -0,0 +1,11 @@
;Global Settings
[redshift]
temp-day=6300
temp-night=4000
transition=1
[manual]
;denver
lat=39.898700
lon=-105.040452
+33
View File
@@ -0,0 +1,33 @@
#Customizations
[options]
font = Inconsolata 10
# Solarized dark color scheme
[colors]
foreground = #839496
foreground_bold = #eee8d5
#foreground_dim = #888888
background = #002b36
cursor = #93a1a1
# if unset, will reverse foreground and background
#highlight = #839496
# colors from color0 to color254 can be set
color0 = #073642
color1 = #dc322f
color2 = #859900
color3 = #b58900
color4 = #268bd2
color5 = #d33682
color6 = #2aa198
color7 = #eee8d5
color8 = #002b36
color9 = #cb4b16
color10 = #586e75
color11 = #657b83
color12 = #839496
color13 = #6c71c4
color14 = #93a1a1
color15 = #fdf6e3
+8
View File
@@ -0,0 +1,8 @@
syntax enable
set background=dark
colorscheme solarized
set smartindent
set tabstop=2
set shiftwidth=2
set expandtab
iabbrev <// </<C-X><C-O>
Executable
+9
View File
@@ -0,0 +1,9 @@
#!/bin/bash
mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'`
if [ $mute == "[on]" ]
then
vol=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'`
echo "ì" $vol
else
echo "ë"
fi
-31
View File
@@ -1,31 +0,0 @@
#!/bin/bash
# script for changing the volume and sending
# notification to twmn using twmnc
step=1
sink="@DEFAULT_SINK@"
if [[ $# -eq 1 ]]; then
case $1 in
"up")
pactl set-sink-mute $sink false
pactl set-sink-volume $sink +$step%
direction='increased to';;
"down")
pactl set-sink-volume $sink -$step%
direction='decreased to';;
"mute")
pactl set-sink-mute $sink toggle;;
*)
echo "Invalid option";;
esac
fi
muted=`pactl list sinks | grep "Mute" | awk '{print $2}'`
vol=`pactl list sinks | grep "front-left" | awk '{print $5}'`
if [[ $muted == "yes" ]]; then
twmnc -t 'volume' -c 'muted' -d 100
else
twmnc -t 'volume' -c "${direction}${vol}" -d 100
fi
+7
View File
@@ -0,0 +1,7 @@
[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
#exec openbox-session
conky | while read -r; do xsetroot -name "$REPLY"; done &
redshift &
pulseaudio --start &
google-musicmanager &
exec dbus-launch --exit-with-session --sh-syntax dwm