Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
sduckett committed Dec 21, 2018
1 parent a95e19b commit bf9c49e
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 62 deletions.
51 changes: 28 additions & 23 deletions Xresources
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
XTerm*loginShell: true

XTerm.font: xft:Input Mono:pixelsize=16:antialias=true:hinting=true
XTerm.boldFont: xft:Input Mono:bold:pixelsize=16:antialias=true:hinting=true


!! Rxvt-unicode settings
URxvt.iso14755: false
URxvt.iso14755_52: false
URxvt.depth: 32
URxvt.transparent: true
URxvt.fading: 15

!! Something was breaking fluxbox....I don't know if it was the transparency or
!!the 32 bit color... but it seems to work without transparancy, which is an
!!xmonad thing...

!! URxvt.transparent: true
!!URxvt.fading: 15
URxvt.loginShell: true
URxvt.internalBorder: 3
URxvt.lineSpace: 0
Expand Down Expand Up @@ -37,26 +43,6 @@ URxvt.keysym.C-S-Down: font-size:decglobal
! URxvt.keysym.C-S-Down: perl:font-size:decglobal

!! A Color theme experiment - Tango!
!!urxvt*foreground: white
!!urxvt*background: black
! *color0: #2E3436
! *color1: #a40000
! *color2: #4E9A06
! *color3: #C4A000
! *color4: #3465A4
! *color5: #75507B
! *color6: #ce5c00
! *color7: #babdb9
! *color8: #555753
! *color9: #EF2929
! *color10: #8AE234
! *color11: #FCE94F
! *color12: #729FCF
! *color13: #AD7FA8
! *color14: #fcaf3e
! *color15: #EEEEEC


!! Some dark colorscheme I found on a Xresources colorscheme generator website somewhere....
! special
*.foreground: #c5c8c6
Expand Down Expand Up @@ -86,3 +72,22 @@ URxvt.keysym.C-S-Down: font-size:decglobal
! white
*.color7: #c5c8c6
*.color15: #ffffff

! urxvt*foreground: white
! urxvt*background: black
! *color0: #2E3436
! *color1: #a40000
! *color2: #4E9A06
! *color3: #C4A000
! *color4: #3465A4
! *color5: #75507B
! *color6: #ce5c00
! *color7: #babdb9
! *color8: #555753
! *color9: #EF2929
! *color10: #8AE234
! *color11: #FCE94F
! *color12: #729FCF
! *color13: #AD7FA8
! *color14: #fcaf3e
! *color15: #EEEEEC
5 changes: 0 additions & 5 deletions democracy-works.zsh

This file was deleted.

7 changes: 4 additions & 3 deletions lein-profiles.clj
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{:user
{:plugins
[[jonase/eastwood "0.2.5"]
[lein-ancient "0.6.15" :exclusions [org.clojure/clojure]]
[lein-ancient "0.6.15"
:exclusions [org.clojure/clojure]]
[lein-bikeshed "0.5.1"]
[lein-checkall "0.1.1"]
[lein-cloverage "1.0.6"]
[lein-deps-tree "0.1.2"]
[lein-kibit "0.1.5"]
#_[lein-try "0.4.3"]]}}
[lein-kibit "0.1.5"]]}}

12 changes: 11 additions & 1 deletion programming-tools.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,19 @@ function dirty-repos() {
# If you don't set [default] credentials, you'll never accidentally
# operate on the wrong one; instead, you'll have to call out which
# system you want to manage.
alias "aws-dw=aws --profile=democracyworks"
alias "aws-dw=aws --profile=dw"
alias "aws-smd=aws --profile=smd"

function run-hasktags() {
hasktags --ignore-close-implementation --etags .
}


# provide an path to cleanup
function cleanup-repos() {
for i in $1/*; do
pushd $i && git fetch -p
popd
done
}

21 changes: 4 additions & 17 deletions xinitrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,14 @@ if [ -f "$usermodmap" ]; then
xmodmap "$usermodmap"
fi

# If we have private ssh key(s), start ssh-agent and add the key(s)
id1=$HOME/.ssh/identity
id2=$HOME/.ssh/id_dsa
id3=$HOME/.ssh/id_rsa
id4=$HOME/.ssh/sduckett.pem
if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 ];
if [ -x /usr/bin/ssh-agent ]
then
eval `ssh-agent -s`
ssh-add < /dev/null
eval $(ssh-agent)
fi

# Warning: implicit dependencies below!
emacs --daemon # prefer emacsclient to starting the entire system again
~/bin/shifty & # Shifty is a red-shift program by a Debian guy
~/bin/gpg-agent.sh
xsetroot -solid black && qiv -y ~/.wallpaper.jpg
xscreensaver &
xmonad || fvwm || xterm


if [ "$SSH_AGENT_PID" ]; then
ssh-add -D < /dev/null
eval `ssh-agent -s -k`
fi
exec startfluxbox || fvwm || xterm
#xmonad || fvwm || xterm
20 changes: 8 additions & 12 deletions zshalias
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,18 @@ alias "screencast4win=mencoder -forceidx -mc 0 -noskip -skiplimit 0 -ovc lavc -l
#
# Display outputs
#
alias "vga-above=xrandr --output VGA1 --auto --above LVDS1"
alias "vga-cloned=xrandr --output VGA1 --auto --same-as LVDS1"
alias "dp-above=xrandr --output LVDS1 --preferred --output DP1 --preferred --above LVDS1"
alias "dp-cloned=xrandr --output LVDS1 --preferred --output DP1 --preferred --same-as LVDS1"
alias "onescreen=xrandr --output LVDS1 --preferred --output DP1 --off --output VGA1 --off --output HDMI1 --off"
alias "vga-above=xrandr --output VGA1 --auto --above LVDS-1"
alias "vga-cloned=xrandr --output VGA1 --auto --same-as LVDS-1"
alias "dp-above=xrandr --output LVDS-1 --preferred --output DP-1 --preferred --above LVDS-1"
alias "dp-cloned=xrandr --output LVDS-1 --preferred --output DP-1 --preferred --same-as LVDS-1"
alias "onescreen=xrandr --output LVDS-1 --preferred --output DP-1 --off --output VGA1 --off --output HDMI1 --off"

#
# Programming things
#
alias "set-esptime=echo T$(($(date +%s)+60*60*-5)) > /dev/ttyUSB0"

# Pairing can be done through an SSH tunnel
alias tunnel-dnc="ssh -nNT -R 3742:localhost:22 [email protected]"

alias yourkit="JAVA_OPTS=-agentpath:/Applications/YourKit-Java-Profiler-2017.02.app/Contents/Resources/bin/mac/libyjpagent.jnilib"
alias "yourkit=JAVA_OPTS=-agentpath:/Applications/YourKit-Java-Profiler-2017.02.app/Contents/Resources/bin/mac/libyjpagent.jnilib"

# Some things for docker
alias stale-images="docker images | grep '<none>' | tr -s ' ' | cut -d ' ' -f 3"
alias rm-stale-images="docker rmi $(stale-images)"
alias "stale-images=docker images | grep '<none>' | tr -s ' ' | cut -d ' ' -f 3"
alias "rm-stale-images=docker rmi $(stale-images)"
2 changes: 1 addition & 1 deletion zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ if [ -f ~/.gnupg/.gpg-agent-info -a -n "$(pgrep gpg-agent)" ]; then
source ~/.gnupg/.gpg-agent-info
export GPG_AGENT_INFO
else
eval $(gpg-agent --daemon --write-env-file ~/.gnupg/.gpg-agent-info)
eval $(gpg-agent --quiet --daemon ~/.gnupg/.gpg-agent-info)
fi

0 comments on commit bf9c49e

Please sign in to comment.