Updates.
authorJames Richardson <james@jamestechnotes.com>
Wed, 13 Feb 2019 17:19:14 +0000 (12:19 -0500)
committerJames Richardson <james@jamestechnotes.com>
Wed, 13 Feb 2019 17:19:14 +0000 (12:19 -0500)
.emacs.d/config/main.el
.emacs.d/config/mu4e.el
.emacs.d/config/org.el
.emacs.d/init.el
.environment
.gitconfig.jrichar-ws
.pbuilder.d/D01use-backports [new file with mode: 0755]
.pbuilder.d/D01use-experimental [new file with mode: 0755]
.pbuilder.d/D05deps [new file with mode: 0755]
.pbuilderrc

index 0e841cadedfc4da983b4c0893ab5e7db1a2c8f90..ca29bf8d6833dbdfda13842fe7297fc1ad225ff1 100644 (file)
       display-time-mail-file t)
 (display-time-mode t)
 (display-battery-mode t)
+
+;; I hate tabs
+(setq-default indent-tabs-mode nil)
index ff7b505794fbfefa976b963530554de170ae9828..25bc9fe3ff589629ad6cb1f87e3b9e11f58451db 100644 (file)
           ;; don't refile trash
           ((string-match-p "trash" maildir) maildir)
           ;; if /jrichar-lowes refile to /lowes-archive/YYYY
-          ((string-match-p "^/acct-1" maildir) (concat "/archives/spec01/mail." yearweek)) ;; merged acct-1 and acct-8
-          ((string-match-p "^/acct-8" maildir) (concat "/archives/spec01/mail." yearweek))
+          ((string-match-p "^/acct-1" maildir) (concat "/archives/spec01/mail." year)) ;; merged acct-1 and acct-8
+          ((string-match-p "^/acct-8" maildir) (concat "/archives/spec01/mail." year))
           ((string-match-p "^/acct-[2-7]" maildir) (concat "/archives/mail." year))
           ;; / is local
           ((string-match-p "^/$" maildir) (concat "/archives/mail." year))
index a358b57b2ea7b9d4578c0b42ea8237bc0225f2ad..8b118fec7e05cf9c37a159d254d72756f3f42841 100644 (file)
@@ -973,12 +973,12 @@ Late deadlines first, then scheduled, then non-late deadlines"
 (require 'ox-latex)
 (add-to-list 'org-latex-packages-alist '("" "minted"))
 (setq org-latex-listings 'minted)
-(setq org-latxex-minted-options
+(setq org-latex-minted-options
       '(("frame" "single")
         ("fontsize" "\\scriptsize")
        ;("xleftmargin" "50pt")
        ;("xrightmargin" "50pt")
-        ("linenos" "")))
+        ("linenos" "true")))
 ;; cywin doesn't have texi2dvi
 (if (eq system-type 'gnu/linux)
     (setq org-latex-pdf-process '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
index 499f579cafadce3201c53b9fb090b332a1247348..7647f32d1986538c1dc1be4af0d7b0fb3c94cb37 100644 (file)
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(icicle-command-abbrev-alist (quote ((cider-restart ## 1))))
+ '(jira-url "https://tools.lowes.com/jira/rpc/xmlrpc")
  '(mml-secure-key-preferences
    (quote
     ((OpenPGP
       (sign)
       (encrypt
+       ("j@mesrichardson.com" "8FD27619C19A2201CB1DE131EA1CF14BD8467AFB")
        ("james@jamestechnotes.com" "8FD27619C19A2201CB1DE131EA1CF14BD8467AFB")))
      (CMS
       (sign)
index 691e72496ff0120fa643fbe173bf67fe15461b4f..8e3a770988f6871a474cb3211e811f79bb685e16 100644 (file)
@@ -38,7 +38,7 @@ echo $PATH | grep guix-profile >/dev/null 2>&1 || PATH="$HOME/.guix-profile/bin:
 # Let's put $HOME/bin in front of everything.
 PATH=$HOME/bin${PATH:+:}$PATH
 export PATH
-
+[ -x /usr/share/info ] && export INFOPATH="/usr/share/info${INFOPATH:+:}$INFOPATH"
 [ -x $HOME/.guix-profile/share/info ] && export INFOPATH="$HOME/.guix-profile/share/info${INFOPATH:+:}$INFOPATH"
 [ -x $HOME/.private/share/info ] && export INFOPATH=$HOME/.private/share/info${INFOPATH:+:}$INFOPATH
 
index ad03226deda932386cac208e7551f329fd1f6338..04de78fa567f566317c679554718308c21e8d8aa 100644 (file)
@@ -11,3 +11,9 @@
        followTags = true
 [commit]
        gpgsign = true
+[format]
+       signoff = true
+#[log]
+#        showSignature = true
+[tag]
+        forceSignAnnotated = true
diff --git a/.pbuilder.d/D01use-backports b/.pbuilder.d/D01use-backports
new file mode 100755 (executable)
index 0000000..5e8e57f
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+[ ! -z ${USE_BACKPORTS} ] || exit 0
+
+
+# add xenial-backports
+echo "deb http://lxstrreposa01.lowes.com/genesis xenial-backports main universe multivers restricted" > /etc/apt/sources.list.d/xenial-backports.list
+cat > /etc/apt/preferences.d/xenial-backports << EOF
+Package: *
+Pin: release n=xenial-backports
+Pin-Priority: 999
+EOF
+
+apt-get -o APT::Sandbox::User=root update
+ls ${BUILDDIR}
+echo ${BUILDDIR}
diff --git a/.pbuilder.d/D01use-experimental b/.pbuilder.d/D01use-experimental
new file mode 100755 (executable)
index 0000000..07abf40
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+[ ! -z ${USE_EXPERIMENTAL} ] || exit 0
+
+
+# add infrastructure-experimental
+echo "deb http://lxstrreposa01.lowes.com/genesis infrastructure-experimental main" > /etc/apt/sources.list.d/infrastructure-experimental.list
+cat > /etc/apt/preferences.d/infrastructure-experimental << EOF
+Package: *
+Pin: release n=infrastructure-experimental
+Pin-Priority: 999
+EOF
+
+apt-get -o APT::Sandbox::User=root update
+ls ${BUILDDIR}
+echo ${BUILDDIR}
diff --git a/.pbuilder.d/D05deps b/.pbuilder.d/D05deps
new file mode 100755 (executable)
index 0000000..85c41e2
--- /dev/null
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+DEPSPATH="${DEPSBASE}/${DEPS}"
+if [ -n "${DEPS}" ] && [ -d "${DEPSPATH}" ]; then
+    apt-get install --assume-yes apt-utils
+    (cd "${DEPSPATH}"; apt-ftparchive packages . > Packages )
+    echo "deb [trusted=yes] file://${DEPSPATH} ./" >> /etc/apt/sources.list
+    apt-get update
+fi
index 12ea015e133d16319dc4a5d9906a5b78258ec849..fb7346c6e6fba11ec2a3112664200bbeaabd0d02 100644 (file)
@@ -1,66 +1,17 @@
 # -*- mode: shell-script; -*-
-set -x
-# Codenames for Debian
-UNSTABLE_CODENAME="sid"
-TESTING_CODENAME="buster"
-STABLE_CODENAME="stretch"
-STABLE_BACKPORTS_SUITE="${STABLE_CODENAME}-backports"
-set -x
-# list of Debian suites.
-DEBIAN_SUITES=("${UNSTABLE_CODENAME}" "${TESTING_CODENAME}" "${STABLE_CODENAME}" "unstable" "testing" "stable")
-
-# list of Ubuntu suites
-UBUNTU_SUITES=("xenial")
-
-#Mirrors to use
-[ -z "${DEBIAN_MIRROR}" ] && [ -r ~/.debian-mirror ] && DEBIAN_MIRROR=$(< ~/.debian-mirror)
-: ${DEBIAN_MIRROR:="archive.lab01.jamestechnotes.com"}
-[ -r ~/.ubuntu-mirror ] && UBUNTU_MIRROR=$(< ~/.ubuntu-mirror)
-: ${UBUNTU_MIRROR:="lxstrreposa01.lowes.com"}
-
-# Get dist from changelog if not set
-if [ -z "${DIST}" ] && [ -r "debian/changelog" ]; then
-    DIST=$(dpkg-parsechangelog | awk '/^Distribution: / {print $2}')
-    # use unstable for alfheim
-    if $(echo "alfheim UNRELEASED" | grep -q ${DIST}); then
-       DIST="${UNSTABLE_CODENAME}"
-    fi
-    # use unstable for experimental
-    if $(echo "experimental UNRELEASED" | grep -q ${DIST}); then
-       DIST="${UNSTABLE_CODENAME}"
-    fi
-    # use stable for backports
-    if $(echo "${STABLE_BACKPORTS_SUITE}" | grep -q ${DIST}); then
-       DIST="${STABLE_CODENAME}"
-    fi
-    # use xenial-genesis for infrastructure
-    if $(echo "infrastructure genesis" | grep -q ${DIST}); then
-       DIST="xenial-genesis"
-    fi
-fi
-
-# set DIST to unstable as default
-[ -r ~/.default-dist ] && : ${DIST:=$(< ~/.default-dist)}
-: ${DIST:="${UNSTABLE_CODENAME}"}
-
-# use release names
-case ${DIST} in
-    unstable)
-       DIST="${UNSTABLE_CODENAME}"
-       ;;
-    testing)
-       DIST="${TESTING_CODENAME}"
-       ;;
-    stable)
-       DIST="${STABLE_CODENAME}"
-       ;;
-esac
-
-# set architecture
-: ${ARCH:="$(dpkg --print-architecture)"}
-
-DEBOOTSTRAPOPTS=( "--force-check-gpg") # "--variant" "minbase") 
-
+# This pbuilderrc is to build debs for genesis (currenlty xenial based)
+umask 0022
+DEBOOTSTRAPOPTS=( '--force-check-gpg' '--no-merged-usr' '--variant=buildd' '--keyring=/usr/share/keyrings/genesis-archive-keyring.gpg') 
+#DEBOOTSTRAPOPTS=( '--force-check-gpg' '--variant=buildd' '--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg') 
+MIRRORSITE=http://lxstrreposa01.lowes.com/genesis
+#MIRRORSITE=http://archive.ubuntu.com/ubuntu
+COMPONENTS="main restricted universe multiverse"
+APTKEYRINGS=("/usr/share/keyrings/genesis-archive-keyring.gpg")
+OTHERMIRROR="deb [arch=amd64] http://lxstrreposa01.lowes.com/genesis infrastructure main|deb [arch=amd64] http://lxstrreposa01.lowes.com/genesis genesis main|deb [arch=amd64] http://lxstrreposa01.lowes.com/genesis 3rd-party binary main"
+#EXTRAPACKAGES=genesis-archive-keyring
+DIST=xenial-genesis
+#DIST=xenial
+ARCH=amd64
 NAME="${DIST}"
 if [ -n "${ARCH}" ]; then
     NAME="${NAME}-${ARCH}"
@@ -70,48 +21,16 @@ fi
 COMPRESSPROG="xz -8"
 BASETGZ="/var/cache/pbuilder/base-${NAME}.tar.xz"
 BASEPATH="/var/cache/pbuilder/base-${NAME}.cow"
-DISTRIBUTION="${DIST}"
+####DISTRIBUTION="${DIST}"
+DISTRIBUTION=xenial-genesis
 BUILDRESULT="/var/cache/pbuilder/${NAME}/result"
 APTCACHE="/var/cache/pbuilder/${NAME}/aptcache"
 BUILDPLACE="/var/cache/pbuilder/build/"
 ALLOWUNTRUSTED=no
-DEBBUILD_OPTS=
+DEBBUILD_OPTS="-i -b"
 SIGN=${DEBEMAIL}
 LOGLEVEL=D
 USECOLORS=no
-
-
-if $(echo ${DEBIAN_SUITES[@]} | grep -q ${DIST}); then
-    # Debian configuration
-    MIRRORSITE="https://${DEBIAN_MIRROR}/debian"
-    COMPONENTS="main contrib non-free"
-    DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/debian-archive-keyring.gpg")
-elif (echo ${DEBIAN_SUITES[@]} | grep -q ${DIST%%-james-technotes}); then
-    # Debian configuration
-    MIRRORSITE="https://mirror.lab01.jamestechnotes.com/debian"
-    COMPONENTS="main contrib non-free"
-    DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/james-technotes-archive-keyring.gpg")
-    #EXTRAPACKAGES="james-technotes-archive-keyring"
-    APTKEYRINGS=("/usr/share/keyrings/james-technotes-archive-keyring.gpg")
-elif (echo ${UBUNTU_SUITES[@]} | grep -q ${DIST}); then
-    # Ubuntu configuration
-    MIRRORSITE="https://${UBUNTU_MIRROR}/ubuntu"
-    COMPONENTS="main restricted universe multiverse"
-    DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg")
-elif (echo ${UBUNTU_SUITES[@]} | grep -q ${DIST%%-genesis}); then
-    set -x
-    # Ubuntu configuration
-    MIRRORSITE="http://${UBUNTU_MIRROR}/genesis"
-    COMPONENTS="main restricted universe multiverse"
-    DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/genesis-archive-keyring.gpg")
-    #EXTRAPACKAGES="genesis-archive-keyring"
-    #EXTRAPACKAGES="infgenesis-adduser infgenesis-base-passwd"
-    APTKEYRINGS=("/usr/share/keyrings/genesis-archive-keyring.gpg")
-    OTHERMIRROR="deb http://lxstrreposa01.lowes.com/genesis infrastructure main|deb http://lxstrreposa01.lowes.com/genesis genesis main|deb http://lxstrreposa01.lowes.com/genesis 3rd-party binary main"
-else
-    echo "Unknown distribution: ${DIST}"
-    exit 1
-fi
 EXTRAPACKAGES=${EXTRAPACKAGES}${EXTRAPACKAGES:+" "}"eatmydata"
 EATMYDATA=yes
 CCACHEDIR=/var/cache/pbuilder/ccache
@@ -120,4 +39,9 @@ AUTOCLEANAPTCACHE=yes
 PDEBUILD_PBUILDER=cowbuilder
 # set hookdir
 : ${HOOKDIR:="${HOME}/.pbuilder.d"}
-USENETWORK=${ENABLE_NETWORKING:=NO}
+#USENETWORK=${ENABLE_NETWORKING:=NO}
+if [ -n "${DEPS}" ]; then
+    export DEPSBASE=/var/cache/pbuilder/deps
+    BINDMOUNTS=${DEPSBASE}
+fi
+