From 34a6c23f99988a75729b04880824b8d79d1391a2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:20:24 -0400 Subject: Use XDG for bash, remove alsa, clean up bash & profile, add CACHEDIR.TAG .profile: fix up --- .git.info.exclude.in | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 .git.info.exclude.in (limited to '.git.info.exclude.in') diff --git a/.git.info.exclude.in b/.git.info.exclude.in new file mode 100644 index 0000000..37c1ee4 --- /dev/null +++ b/.git.info.exclude.in @@ -0,0 +1,108 @@ +# Defualt to ignoring all files +/* + +# Except dotfiles +!.* + +# Or Makefile +!Makefile + +# Ignore these for privacy +.ssh/* +!.ssh/config +.gnupg/* +!.gnupg/gpg.conf +.netrc + +# Ignore temp/log/history files +*.log +log.* + +*.tmp +*.tmp.* +tmp.* +tmp-* +tmp + +*_history +*_hist +history.* +history + +*.lock +.~lock.*# +lock + +*.state +*.cookie +*.bak + +*authority +*cache* + +# Ignore files left by editors +*~ +.#* +\#*# + + +# Ignore these special-purpose cache/temp files +.camel_certs +.compiz/session/* +.config/chromium/Default/History\ Index* +.current.asound +.dbus/session-bus/* +.ddd/sessions +.dvdcss +.esd_auth +.evolution/.* +.gconfd/saved_state +.gnash-media +.gnash/SharedObjects/* +.kde/share/apps/RecentDocuments/* +.kde/socket-* +.kde4/share/apps/RecentDocuments/* +.kde4/share/apps/okular/docdata/* +.kde4/socket-* +.lesshst +.link*/*.his +.local/share/Trash/* +.local/share/gvfs-metadata/* +.local/share/icons/* +.local/share/recently-used.xbel +.pki +.pulse +.pulse-cookie +.recently-used +.recently-used.xbel* +.setroubleshoot +.shotwell/thumbs/* +.sudo_as_admin_successful +.thumbnails/* +.wireshark/recent* +.xsession-errors* + +# Ignore files that are autogenerated +.config/libretools/blacklist.txt +.folders +.git.info.exclude +.nanorc + +# Ignore these files for no good reason +.bogofilter +.config/Trolltech.conf +.config/vlc +.gem +.offlineimap +.prefix +.prefix.* +.terminfo +.wine* + +# Ignore these files that if I tracked them, would be a separate repo +.config/chromium +.config/libreoffice +.config/transmission +.eclipse +.mozilla +.netbeans -- cgit v1.2.3-54-g00ecf From 65cf2b407744320091f3bd1a1de0dee73992bd8c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:32:35 -0400 Subject: symlink .kde4/share/{apps,config} to .config --- .git.info.exclude.in | 6 +++--- .kde | 1 + .kde4/share/apps | 1 + .kde4/share/config | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) create mode 120000 .kde create mode 120000 .kde4/share/apps create mode 120000 .kde4/share/config (limited to '.git.info.exclude.in') diff --git a/.git.info.exclude.in b/.git.info.exclude.in index 37c1ee4..fe97ec8 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -17,6 +17,7 @@ # Ignore temp/log/history files *.log log.* +log *.tmp *.tmp.* @@ -49,7 +50,9 @@ lock # Ignore these special-purpose cache/temp files .camel_certs .compiz/session/* +.config/RecentDocuments/* .config/chromium/Default/History\ Index* +.config/okular/docdata/* .current.asound .dbus/session-bus/* .ddd/sessions @@ -59,10 +62,7 @@ lock .gconfd/saved_state .gnash-media .gnash/SharedObjects/* -.kde/share/apps/RecentDocuments/* .kde/socket-* -.kde4/share/apps/RecentDocuments/* -.kde4/share/apps/okular/docdata/* .kde4/socket-* .lesshst .link*/*.his diff --git a/.kde b/.kde new file mode 120000 index 0000000..e604d30 --- /dev/null +++ b/.kde @@ -0,0 +1 @@ +.kde4 \ No newline at end of file diff --git a/.kde4/share/apps b/.kde4/share/apps new file mode 120000 index 0000000..7f8f949 --- /dev/null +++ b/.kde4/share/apps @@ -0,0 +1 @@ +../../.config \ No newline at end of file diff --git a/.kde4/share/config b/.kde4/share/config new file mode 120000 index 0000000..7f8f949 --- /dev/null +++ b/.kde4/share/config @@ -0,0 +1 @@ +../../.config \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 8f6fe81e1db6e1d95a4eb0ef303491b4aadf44c1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:54:40 -0400 Subject: remove superfluous lines from .git.info.exclude.in --- .git.info.exclude.in | 2 -- 1 file changed, 2 deletions(-) (limited to '.git.info.exclude.in') diff --git a/.git.info.exclude.in b/.git.info.exclude.in index fe97ec8..612ecf2 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -53,10 +53,8 @@ lock .config/RecentDocuments/* .config/chromium/Default/History\ Index* .config/okular/docdata/* -.current.asound .dbus/session-bus/* .ddd/sessions -.dvdcss .esd_auth .evolution/.* .gconfd/saved_state -- cgit v1.2.3-54-g00ecf From 0f4a6cf04af0cb2a33637dda81dfd82adbc7acc6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 27 Nov 2012 00:25:48 -0500 Subject: stuff --- .arduino | 1 + .config/emacs/rc.d | 1 + .config/emacs/rc.el | 1 + .emacs | 1 + .emacs.d/custom.el | 5 ++- .git.info.exclude.in | 1 + .gitconfig | 4 +++ .maildirproc/default.rc | 42 +++++++++++++++---------- .maildirproc/purdue.rc | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ .offlineimaprc | 36 +++++++++++++++++----- .profile | 4 +-- .ssh/config | 4 +++ 12 files changed, 155 insertions(+), 27 deletions(-) create mode 120000 .arduino create mode 120000 .config/emacs/rc.d create mode 120000 .config/emacs/rc.el create mode 100644 .maildirproc/purdue.rc (limited to '.git.info.exclude.in') diff --git a/.arduino b/.arduino new file mode 120000 index 0000000..25bbfc1 --- /dev/null +++ b/.arduino @@ -0,0 +1 @@ +.config/arduino \ No newline at end of file diff --git a/.config/emacs/rc.d b/.config/emacs/rc.d new file mode 120000 index 0000000..cbf0836 --- /dev/null +++ b/.config/emacs/rc.d @@ -0,0 +1 @@ +../../.emacs.d \ No newline at end of file diff --git a/.config/emacs/rc.el b/.config/emacs/rc.el new file mode 120000 index 0000000..6d539f6 --- /dev/null +++ b/.config/emacs/rc.el @@ -0,0 +1 @@ +../../.emacs \ No newline at end of file diff --git a/.emacs b/.emacs index 3cd2ea3..65634cb 100644 --- a/.emacs +++ b/.emacs @@ -170,6 +170,7 @@ )) (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode)) +(add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode)) ;(require 'flymake) ;(add-hook 'php-mode-hook (lambda() (flymake-mode 1))) diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 5a3e67f..07c8d80 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -12,7 +12,10 @@ '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt))) '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) - '(scroll-bar-mode nil)) + '(safe-local-variable-values (quote ((Nginx-indent-tabs-mode) (Nginx-indent-level . 4) (Nginx-indent-level . 8)))) + '(scroll-bar-mode nil) + '(sh-basic-offset 8) + '(sh-indent-comment t)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/.git.info.exclude.in b/.git.info.exclude.in index 612ecf2..cd60859 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -32,6 +32,7 @@ history *.lock .~lock.*# +*.lock.* lock *.state diff --git a/.gitconfig b/.gitconfig index 9846d72..218b006 100644 --- a/.gitconfig +++ b/.gitconfig @@ -8,3 +8,7 @@ smtpserver = plus.smtp.mail.yahoo.com smtpuser = lukeshu@sbcglobal.net smtpserverport = 465 +[push] + default = matching +[alias] + lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index c2ad6f2..cbdc908 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -10,7 +10,9 @@ def is_to_or_from(mail,address): Return true if [mail] is to or from an address that contains [address]. """ return ( - mail["From"].contains(address) + False + or mail["From"].contains(address) + or mail["Reply-To"].contains(address) or mail.target.contains(address)) def is_to_or_from_re(mail,address): """ @@ -90,6 +92,10 @@ def my_filters(mail): mail.move(".software.social") return + if mail["List-Id"].matches("networkmanager-list\.gnome\.org"): + mail.move(".software.networkmanager") + return + if mail["List-Id"].matches("maintenance.lists.parabolagnulinux.org"): mail.move(".software.parabola-maintenance") return @@ -97,6 +103,7 @@ def my_filters(mail): False or mail["List-Id"].matches("parabolagnulinux.org") or is_to_or_from(mail, "parabolagnulinux.org") + or is_to_or_from(mail, "kiwwwi.com.ar") or is_to_or_from(mail, "parabola.nu") ): mail.move(".software.parabola-dev") @@ -166,6 +173,7 @@ def my_filters(mail): "justicejade10@aol.com", "parsonsjade@aol.com", "parsonstjade@gmail.com", + "jadparso@umail.iu.edu", ]: if mail["From"].contains(address): mail.move(".misc.Jade") @@ -190,23 +198,24 @@ def my_filters(mail): # Sort mail from FRC people for address in [ - "jeffreysmith@msdlt.k12.in.us", - "jason.zielke@gmail.com", - "allison.m.babcock@gmail.com", - "william.walk@gmail.com", + "@ni.com", + "@usfirst.org", "BBonahoom@stanleyworks.com", - "wcxctrack829@aim.com", # Pat + "allison.m.babcock@gmail.com", + "bryanbonahoom@gmail.com", + "cdewalt3@yahoo.com", + "dave.nelson@ecolab.com", + "dickaustin190@yahoo.com", "djnels1@comcast.net", # Dave and Julie Nelson + "gamefreak207@gmail.com", # Brett Leedy + "jason.zielke@gmail.com", + "jeffreysmith@msdlt.k12.in.us", "sarahlittell@comcast.net", + "silioso@gmail.com", "skiplittell@comcast.net", - "dave.nelson@ecolab.com", - "@ni.com", - "@usfirst.org", - "gamefreak207@gmail.com", # Brett Leedy "tswilson4801@att.net", - "silioso@gmail.com", - "cdewalt3@yahoo.com", - "bryanbonahoom@gmail.com", + "wcxctrack829@aim.com", # Pat + "william.walk@gmail.com", ]: if is_to_or_from(mail,address): mail.move(".School.Robotics") @@ -224,6 +233,7 @@ def my_filters(mail): # Sort mail from software people for address in [ "gnu.org", + "gnome.org", "eff.org", "gitorious.org", "sourceforge.com", @@ -306,10 +316,10 @@ def my_filters(mail): return if ( False - or mail["From"].contains(".edu") + #or mail["From"].contains(".edu") or mail["From"].contains("admissions@") - or mail["From"].contains("college") - or mail["From"].contains("university") + #or mail["From"].contains("college") + #or mail["From"].contains("university") or mail["Subject"].contains("college") # now we get to the BS or mail["From"].contains("@dreamitdoitindiana.com") diff --git a/.maildirproc/purdue.rc b/.maildirproc/purdue.rc new file mode 100644 index 0000000..546b792 --- /dev/null +++ b/.maildirproc/purdue.rc @@ -0,0 +1,82 @@ +# -*- mode: python; -*- + +import subprocess + +processor.maildir_base = "~/Maildir.purdue" +processor.auto_reload_rcfile = True + +def is_to_or_from(mail,address): + """ + Return true if [mail] is to or from an address that contains [address]. + """ + return ( + mail["From"].contains(address) + or mail.target.contains(address)) +def is_to_or_from_re(mail,address): + """ + Return true if [mail] is to or from an address that matches the + regex [address]. + """ + return ( + mail["From"].matches(address) + or mail.target.matches(address)) + +def handle_incoming_ham(mail): + my_filters(mail) + +def handle_incoming_unknown(mail): + # Filter spam + + spam = bogofilter_auto(mail) + if spam == 0: + handle_incoming_spam(mail) + return + elif spam == 1: + handle_incoming_ham(mail) + return + elif spam == 2: + # maybe spam + return + else: + mail.move(".Error") + return + +def my_filters(mail): + if mail["Subject"].contains("[PASE]"): + mail.move("INBOX.PASE") + return + if mail["Subject"].contains("[PLUG]"): + mail.move("INBOX.PLUG") + return + if mail["Subject"].contains("Fall-2012-SCI-21000-001:"): + mail.move("INBOX.classes.SCI210") + if ( + False + or mail["Subject"].contains("[CS Opportunity Update]") + or mail["Subject"].contains("[CS Majors]") + ): + mail.move("INBOX.CS") + return + if is_to_or_from(mail,"linkedin.com"): + mail.move("INBOX.LinkedIn") + return + if mail["Subject"].contains("fall-2012-cs-18000"): + mail.move("INBOX.classes.CS180") + return + if ( + False + or is_to_or_from(mail,"CS 18000 on Piazza") + or mail["Subject"].contains("CS 18000 on Piazza") + ): + mail.move("INBOX.classes.CS180.Piazza") + return + if mail["Subject"].contains("Fall-2012-SOC-10000"): + mail.move("INBOX.classes.SOC100") + return + +handle_mapping = { + "INBOX": handle_incoming_ham, + } +processor.maildirs = handle_mapping.keys() +for mail in processor: + handle_mapping[mail.maildir](mail) diff --git a/.offlineimaprc b/.offlineimaprc index 319593c..8ea8f30 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -1,22 +1,22 @@ # -*- Mode: Conf -*- [general] -accounts = LukeShu +accounts = ATT,Purdue -[Account LukeShu] -localrepository = Local -remoterepository = Remote +## AT&T ############################################################### -[Repository Local] +[Account ATT] +localrepository = Local-Main +remoterepository = Remote-SBCGlobal + +[Repository Local-Main] type = Maildir localfolders = ~/Maildir sep = . folderfilter = lambda foldername: not re.search('(Trash|Del|-old|Draft)', foldername) - # transforms local -> remote nametrans = lambda foldername: re.sub('^$', 'Inbox', re.sub('^'+re.escape('%(sep)s'), '', foldername)) - -[Repository Remote] +[Repository Remote-SBCGlobal] type = IMAP ssl = yes cert_fingerprint = 700d84baa7e852240178dc2de18e7e528a2854df @@ -27,3 +27,23 @@ folderfilter = lambda foldername: not re.search('(Trash|Del)', foldername) # transforms remote -> local # we must assume that sep=/ on the remote IMAP server. nametrans = lambda foldername: '/'+re.sub('^Inbox$', '', foldername) + +## Purdue ############################################################ + +[Account Purdue] +localrepository = Local-Purdue +remoterepository = Remote-Purdue + +[Repository Local-Purdue] +type = Maildir +localfolders = ~/Maildir.purdue +sep = . +folderfilter = lambda foldername: re.search('INBOX', foldername) + +[Repository Remote-Purdue] +type = IMAP +ssl = yes +cert_fingerprint = 32bdd134cad8da1bea57aa379b98b1cff692e4fd +remotehost = mymail.purdue.edu +remoteuser = shumakl +folderfilter = lambda foldername: re.search('INBOX', foldername) diff --git a/.profile b/.profile index a6c4d91..2d6f370 100644 --- a/.profile +++ b/.profile @@ -43,8 +43,8 @@ if [ -z "$GPGKEY" ] && [ -f "${HOME}/.gnupg/gpg.conf" ]; then export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` fi if [ -z "$(pgrep -u `whoami` gpg-agent)" ]; then - mkdir -p ${XDG_RUNTIME_DIR}/sessions/gpg - gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" + mkdir -p ${XDG_RUNTIME_DIR}/sessions + gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" &>/dev/null fi if [ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]; then . "${XDG_RUNTIME_DIR}/sessions/gpg" diff --git a/.ssh/config b/.ssh/config index 5c271b5..63519e1 100644 --- a/.ssh/config +++ b/.ssh/config @@ -9,3 +9,7 @@ Host parabola Port 1863 HostName repo.parabolagnulinux.org User repo + +Host lore + HostName lore.cs.purdue.edu + User shumakl -- cgit v1.2.3-54-g00ecf From 745e39311120f12263e16ca006a6bc6e5943052f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 4 Jan 2013 10:53:47 -0500 Subject: don't track gimp --- .git.info.exclude.in | 1 + 1 file changed, 1 insertion(+) (limited to '.git.info.exclude.in') diff --git a/.git.info.exclude.in b/.git.info.exclude.in index cd60859..4db3ff0 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -103,5 +103,6 @@ lock .config/libreoffice .config/transmission .eclipse +.gimp-* .mozilla .netbeans -- cgit v1.2.3-54-g00ecf From de4965a0025e561f8d70caaa22f0316fcd3a6e57 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Jan 2013 16:40:20 -0500 Subject: factor out a few per-directory .gitignore files --- .config/.gitignore | 11 +++++++++++ .config/libretools/.gitignore | 1 + .config/okular/.gitignore | 1 + .git.info.exclude.in | 15 --------------- .kde/.gitignore | 1 + 5 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 .config/.gitignore create mode 100644 .config/libretools/.gitignore create mode 100644 .config/okular/.gitignore create mode 100644 .kde/.gitignore (limited to '.git.info.exclude.in') diff --git a/.config/.gitignore b/.config/.gitignore new file mode 100644 index 0000000..03b31b2 --- /dev/null +++ b/.config/.gitignore @@ -0,0 +1,11 @@ +# Ignore things I don't care enough about to track +vlc +Trolltech.conf + +RecentDocuments + +# Ignore these files that if I tracked them, would be a separate repo +libreoffice +transmission +gimp-* +netbeans diff --git a/.config/libretools/.gitignore b/.config/libretools/.gitignore new file mode 100644 index 0000000..1881962 --- /dev/null +++ b/.config/libretools/.gitignore @@ -0,0 +1 @@ +blacklist.txt diff --git a/.config/okular/.gitignore b/.config/okular/.gitignore new file mode 100644 index 0000000..4e33b14 --- /dev/null +++ b/.config/okular/.gitignore @@ -0,0 +1 @@ +docdata diff --git a/.git.info.exclude.in b/.git.info.exclude.in index 4db3ff0..0b361b1 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -52,8 +52,6 @@ lock .camel_certs .compiz/session/* .config/RecentDocuments/* -.config/chromium/Default/History\ Index* -.config/okular/docdata/* .dbus/session-bus/* .ddd/sessions .esd_auth @@ -61,8 +59,6 @@ lock .gconfd/saved_state .gnash-media .gnash/SharedObjects/* -.kde/socket-* -.kde4/socket-* .lesshst .link*/*.his .local/share/Trash/* @@ -82,27 +78,16 @@ lock .xsession-errors* # Ignore files that are autogenerated -.config/libretools/blacklist.txt .folders .git.info.exclude -.nanorc # Ignore these files for no good reason .bogofilter -.config/Trolltech.conf -.config/vlc .gem .offlineimap .prefix .prefix.* -.terminfo .wine* # Ignore these files that if I tracked them, would be a separate repo -.config/chromium -.config/libreoffice -.config/transmission -.eclipse -.gimp-* .mozilla -.netbeans diff --git a/.kde/.gitignore b/.kde/.gitignore new file mode 100644 index 0000000..3e3f239 --- /dev/null +++ b/.kde/.gitignore @@ -0,0 +1 @@ +socket-* \ No newline at end of file -- cgit v1.2.3-54-g00ecf From f1f55a90ffd5e9f0c4f0d02d377559176c984083 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Jan 2013 17:56:21 -0500 Subject: don't track .gitk, it changes too often --- .git.info.exclude.in | 1 + .gitk | 36 ------------------------------------ 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 .gitk (limited to '.git.info.exclude.in') diff --git a/.git.info.exclude.in b/.git.info.exclude.in index 0b361b1..0c5ce40 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -84,6 +84,7 @@ lock # Ignore these files for no good reason .bogofilter .gem +.gitk .offlineimap .prefix .prefix.* diff --git a/.gitk b/.gitk deleted file mode 100644 index cbdfd9a..0000000 --- a/.gitk +++ /dev/null @@ -1,36 +0,0 @@ -set mainfont {Helvetica 9} -set textfont {{DejaVu Sans Mono} 9} -set uifont {Helvetica 9 bold} -set tabstop 8 -set findmergefiles 0 -set maxgraphpct 50 -set maxwidth 16 -set cmitmode patch -set wrapcomment none -set autoselect 1 -set autosellen 40 -set showneartags 1 -set hideremotes 0 -set showlocalchanges 1 -set datetimeformat {%Y-%m-%d %H:%M:%S} -set limitdiffs 1 -set uicolor grey85 -set want_ttk 1 -set bgcolor white -set fgcolor black -set colors {green red blue magenta darkgrey brown orange} -set diffcolors {red "#00a000" blue} -set markbgcolor #e0e0ff -set diffcontext 4 -set selectbgcolor gray85 -set extdifftool meld -set perfile_attrs 0 -set geometry(main) 1364x658+0+0 -set geometry(state) normal -set geometry(topwidth) 1364 -set geometry(topheight) 358 -set geometry(pwsash0) "617 1" -set geometry(pwsash1) "1025 1" -set geometry(botwidth) 889 -set geometry(botheight) 295 -set permviews {} -- cgit v1.2.3-54-g00ecf From b5f8ee46f0b8a97ddbe8b21e1605bfe2b41c0cb5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 14 Aug 2013 15:07:04 -0400 Subject: re-jigger to have most everything in XDG directories --- .config/Makefile | 18 +++++++-- .config/login.local.sh | 11 +++++ .config/login.sh | 106 +++++++++++++++++++++++++++++++++++++++++++++++++ .config/symlinks | 3 ++ .git.info.exclude.in | 65 +++++------------------------- .profile | 105 ------------------------------------------------ .profile.local | 11 ----- 7 files changed, 144 insertions(+), 175 deletions(-) create mode 100644 .config/login.local.sh create mode 100644 .config/login.sh delete mode 100644 .profile delete mode 100644 .profile.local (limited to '.git.info.exclude.in') diff --git a/.config/Makefile b/.config/Makefile index 391e43c..829b820 100644 --- a/.config/Makefile +++ b/.config/Makefile @@ -1,15 +1,22 @@ +#!/usr/bin/make -f + SHELL = /bin/bash -GITDIR=${HOME}/.git +GITDIR = ${HOME}/.git + +targets = \ + ${GITDIR}/info/exclude \ + ${HOME}/.folders \ + ${XDG_CACHE_HOME}/config-symlinks/cookie \ + ${XDG_CACHE_HOME}/cron/cookie -targets=${HOME}/.folders ${XDG_CACHE_HOME}/cron/cookie ${GITDIR}/info/exclude all: $(targets) clean: rm -f $(targets) ${HOME}/.folders: ${HOME}/Maildir ( echo '..'; find $< -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@' -${GITDIR}/info/exclude: .git.info.exclude.in $(shell echo .??*/) +${GITDIR}/info/exclude: ${HOME}/.git.info.exclude.in $(shell echo .??*/) ( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@ ${XDG_CACHE_HOME}/cron/cookie: ${XDG_CONFIG_HOME}/cron @@ -17,6 +24,11 @@ ${XDG_CACHE_HOME}/cron/cookie: ${XDG_CONFIG_HOME}/cron mkdir -p '$(@D)' date > '$@' +${XDG_CACHE_HOME}/config-symlinks/cookie: ${XDG_CONFIG_HOME}/symlinks + config-symlinks + mkdir -p '$(@D)' + date > '$@' + ${HOME}/Maildir: mkdir -p '$@'/{cur,new,tmp} ${HOME}/Maildir/%: | ${HOME}/Maildir diff --git a/.config/login.local.sh b/.config/login.local.sh new file mode 100644 index 0000000..25b322b --- /dev/null +++ b/.config/login.local.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# Start background programs ########################################## +if [ -x "`which daemon`" ]; then + daemon -i maildirproc.att maildirproc + daemon -i maildirproc.purdue maildirproc -r ~/.maildirproc/purdue.rc + daemon batterymon 20 " + amixer sset Master unmute 100%; + espeak 'PLUG ME IN'; + sleep .2;" +fi diff --git a/.config/login.sh b/.config/login.sh new file mode 100644 index 0000000..851f4ec --- /dev/null +++ b/.config/login.sh @@ -0,0 +1,106 @@ +#!/bin/sh +# ~/.profile: executed by the command interpreter for login shells. +# Should be whether logging in graphically or not. +# +# This file should be executable by /bin/sh, but I'm going to assume bash(1) +# +# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login +# exists. + +# the default umask is set in /etc/profile; for setting the umask +# for ssh logins, install and configure the libpam-umask package. +umask 022 + +## Paths ############################################################# + +# Unix +prefixes=( + "$HOME" + "$HOME/.local.`uname -m`" + "$HOME/.local/bin" + "$HOME/.prefix.`uname -m`" + "$HOME/.prefix" + "$HOME"/.gem/ruby/* +) +for prefix in "${prefixes[@]}"; do + if [[ -d "$prefix/bin" ]]; then + export PATH="$prefix/bin:$PATH" + fi +done + +# Ruby +for dir in "$HOME"/.prefix/lib; do + if [[ -d "$dir" ]]; then + export RUBYLIB="$dir" + fi +done +unset prefixes dir prefix + +# TMPDIR ############################################################# + +if [[ ! -d "$HOME/tmp" ]]; then + tmp="$(mktemp --tmpdir -d "$USER-tmpdir.XXXXXXXXXXXXXXXXXXX")" + ln -sf "$tmp" "$HOME/tmp" + unset tmp +fi +export TMPDIR="$HOME/tmp" + +# XDG ################################################################ + +. "$HOME/.local/lib/xdg.sh" + +# Settings ########################################################### + +# Text editor +if [[ -f "$HOME/.selected_editor" ]]; then + . "$HOME/.selected_editor" + export SELECTED_EDITOR + export ALTERNATE_EDITOR + export EDITOR="${EDITOR:-$SELECTED_EDITOR}" + export VISUAL="${VISUAL:-$SELECTED_EDITOR}" +fi + +# GPG +if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then + export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` +fi +if [[ -z "$(pgrep -u `whoami` gpg-agent)" ]] && [[ -n $XDG_RUNTIME_DIR ]] && type gpg-agent &>/dev/null; then + mkdir -p "${XDG_RUNTIME_DIR}/sessions" + gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" &>/dev/null +fi +if [[ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]]; then + . "${XDG_RUNTIME_DIR}/sessions/gpg" + export GPG_AGENT_INFO + #export SSH_AUTH_SOCK +fi + +# Java +_JAVA_OPTIONS='' +_JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on' +_JAVA_OPTIONS+=' -Dswing.aatext=true' +_JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' +if [[ -n $TMPDIR ]]; then + _JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" +fi +export _JAVA_OPTIONS + +# X11 +if [[ -z $XAUTHORITY ]]; then + export XAUTHORITY=$HOME/.Xauthority +fi + +# D-Bus +if [[ -z $DBUS_SESSION_BUS_ADDRESS ]] && type dbus-launch &>/dev/null; then + # I want a separate instance for each login + #dbus-launch > "${HOME}/.cache/sessions/dbus" + #. "${HOME}/.cache/sessions/dbus" + eval `dbus-launch` + + export DBUS_SESSION_BUS_ADDRESS + export DBUS_SESSION_BUS_PID +fi + +# Load any box-specific stuff +if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then + . "$XDG_CONFIG_HOME/login.local.sh" +fi diff --git a/.config/symlinks b/.config/symlinks index 01c8c4e..05d6631 100644 --- a/.config/symlinks +++ b/.config/symlinks @@ -1,5 +1,8 @@ # target link +# Generic +.config/login.sh .profile + # X11 .config/X11/defaults .Xdefaults .config/X11/clientrc .xinitrc diff --git a/.git.info.exclude.in b/.git.info.exclude.in index 0c5ce40..2d09032 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -1,18 +1,17 @@ # Defualt to ignoring all files /* +# except these: -# Except dotfiles -!.* +# The things I actually want to track +!/.config +!/.local* -# Or Makefile -!Makefile +# The file that generates this one +!/.git.info.exclude.in -# Ignore these for privacy -.ssh/* -!.ssh/config -.gnupg/* -!.gnupg/gpg.conf -.netrc +# The relevent programs do not like symlinks for these: +!/.gtkrc-2.0 +!/.gtkrc-2.0.mine # Ignore temp/log/history files *.log @@ -46,49 +45,3 @@ lock *~ .#* \#*# - - -# Ignore these special-purpose cache/temp files -.camel_certs -.compiz/session/* -.config/RecentDocuments/* -.dbus/session-bus/* -.ddd/sessions -.esd_auth -.evolution/.* -.gconfd/saved_state -.gnash-media -.gnash/SharedObjects/* -.lesshst -.link*/*.his -.local/share/Trash/* -.local/share/gvfs-metadata/* -.local/share/icons/* -.local/share/recently-used.xbel -.pki -.pulse -.pulse-cookie -.recently-used -.recently-used.xbel* -.setroubleshoot -.shotwell/thumbs/* -.sudo_as_admin_successful -.thumbnails/* -.wireshark/recent* -.xsession-errors* - -# Ignore files that are autogenerated -.folders -.git.info.exclude - -# Ignore these files for no good reason -.bogofilter -.gem -.gitk -.offlineimap -.prefix -.prefix.* -.wine* - -# Ignore these files that if I tracked them, would be a separate repo -.mozilla diff --git a/.profile b/.profile deleted file mode 100644 index 84103f3..0000000 --- a/.profile +++ /dev/null @@ -1,105 +0,0 @@ -# ~/.profile: executed by the command interpreter for login shells. -# Should be whether logging in graphically or not. -# -# This file should be executable by /bin/sh, but I'm going to assume bash(1) -# -# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login -# exists. - -# the default umask is set in /etc/profile; for setting the umask -# for ssh logins, install and configure the libpam-umask package. -umask 022 - -## Paths ############################################################# - -# Unix -prefixes=( - "$HOME" - "$HOME/.local.`uname -m`" - "$HOME/.local/bin" - "$HOME/.prefix.`uname -m`" - "$HOME/.prefix" - "$HOME"/.gem/ruby/* -) -for prefix in "${prefixes[@]}"; do - if [[ -d "$prefix/bin" ]]; then - export PATH="$prefix/bin:$PATH" - fi -done - -# Ruby -for dir in "$HOME"/.prefix/lib; do - if [[ -d "$dir" ]]; then - export RUBYLIB="$dir" - fi -done -unset prefixes dir prefix - -# TMPDIR ############################################################# - -if [[ ! -d "$HOME/tmp" ]]; then - tmp="$(mktemp --tmpdir -d "$USER-tmpdir.XXXXXXXXXXXXXXXXXXX")" - ln -sf "$tmp" "$HOME/tmp" - unset tmp -fi -export TMPDIR="$HOME/tmp" - -# XDG ################################################################ - -. "$HOME/.local/lib/xdg.sh" - -# Settings ########################################################### - -# Text editor -if [[ -f "$HOME/.selected_editor" ]]; then - . "$HOME/.selected_editor" - export SELECTED_EDITOR - export ALTERNATE_EDITOR - export EDITOR="${EDITOR:-$SELECTED_EDITOR}" - export VISUAL="${VISUAL:-$SELECTED_EDITOR}" -fi - -# GPG -if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then - export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` -fi -if [[ -z "$(pgrep -u `whoami` gpg-agent)" ]] && [[ -n $XDG_RUNTIME_DIR ]] && type gpg-agent &>/dev/null; then - mkdir -p "${XDG_RUNTIME_DIR}/sessions" - gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" &>/dev/null -fi -if [[ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]]; then - . "${XDG_RUNTIME_DIR}/sessions/gpg" - export GPG_AGENT_INFO - #export SSH_AUTH_SOCK -fi - -# Java -_JAVA_OPTIONS='' -_JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on' -_JAVA_OPTIONS+=' -Dswing.aatext=true' -_JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' -if [[ -n $TMPDIR ]]; then - _JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" -fi -export _JAVA_OPTIONS - -# X11 -if [[ -z $XAUTHORITY ]]; then - export XAUTHORITY=$HOME/.Xauthority -fi - -# D-Bus -if [[ -z $DBUS_SESSION_BUS_ADDRESS ]] && type dbus-launch &>/dev/null; then - # I want a separate instance for each login - #dbus-launch > "${HOME}/.cache/sessions/dbus" - #. "${HOME}/.cache/sessions/dbus" - eval `dbus-launch` - - export DBUS_SESSION_BUS_ADDRESS - export DBUS_SESSION_BUS_PID -fi - -# Load any box-specific stuff -if [[ -f "$HOME/.profile.local" ]]; then - . "$HOME/.profile.local" -fi diff --git a/.profile.local b/.profile.local deleted file mode 100644 index 25b322b..0000000 --- a/.profile.local +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# Start background programs ########################################## -if [ -x "`which daemon`" ]; then - daemon -i maildirproc.att maildirproc - daemon -i maildirproc.purdue maildirproc -r ~/.maildirproc/purdue.rc - daemon batterymon 20 " - amixer sset Master unmute 100%; - espeak 'PLUG ME IN'; - sleep .2;" -fi -- cgit v1.2.3-54-g00ecf