From e161fa9a0936e64d519a4164e9643735959b8efa Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 3 Dec 2018 12:20:56 -0200
Subject: Add inkscape package.

---
 nixos/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ba986e4..5a4a52d 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -256,6 +256,7 @@
 
     ## GUI programs
 
+    inkscape
     calibre
     rhythmbox
     gpodder
-- 
cgit v1.2.3


From f2cc7b046501ebbf4c3b26018d0f964625e16d1a Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Thu, 6 Dec 2018 12:18:48 -0200
Subject: WIP: add custom version of Node.js.

---
 nixos/configuration.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 5a4a52d..e94b782 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -73,12 +73,23 @@
         url = "https://github.com/NixOS/nixpkgs/archive/18.03.zip";
         sha256 = "0hk4y2vkgm1qadpsm4b0q1vxq889jhxzjx3ragybrlwwg54mzp4f";
       }) {};
+
       timidityWithEvenMoreFormats = with pkgs; timidity.overrideAttrs (oldAttrs: {
         configureFlags = oldAttrs.configureFlags ++ [ "--enable-audio=vorbis,flac" ];
         buildInputs = oldAttrs.buildInputs ++ [ libogg libvorbis flac ];
       });
+
+      # https://github.com/nixos/nixpkgs/blob/0d202221f98e500f1df79112dc464d013eefcdae/pkgs/development/web/nodejs/v10.nix#L4
+      buildNodejs = pkgs.callPackage <nixpkgs/pkgs/development/web/nodejs/nodejs.nix> {};
+      nodejs-10_14_1 = buildNodejs {
+        enableNpm = true;
+        version = "10.14.1";
+        sha256 = "0d5hg8hf4c1sshh77a6hy944bzm3q3ipqggbyim61q3r2szngvrx";
+        # Uses HTTPS (https://github.com/nixos/nixpkgs/blob/0d202221f98e500f1df79112dc464d013eefcdae/pkgs/development/web/nodejs/nodejs.nix#L45), safer to trust the hash (unless it's already compromised :shrug:)
+      };
     in with pkgs; [
-      pkgsUnstable.nodejs-10_x
+     pkgsUnstable.nodejs-10_x
+     # nodejs-10_14_1
 
     ## Personal data tools
 
-- 
cgit v1.2.3


From 7b7fa5d425437a7efa4eef3aaa820798bfb9acaa Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 10 Dec 2018 05:38:04 -0200
Subject: Disable IPFS for now.

---
 nixos/configuration.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index e94b782..cea2ca3 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -375,9 +375,9 @@
 
     # https://nixos.org/nixos/options.html#ipfs
     ipfs = {
-      enable = true;
-      enableGC = true;
-      autoMount = true;
+      enable = false;
+      enableGC = false;
+      autoMount = false;
     };
   };
 
-- 
cgit v1.2.3


From dd3608c72459b5508bd183d79d0be041bf45e13e Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 16 Dec 2018 13:52:50 -0200
Subject: Replace rust packages with rustup.

---
 nixos/configuration.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index cea2ca3..f9137c1 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -224,8 +224,7 @@
     openjdk
     solc
     bundler
-    rustc
-    rustfmt
+    rustup
     cargo
     clojure    # =clj=
     visualvm   # JVM profiling tool
-- 
cgit v1.2.3


From f163ca2351fe798cc1e50623ef274080b9cf91b6 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Fri, 21 Dec 2018 16:05:50 -0200
Subject: Add save-exact=true to npmrc configuration.

---
 nixos/npmrc.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nixos')

diff --git a/nixos/npmrc.sh b/nixos/npmrc.sh
index 2bc28dc..326ac0b 100644
--- a/nixos/npmrc.sh
+++ b/nixos/npmrc.sh
@@ -1 +1,4 @@
 prefix="~/.npm-packages"
+# Taken from:
+# http://www.tomsquest.com/blog/2018/10/better-npm-ing/
+save-exact=true
-- 
cgit v1.2.3


From 58eb3754ce258a7a1fe2f8d399aa15310e92c8ec Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 22 Dec 2018 18:20:48 -0200
Subject: Install languagetool package.

---
 nixos/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index f9137c1..36e2cb1 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -196,6 +196,7 @@
     ## Spell checking
 
     (aspellWithDicts (ps : with ps; [ en eo fr pt_BR ]))
+    languagetool
 
 
     ## NixOS
-- 
cgit v1.2.3


From 5fb50dc53a1bfdcda9083d1121709bdfde5d8eb9 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 29 Dec 2018 06:27:07 -0200
Subject: Add cp-todos.sh cronJob.

---
 nixos/configuration.nix | 8 +++++++-
 scripts/cp-todos.sh     | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 36e2cb1..ba0054f 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -311,7 +311,13 @@
   services = {
     cron.enable = true;
     # We can see the actual generated crontab at /etc/crontab
-    cron.systemCronJobs = ["0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s"];
+    cron.systemCronJobs = [
+      # Sync emails with mbsync every hour
+      "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s"
+
+      # Make read-only copy of TODOs.org every hour
+      "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/cp-todos.sh -s"
+    ];
 
     xserver = {
       enable = true;
diff --git a/scripts/cp-todos.sh b/scripts/cp-todos.sh
index 4ec8962..5ec5a0f 100755
--- a/scripts/cp-todos.sh
+++ b/scripts/cp-todos.sh
@@ -1 +1,2 @@
 cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/Notes/org.txt"
+cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/cache/TODOs.org"
-- 
cgit v1.2.3


From 6ce89ab1bab8e5e356d3750b5adef38ae17956fe Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 29 Dec 2018 06:28:44 -0200
Subject: Add android_sdk_accept_license Nix configuration.

---
 nixos/configuration.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ba0054f..a662943 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -299,7 +299,11 @@
     chromium
   ];
 
-  nixpkgs.config.allowUnfree = true; # Require for slack (unfree) derivation
+  nixpkgs.config = {
+    android_sdk.accept_license = true;
+    allowUnfree = true; # Require for slack (unfree) derivation
+  };
+
 
   # Look at
   # https://www.vivaolinux.com.br/topico/Off-Code-Cafe/Me-apresente-sua-distro
-- 
cgit v1.2.3


From f939de99759d03609cfddfefd23720095478f35f Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 29 Dec 2018 17:26:42 -0200
Subject: Explicitly add Perl as an OS dependency.

---
 nixos/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index a662943..a0fcd01 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -235,6 +235,7 @@
     rakudo
     bats
     ledger
+    perl
 
 
     ## Containers and VMs
-- 
cgit v1.2.3


From 5da03439de70f1441c19d7354bec204783805654 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 29 Dec 2018 17:26:54 -0200
Subject: Add =slugify= command.

---
 nixos/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index a0fcd01..85de39c 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -178,6 +178,7 @@
     ncdu
     fd
     nnn
+    python36Packages.python-slugify
 
     diffoscope                 #
     poppler_utils              # used by diffoscope for comparing PDF files
-- 
cgit v1.2.3


From 73e02164cc78eca1b6e52aa4802972d681bab439 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 29 Dec 2018 18:05:14 -0200
Subject: Set Perl indentation to 2 spaces.

---
 nixos/configuration.nix | 1 +
 spacemacs.el            | 1 +
 2 files changed, 2 insertions(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 85de39c..c7de036 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -170,6 +170,7 @@
     gitlab-runner
     sshpass
     zathura                    # for viewing Emacs PDF files
+    nvi
     cacert
     gtypist
     pandoc
diff --git a/spacemacs.el b/spacemacs.el
index c28ddf0..d8493b2 100644
--- a/spacemacs.el
+++ b/spacemacs.el
@@ -689,6 +689,7 @@ This is the place where most of your configurations should be done. Unless it is
         sh-basic-offset 2
         sh-indentation 2
         smie-indent-basic 2
+        perl-indent-level 2
 
         ;; Clojure
         cljr-warn-on-eval nil
-- 
cgit v1.2.3


From 732b265063bdbeca9ad00cec4ad3a61f74412641 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 30 Dec 2018 15:02:54 -0200
Subject: Install vipe, bazel and graphviz packages.

---
 nixos/configuration.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index c7de036..125d452 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -180,6 +180,9 @@
     fd
     nnn
     python36Packages.python-slugify
+    moreutils                  # =vipe=
+    bazel
+    graphviz                   # =dot= and others
 
     diffoscope                 #
     poppler_utils              # used by diffoscope for comparing PDF files
-- 
cgit v1.2.3


From 78195626c1d601eb9fb4e6f37992887f15454763 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 30 Dec 2018 22:36:43 -0200
Subject: Add shellcheck, github-backup and node2nix packages.

---
 nixos/configuration.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 125d452..657c37b 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -242,6 +242,9 @@
     ledger
     perl
 
+    nodePackages.node2nix
+    shellcheck
+    (haskell.lib.justStaticExecutables haskellPackages.github-backup)
 
     ## Containers and VMs
 
-- 
cgit v1.2.3


From 67e642010bebd95b133592fc81637360d8fae0f0 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 30 Dec 2018 22:37:39 -0200
Subject: Start playing with Dhall to generate yaml.

---
 dhall/dhall-gen.sh      |  7 +++++++
 dhall/repos.txt         |  1 +
 dhall/sr-ht-build.dhall | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 nixos/configuration.nix |  3 ++-
 scripts/dhall-gen.sh    |  1 +
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100755 dhall/dhall-gen.sh
 create mode 100644 dhall/repos.txt
 create mode 100644 dhall/sr-ht-build.dhall
 create mode 120000 scripts/dhall-gen.sh

(limited to 'nixos')

diff --git a/dhall/dhall-gen.sh b/dhall/dhall-gen.sh
new file mode 100755
index 0000000..9bba429
--- /dev/null
+++ b/dhall/dhall-gen.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+REPOS_PATH="$HOME/dev/libre"
+
+for repo in $(cat repos.txt); do
+  dhall 2> /dev/null <<< "./sr-ht-build.dhall \"$repo\"" | dhall-to-json --pretty > "$REPOS_PATH/$repo/.build.yml"
+done
diff --git a/dhall/repos.txt b/dhall/repos.txt
new file mode 100644
index 0000000..0154e4c
--- /dev/null
+++ b/dhall/repos.txt
@@ -0,0 +1 @@
+website
diff --git a/dhall/sr-ht-build.dhall b/dhall/sr-ht-build.dhall
new file mode 100644
index 0000000..41b937b
--- /dev/null
+++ b/dhall/sr-ht-build.dhall
@@ -0,0 +1,47 @@
+--    let buildTemplate =
+            λ ( repoName
+              : Text
+              )
+          → { image =
+                "debian/stretch"
+            , packages =
+                [ "curl" ]
+            , triggers =
+                [ { condition =
+                      "failure"
+                  , action =
+                      "email"
+                  , to =
+                      "EuAndreh <eu@euandre.org>"
+                  }
+                ]
+            , sources =
+                [ "https://git.sr.ht/~euandreh/" ++ repoName ]
+            , secrets =
+                [ "7159f943-811f-402d-bb6d-37cd764dc728" ]
+            , tasks =
+                [ { mapKey =
+                      "setup"
+                  , mapValue =
+                      ''
+                      curl https://nixos.org/nix/install | sh
+                      echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.buildenv''
+                  },
+                  { mapKey =
+                      "test"
+                  , mapValue =
+                      ''
+                      cd ${repoName}/
+                      nix-build -A test''
+                  },
+                  { mapKey =
+                      "publish"
+                  , mapValue =
+                      ''
+                      cd ${repoName}/
+                      nix-build -A publishScript
+                      source env.sh
+                      ./result/bin/publish.sh''
+                  }
+                ]
+            }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 657c37b..cfa4b02 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -241,7 +241,8 @@
     bats
     ledger
     perl
-
+    dhall
+    dhall-json
     nodePackages.node2nix
     shellcheck
     (haskell.lib.justStaticExecutables haskellPackages.github-backup)
diff --git a/scripts/dhall-gen.sh b/scripts/dhall-gen.sh
new file mode 120000
index 0000000..75b8290
--- /dev/null
+++ b/scripts/dhall-gen.sh
@@ -0,0 +1 @@
+../dhall/dhall-gen.sh
\ No newline at end of file
-- 
cgit v1.2.3


From b679e7d91f7af2d97bead966a17b715cdb020b1a Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Thu, 3 Jan 2019 06:12:39 -0200
Subject: Fix shellcheck ofsenses on bash scripts.

---
 bash/agents.sh                  |   3 +-
 bash/aliases.sh                 |  13 ++++---
 bash/bash_profile.sh            |   2 +
 bash/bashrc.sh                  |   5 ++-
 bash/colors.sh                  |   3 +-
 bash/env.sh                     |   2 +-
 bash/facepalm/rotten-apple.sh   |   4 +-
 bash/fake-symlinks.sh           |  26 ++++++++++---
 bash/init.sh                    |  12 +++---
 bash/npm.sh                     |   4 +-
 bash/platform.sh                |   4 +-
 bash/symlinks.sh                |  80 ++++++++++++++++++++--------------------
 bash/tmuxinator-templates.sh    |   9 -----
 bash/util.sh                    |  32 ++++++++--------
 bash/youtube.sh                 |   2 +-
 dhall/dhall-gen.sh              |   7 ----
 dhall/repos.txt                 |   1 -
 dhall/sr-ht-build.dhall         |  47 -----------------------
 encrypted/env.sh                | Bin 3340 -> 3342 bytes
 encrypted/nu/nurc.sh            | Bin 4124 -> 4240 bytes
 encrypted/scripts/video-feed.sh | Bin 3061 -> 3071 bytes
 nixos/npmrc.sh                  |   3 +-
 scripts/backup.sh               |  12 +++---
 scripts/cp-todos.sh             |   2 +
 scripts/dhall-gen.sh            |   1 -
 scripts/gc.sh                   |  12 +++---
 scripts/mail.sh                 |   2 +
 scripts/once-only-nextcloud.sh  |   2 +-
 scripts/single-monitor.sh       |   2 +-
 scripts/startx                  |   2 +-
 scripts/three-monitors.sh       |   2 +-
 templates/sr-ht-build.dhall     |  47 +++++++++++++++++++++++
 vps/push-receive-redeploy.sh    |   4 +-
 xmonad/xsession.sh              |   2 +
 34 files changed, 178 insertions(+), 171 deletions(-)
 delete mode 100755 bash/tmuxinator-templates.sh
 delete mode 100755 dhall/dhall-gen.sh
 delete mode 100644 dhall/repos.txt
 delete mode 100644 dhall/sr-ht-build.dhall
 delete mode 120000 scripts/dhall-gen.sh
 create mode 100644 templates/sr-ht-build.dhall

(limited to 'nixos')

diff --git a/bash/agents.sh b/bash/agents.sh
index 5dec196..d49757b 100644
--- a/bash/agents.sh
+++ b/bash/agents.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2015
 
 eval "$(thefuck --alias f)"
 
@@ -11,13 +12,11 @@ start_agent() {
   ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
   echo succeeded
   chmod 600 "${SSH_ENV}"
-  # shellcheck source=/dev/null
   . "${SSH_ENV}" > /dev/null
   ssh-add
 }
 
 [ -f "${SSH_ENV}" ] && {
-  # shellcheck source=/dev/null
   . "${SSH_ENV}" > /dev/null
   pgrep ^ssh-agent$ > /dev/null || {
     start_agent
diff --git a/bash/aliases.sh b/bash/aliases.sh
index 403709c..52d24b4 100644
--- a/bash/aliases.sh
+++ b/bash/aliases.sh
@@ -8,13 +8,14 @@ alias l="ls -lahp"
 alias ll="ls -lhp"
 alias yt-dl="yt_dl"
 isLinux && {
-  alias copy="tr -d '\n' | xclip -sel clip"
+  alias copy="tr -d '\\n' | xclip -sel clip"
 }
 isMac && {
-  alias copy="tr -d '\n' | pbcopy"
+  alias copy="tr -d '\\n' | pbcopy"
 }
-alias trim="tr -d '\n'"
-alias lower="tr [:upper:] [:lower:]"
+alias trim="tr -d '\\n'"
+alias lowercase="tr [:upper:] [:lower:]"
+alias lc="tr [:upper:] [:lower:]"
 alias pia-vpn="sudo openvpn --config $DOTFILES/VPN/euandreh.ovpn"
 # Source: https://unix.stackexchange.com/questions/25327/watch-command-alias-expansion#25329
 alias watch="watch --color "
@@ -31,9 +32,9 @@ alias fim="play $DOTFILES/bash/Positive.ogg &> /dev/null"
 alias mux="tmuxinator"
 
 u() {
-  pushd ~/annex > /dev/null;
+  pushd ~/annex > /dev/null || exit 1;
   git annex info --fast | grep available;
-  popd > /dev/null;
+  popd > /dev/null || exit 1;
 }
 export -f u
 
diff --git a/bash/bash_profile.sh b/bash/bash_profile.sh
index 12ce7f9..41bc7e9 100644
--- a/bash/bash_profile.sh
+++ b/bash/bash_profile.sh
@@ -1 +1,3 @@
+#!/usr/bin/env bash
+
 source ~/annex/dev/code/dotfiles/bash/bashrc.sh
diff --git a/bash/bashrc.sh b/bash/bashrc.sh
index d06692b..a895df1 100644
--- a/bash/bashrc.sh
+++ b/bash/bashrc.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 export DOTFILES=~/annex/dev/code/dotfiles
 
 source $DOTFILES/bash/platform.sh
@@ -10,7 +12,6 @@ source $DOTFILES/bash/agents.sh
 source $DOTFILES/bash/init.sh
 source $DOTFILES/bash/symlinks.sh
 source $DOTFILES/bash/youtube.sh
-source $DOTFILES/bash/tmuxinator-templates.sh
 source $DOTFILES/bash/facepalm/rotten-apple.sh
 source $DOTFILES/bash/npm.sh
 source $DOTFILES/bash/x.sh
@@ -28,7 +29,7 @@ export PATH="$HOME/annex/dev/code/songbooks/cli:$PATH"
 alias sb="songbooks"
 
 isLinux && {
-  source "$(dirname $(readlink $(which autojump)))/../share/autojump/autojump.bash"
+  source "$(dirname "$(readlink "$(command -v autojump)")")/../share/autojump/autojump.bash"
 }
 
 export PATH="$HOME/.perl6/bin:$PATH"
diff --git a/bash/colors.sh b/bash/colors.sh
index 90cabc4..68acb06 100644
--- a/bash/colors.sh
+++ b/bash/colors.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=1117 disable=1004 disable=2034 disable=2154
 
 #  Customize BASH PS1 prompt to show current GIT repository and branch.
 #  by Mike Stewart - http://MediaDoneRight.com
@@ -208,7 +209,7 @@ function lightblueb {
 }
 export -f lightblueb
 
-function ,colors {
+function colors {
   black "black"
   blackb "blackb"
   white "white"
diff --git a/bash/env.sh b/bash/env.sh
index 8ac8a25..5a09663 100644
--- a/bash/env.sh
+++ b/bash/env.sh
@@ -33,7 +33,7 @@ export EDITOR=vi
 export PATH="$DOTFILES/scripts/:$PATH"
 export PATH="$DOTFILES/encrypted/scripts/:$PATH"
 export INPUTRC=~/.inputrc
-export CACHE_DIR="~/Nextcloud/cache"
+export CACHE_DIR="$HOME/Nextcloud/cache"
 export PATH="$HOME/dev/libre/website/:$PATH"
 
 
diff --git a/bash/facepalm/rotten-apple.sh b/bash/facepalm/rotten-apple.sh
index 50d85c8..222a2b0 100644
--- a/bash/facepalm/rotten-apple.sh
+++ b/bash/facepalm/rotten-apple.sh
@@ -6,8 +6,8 @@ isMac && {
   alias limpar-derived-data="rm -rf ~/Library/Developer/Xcode/DerivedData/"
   alias fim="afplay $DOTFILES/bash/facepalm/Positive.mp3"
 
-  if [ -f $(brew --prefix)/etc/bash_completion ]; then
-    . $(brew --prefix)/etc/bash_completion
+  if [ -f "$(brew --prefix)/etc/bash_completion" ]; then
+    . "$(brew --prefix)/etc/bash_completion"
   fi
 
   [ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion
diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh
index 336f0c5..3927b0c 100644
--- a/bash/fake-symlinks.sh
+++ b/bash/fake-symlinks.sh
@@ -1,19 +1,33 @@
 #!/usr/bin/env bash
 
 if [[ -n "$GITHUB_TOKEN" ]]; then
-  cat $DOTFILES/git/gitconfig.ini | envsubst > ~/.gitconfig
+  envsubst < "$DOTFILES/git/gitconfig.ini" > ~/.gitconfig
 fi
 
 
-SRHT_REPOS=("website" "mentat" "cement" "pouchdb-materialized-view" "pires" "superlogin" "superlogin-client")
+SRHT_REPOS=(website mentat cement pouchdb-materialized-view pires superlogin superlogin-client)
 SRHT_REPOS_PATH="$HOME/dev/libre"
 
-for repo in ${SRHT_REPOS[@]}; do
-  cat $DOTFILES/templates/sr-ht-build.yaml | REPO="$repo" envsubst > "$SRHT_REPOS_PATH/$repo/.build.yml"
+for repo in "${SRHT_REPOS[@]}"; do
+  REPO="$repo" envsubst < "$DOTFILES/templates/sr-ht-build.yaml" > "$SRHT_REPOS_PATH/$repo/.build.yml"
 done
 
-for repo in ${SRHT_REPOS[@]}; do
+for repo in "${SRHT_REPOS[@]}"; do
   if [[ "$repo" != "website" ]]; then
-    cat "$DOTFILES/templates/env.sh" | REPO="$repo" envsubst > "$SRHT_REPOS_PATH/$repo/env.sh"
+    REPO="$repo" envsubst < "$DOTFILES/templates/env.sh" > "$SRHT_REPOS_PATH/$repo/env.sh"
   fi
 done
+
+mkdir -p ~/.tmuxinator
+
+TMUXINATOR_TEMPLATES=(annex pires songbooks sosps)
+
+for template in "${TMUXINATOR_TEMPLATES[@]}"; do
+  cp "$DOTFILES/tmux/projects/$template.yml" "$HOME/.tmuxinator/$template.yml"
+done
+
+# DHALL_BUILD_REPOS=(website)
+
+# for repo in "${DHALL_BUILD_REPOS[@]}"; do
+#   dhall 2> /dev/null <<< "./sr-ht-build.dhall \"$repo\"" | dhall-to-json --pretty > "$SRHT_REPOS_PATH/$repo/.build.yml"
+# done
diff --git a/bash/init.sh b/bash/init.sh
index 777a322..4e0ee65 100644
--- a/bash/init.sh
+++ b/bash/init.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
 locked_init() {
-  pushd ~/ > /dev/null
+  pushd ~/ > /dev/null || exit 1
 
   mkdir -p ~/.emacs.d/.cache/
-  mkdir -p $(dirname "$AUTOJUMP_TXT")
+  mkdir -p "$(dirname "$AUTOJUMP_TXT")"
   touch "$AUTOJUMP_TXT"
 
   # clone all missing repos
@@ -13,12 +13,12 @@ locked_init() {
   printf "" > /tmp/mr-repos
   mr inject > /dev/null
 
-  printf "(\n" > /tmp/mr-projectile
+  printf "(\\n" > /tmp/mr-projectile
   sed -E 's/\/home\/andreh/~/' /tmp/mr-repos | awk '{print "\""$1"/""\""}' >> /tmp/mr-projectile
   printf ")" >> /tmp/mr-projectile
   cp /tmp/mr-projectile ~/.emacs.d/.cache/projectile-bookmarks.eld
 
-  popd > /dev/null
+  popd > /dev/null || exit 1
 }
 export -f locked_init
 
@@ -32,7 +32,7 @@ export -f locked_init
 
 # Tests
 
-pushd $DOTFILES > /dev/null
+pushd "$DOTFILES" > /dev/null || exit 1
 
 sizes=$(git diff-files --ignore-submodules | awk '{print $6}' | xargs du | awk '{print $1}')
 for size in $sizes; do
@@ -42,4 +42,4 @@ for size in $sizes; do
   fi
 done
 
-popd > /dev/null
+popd > /dev/null || exit 1
diff --git a/bash/npm.sh b/bash/npm.sh
index c23c074..7fbe4f7 100644
--- a/bash/npm.sh
+++ b/bash/npm.sh
@@ -2,9 +2,9 @@
 
 # FIXME: port to NixOS
 npm_i() {
-  (which $1 &> /dev/null) || {
+  (command -v "$1" &> /dev/null) || {
     yellow "Installing $2"
-    npm i -g $2
+    npm i -g "$2"
   }
 }
 
diff --git a/bash/platform.sh b/bash/platform.sh
index efa5061..eb262e9 100644
--- a/bash/platform.sh
+++ b/bash/platform.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
 isMac () {
-    [[ `uname` == 'Darwin' ]]
+  [[ "$(uname)" == 'Darwin' ]]
 }
 
 isLinux () {
-    [[ `uname` == 'Linux' ]]
+  [[ "$(uname)" == 'Linux' ]]
 }
 
 isMac && {
diff --git a/bash/symlinks.sh b/bash/symlinks.sh
index 39d0a0b..e56ee58 100644
--- a/bash/symlinks.sh
+++ b/bash/symlinks.sh
@@ -1,77 +1,77 @@
 #!/usr/bin/env bash
 
 function upsert_dir_symlink() {
-  local readonly from="$1"
-  local readonly to="$2"
-  ([ -d "$to" ] || [ -L "$to" ]) || {
+  local from="$1"
+  local to="$2"
+  { [ -d "$to" ] || [ -L "$to" ]; } || {
     ln -s "$from" "$to"
   }
 }
 export -f upsert_dir_symlink
 
-upsert_dir_symlink $DOTFILES/encrypted/borg   ~/.config/borg
+upsert_dir_symlink "$DOTFILES/encrypted/borg"   ~/.config/borg
 
-ln -fs $DOTFILES/bash/bashrc.sh               ~/.bashrc
-ln -fs $DOTFILES/bash/bash_profile.sh         ~/.bash_profile
-ln -fs $DOTFILES/git/gitattributes            ~/.gitattributes
-ln -fs $DOTFILES/git/gitignore                ~/.gitignore_global
-ln -fs $DOTFILES/git/bash_git.sh              ~/.bash_git
-ln -fs $DOTFILES/encrypted/nugitconfig.ini    ~/.nugitconfig
-ln -fs $DOTFILES/sbclrc.lisp                  ~/.sbclrc
-ln -fs $DOTFILES/inputrc.conf                 ~/.inputrc
-ln -fs $DOTFILES/Xmodmap.conf                 ~/.Xmodmap
+ln -fs "$DOTFILES/bash/bashrc.sh"               ~/.bashrc
+ln -fs "$DOTFILES/bash/bash_profile.sh"         ~/.bash_profile
+ln -fs "$DOTFILES/git/gitattributes"            ~/.gitattributes
+ln -fs "$DOTFILES/git/gitignore"                ~/.gitignore_global
+ln -fs "$DOTFILES/git/bash_git.sh"              ~/.bash_git
+ln -fs "$DOTFILES/encrypted/nugitconfig.ini"    ~/.nugitconfig
+ln -fs "$DOTFILES/sbclrc.lisp"                  ~/.sbclrc
+ln -fs "$DOTFILES/inputrc.conf"                 ~/.inputrc
+ln -fs "$DOTFILES/Xmodmap.conf"                 ~/.Xmodmap
 isLinux && {
-  ln -fs $DOTFILES/nixos/npmrc.sh             ~/.npmrc
+  ln -fs "$DOTFILES/nixos/npmrc.sh"             ~/.npmrc
 }
 
 ## SSH config
 mkdir -p ~/.ssh
-ln -fs $DOTFILES/ssh_config.conf              ~/.ssh/config
+ln -fs "$DOTFILES/ssh_config.conf"              ~/.ssh/config
 
-ln -fs $DOTFILES/git/mrconfig.ini             ~/.mrconfig
+ln -fs "$DOTFILES/git/mrconfig.ini"             ~/.mrconfig
 
-upsert_dir_symlink $MEDIA_PREFIX/UTCLOUD      ~/UTCLOUD
-upsert_dir_symlink $MEDIA_PREFIX/SNEAKER      ~/SNEAKER
+upsert_dir_symlink "$MEDIA_PREFIX/UTCLOUD"      ~/UTCLOUD
+upsert_dir_symlink "$MEDIA_PREFIX/SNEAKER"     ~/SNEAKER
 
 ## Clojure
 mkdir -p ~/.lein ~/.clojure
-ln -fs $DOTFILES/lein/profiles.clj            ~/.lein/profiles.clj
-ln -fs $DOTFILES/lein/deps.edn                ~/.clojure/deps.edn
+ln -fs "$DOTFILES/lein/profiles.clj"            ~/.lein/profiles.clj
+ln -fs "$DOTFILES/lein/deps.edn"                ~/.clojure/deps.edn
 
 ## AWS
 mkdir -p ~/.aws
-ln -fs $DOTFILES/encrypted/aws/config         ~/.aws/config
-ln -fs $DOTFILES/encrypted/aws/credentials    ~/.aws/credentials
+ln -fs "$DOTFILES/encrypted/aws/config"         ~/.aws/config
+ln -fs "$DOTFILES/encrypted/aws/credentials"    ~/.aws/credentials
 
 
 ## tmux
-ln -fs $DOTFILES/tmux/tmux.conf               ~/.tmux.conf
-ln -fs $DOTFILES/tmux/tmux-macos.conf         ~/.tmux-macos.conf
-ln -fs $DOTFILES/tmux/tmux-gnu-linux.conf     ~/.tmux-gnu-linux.conf
+ln -fs "$DOTFILES/tmux/tmux.conf"               ~/.tmux.conf
+ln -fs "$DOTFILES/tmux/tmux-macos.conf"         ~/.tmux-macos.conf
+ln -fs "$DOTFILES/tmux/tmux-gnu-linux.conf"     ~/.tmux-gnu-linux.conf
 
 ## NixOS
-ln -fs $DOTFILES/nixos/evince.destkop         ~/.local/share/applications/evince.desktop
-ln -fs $DOTFILES/nixos/firefox.destkop        ~/.local/share/applications/firefox.desktop
+ln -fs "$DOTFILES/nixos/evince.destkop"         ~/.local/share/applications/evince.desktop
+ln -fs "$DOTFILES/nixos/firefox.destkop"        ~/.local/share/applications/firefox.desktop
 
 ## Emacs
-mkdir -p $HOME/.emacs.d/private/layers/
-ln -fs $DOTFILES/spacemacs.el                 ~/.spacemacs
-ln -fs $DOTFILES/emacs/gnus.el                ~/.gnus.el
-ln -fs $CACHE_DIR/euandreh-auto-save.el       ~/.emacs.d/.cache/layouts/euandreh-auto-save
+mkdir -p "$HOME/.emacs.d/private/layers/"
+ln -fs "$DOTFILES/spacemacs.el"                 ~/.spacemacs
+ln -fs "$DOTFILES/emacs/gnus.el"                ~/.gnus.el
+ln -fs "$CACHE_DIR/euandreh-auto-save.el"       ~/.emacs.d/.cache/layouts/euandreh-auto-save
 
 ## xmonad
 mkdir -p ~/.xmonad
-ln -fs $DOTFILES/xmonad/xsession.sh           ~/.xsession
-ln -fs $DOTFILES/xmonad/xmonad.hs             ~/.xmonad/xmonad.hs
-ln -fs $DOTFILES/xmonad/xmobar.hs             ~/.xmobarrc
+ln -fs "$DOTFILES/xmonad/xsession.sh"           ~/.xsession
+ln -fs "$DOTFILES/xmonad/xmonad.hs"             ~/.xmonad/xmonad.hs
+ln -fs "$DOTFILES/xmonad/xmobar.hs"             ~/.xmobarrc
 
 ## Mail
 mkdir -p ~/mbsync/.notmuch/hooks ~/mbsync/EuAndreh ~/mbsync/Gmail ~/mbsync/Nubank
-ln -fs $DOTFILES/mail/notmuch-post.sh         ~/mbsync/.notmuch/hooks/post-new
-ln -fs $DOTFILES/mail/mbsyncrc.ini            ~/.mbsyncrc
-ln -fs $DOTFILES/mail/notmuch.ini             ~/.notmuch-config
-ln -fs /tmp/mbsync.$(date +%Y-%m-%d).log      /tmp/mbsync.log
-ln -fs /tmp/notmuch.$(date +%Y-%m-%d).log     /tmp/notmuch.log
+ln -fs "$DOTFILES/mail/notmuch-post.sh"         ~/mbsync/.notmuch/hooks/post-new
+ln -fs "$DOTFILES/mail/mbsyncrc.ini"            ~/.mbsyncrc
+ln -fs "$DOTFILES/mail/notmuch.ini"             ~/.notmuch-config
+ln -fs /tmp/mbsync."$(date +%Y-%m-%d)".log      /tmp/mbsync.log
+ln -fs /tmp/notmuch."$(date +%Y-%m-%d)".log     /tmp/notmuch.log
 
 ## GNUS
-ln -fs $DOTFILES/encrypted/IMAP/authinfo.gpg  ~/.authinfo.gpg
+ln -fs "$DOTFILES/encrypted/IMAP/authinfo.gpg"  ~/.authinfo.gpg
diff --git a/bash/tmuxinator-templates.sh b/bash/tmuxinator-templates.sh
deleted file mode 100755
index adbbb5c..0000000
--- a/bash/tmuxinator-templates.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-mkdir -p ~/.tmuxinator
-
-templates=(annex pires songbooks sosps)
-
-for template in ${templates[@]}; do
-  cp $DOTFILES/tmux/projects/$template.yml ~/.tmuxinator/$template.yml
-done
diff --git a/bash/util.sh b/bash/util.sh
index 833bc9c..e29d02f 100644
--- a/bash/util.sh
+++ b/bash/util.sh
@@ -1,20 +1,20 @@
 #!/usr/bin/env bash
 
 extract () {
-  if [ -f $1 ] ; then
-    case $1 in
-      *.tar.bz2)   tar xvjf $1    ;;
-      *.tar.gz)    tar xvzf $1    ;;
-      *.bz2)       bunzip2 $1     ;;
-      *.rar)       unrar x $1     ;;
-      *.gz)        gunzip $1      ;;
-      *.tar)       tar xvf $1     ;;
-      *.tbz2)      tar xvjf $1    ;;
-      *.tgz)       tar xvzf $1    ;;
-      *.zip)       unzip $1       ;;
-      *.Z)         uncompress $1  ;;
-      *.7z)        7z x $1        ;;
-      *.xz)        unxz $1        ;;
+  if [ -f "$1" ] ; then
+    case "$1" in
+      *.tar.bz2)   tar xvjf "$1"    ;;
+      *.tar.gz)    tar xvzf "$1"    ;;
+      *.bz2)       bunzip2 "$1"     ;;
+      *.rar)       unrar x "$1"     ;;
+      *.gz)        gunzip "$1"      ;;
+      *.tar)       tar xvf "$1"     ;;
+      *.tbz2)      tar xvjf "$1"    ;;
+      *.tgz)       tar xvzf "$1"    ;;
+      *.zip)       unzip "$1"       ;;
+      *.Z)         uncompress "$1"  ;;
+      *.7z)        7z x "$1"        ;;
+      *.xz)        unxz "$1"        ;;
       *)           echo "don't know how to extract '$1'..." ;;
     esac
   else
@@ -24,11 +24,11 @@ extract () {
 
 merkle-tree () {
   dirname="${1-.}"
-  pushd "$dirname" > /dev/null
+  pushd "$dirname" > /dev/null || exit 1
   find . -type f              | \
     sort                      | \
     xargs -I{} sha256sum "{}" | \
     sha256sum                 | \
     awk '{print $1}'
-  popd > /dev/null
+  popd > /dev/null || exit 1
 }
diff --git a/bash/youtube.sh b/bash/youtube.sh
index c40e0a7..19c9af0 100644
--- a/bash/youtube.sh
+++ b/bash/youtube.sh
@@ -2,7 +2,7 @@
 
 export DEFAULT_PLAYLIST_END=15
 export DEFAULT_INC_STEP=10
-export YT_TEMPLATE="~/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s"
+export YT_TEMPLATE="$HOME/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s"
 
 # Always downloads video, doesn't look at the download-archive
 yt_dl() {
diff --git a/dhall/dhall-gen.sh b/dhall/dhall-gen.sh
deleted file mode 100755
index 9bba429..0000000
--- a/dhall/dhall-gen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-REPOS_PATH="$HOME/dev/libre"
-
-for repo in $(cat repos.txt); do
-  dhall 2> /dev/null <<< "./sr-ht-build.dhall \"$repo\"" | dhall-to-json --pretty > "$REPOS_PATH/$repo/.build.yml"
-done
diff --git a/dhall/repos.txt b/dhall/repos.txt
deleted file mode 100644
index 0154e4c..0000000
--- a/dhall/repos.txt
+++ /dev/null
@@ -1 +0,0 @@
-website
diff --git a/dhall/sr-ht-build.dhall b/dhall/sr-ht-build.dhall
deleted file mode 100644
index 41b937b..0000000
--- a/dhall/sr-ht-build.dhall
+++ /dev/null
@@ -1,47 +0,0 @@
---    let buildTemplate =
-            λ ( repoName
-              : Text
-              )
-          → { image =
-                "debian/stretch"
-            , packages =
-                [ "curl" ]
-            , triggers =
-                [ { condition =
-                      "failure"
-                  , action =
-                      "email"
-                  , to =
-                      "EuAndreh <eu@euandre.org>"
-                  }
-                ]
-            , sources =
-                [ "https://git.sr.ht/~euandreh/" ++ repoName ]
-            , secrets =
-                [ "7159f943-811f-402d-bb6d-37cd764dc728" ]
-            , tasks =
-                [ { mapKey =
-                      "setup"
-                  , mapValue =
-                      ''
-                      curl https://nixos.org/nix/install | sh
-                      echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.buildenv''
-                  },
-                  { mapKey =
-                      "test"
-                  , mapValue =
-                      ''
-                      cd ${repoName}/
-                      nix-build -A test''
-                  },
-                  { mapKey =
-                      "publish"
-                  , mapValue =
-                      ''
-                      cd ${repoName}/
-                      nix-build -A publishScript
-                      source env.sh
-                      ./result/bin/publish.sh''
-                  }
-                ]
-            }
diff --git a/encrypted/env.sh b/encrypted/env.sh
index af98c5c..e4ebb21 100644
Binary files a/encrypted/env.sh and b/encrypted/env.sh differ
diff --git a/encrypted/nu/nurc.sh b/encrypted/nu/nurc.sh
index a8532c2..b92a178 100644
Binary files a/encrypted/nu/nurc.sh and b/encrypted/nu/nurc.sh differ
diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh
index 6efa22d..a6e17d9 100755
Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ
diff --git a/nixos/npmrc.sh b/nixos/npmrc.sh
index 326ac0b..2669f85 100644
--- a/nixos/npmrc.sh
+++ b/nixos/npmrc.sh
@@ -1,4 +1,5 @@
-prefix="~/.npm-packages"
+# shellcheck disable=2148 disable=2034
+prefix="$HOME/.npm-packages"
 # Taken from:
 # http://www.tomsquest.com/blog/2018/10/better-npm-ing/
 save-exact=true
diff --git a/scripts/backup.sh b/scripts/backup.sh
index a33a630..6a4de25 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -6,12 +6,12 @@
 #
 
 if [ ! -d ~/UTCLOUD/ ]; then
-    red "~/UTCLOUD not attached. Backup not started."
+    red "$HOME/UTCLOUD not attached. Backup not started."
     exit 1
 fi
 
 if [ ! -d ~/borgbackup/ ]; then
-    yellow "~/borgbackup/ repository doesn't exist. Downloading latest version from ~/UTCLOUD/borg/borgbackup/ into ~/borgbackup/"
+    yellow "$HOME/borgbackup/ repository doesn't exist. Downloading latest version from ~/UTCLOUD/borg/borgbackup/ into ~/borgbackup/"
     # The initial borg repo was created with:
     # $ borg init --append-only --encryption=keyfile ~/borgbackup
     # See also: https://borgbackup.readthedocs.io/en/stable/usage/notes.html#append-only-mode
@@ -46,7 +46,7 @@ green "Done"
 #
 
 yellow "Backing up git repos"
-pushd ~/
+pushd ~/ || exit 1
 
 mr -s master
 mr -s status
@@ -54,13 +54,13 @@ mr -s -j16 update
 mr -s hd
 mr -s -j4 rsyncnet
 
-popd
+popd || exit 1
 
 yellow "Syncing annex"
-pushd ~/annex/
+pushd ~/annex/ || exit 1
 
 git annex sync
 
-popd
+popd || exit 1
 
 green "Done"
diff --git a/scripts/cp-todos.sh b/scripts/cp-todos.sh
index 5ec5a0f..d8e6f30 100755
--- a/scripts/cp-todos.sh
+++ b/scripts/cp-todos.sh
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+
 cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/Notes/org.txt"
 cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/cache/TODOs.org"
diff --git a/scripts/dhall-gen.sh b/scripts/dhall-gen.sh
deleted file mode 120000
index 75b8290..0000000
--- a/scripts/dhall-gen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../dhall/dhall-gen.sh
\ No newline at end of file
diff --git a/scripts/gc.sh b/scripts/gc.sh
index ac1b412..c4d3ec3 100755
--- a/scripts/gc.sh
+++ b/scripts/gc.sh
@@ -10,8 +10,8 @@ yellow "Cleaning up the NixOS store"
 
 profiles=(per-user/root/channels per-user/andreh/profile per-user/andreh/channels system)
 
-for p in ${profiles[@]}; do
-    sudo nix-env --delete-generations old -p /nix/var/nix/profiles/$p
+for p in "${profiles[@]}"; do
+    sudo nix-env --delete-generations old -p "/nix/var/nix/profiles/$p"
 done
 
 # Current profile, change when installing with =nix-env -iA nixpkgs.bsdgames=
@@ -36,11 +36,11 @@ sudo find /tmp -type f -atime +10 -delete
 yellow "Erasing docker images"
 
 echo y | docker system prune -a
-docker rmi $(docker images -a -q)
-docker rm $(docker ps -a -f status=exited -q)
+docker rmi "$(docker images -a -q)"
+docker rm "$(docker ps -a -f status=exited -q)"
 
-docker stop $(docker ps -a -q)
-docker rm $(docker ps -a -q)
+docker stop "$(docker ps -a -q)"
+docker rm "$(docker ps -a -q)"
 
 echo y | docker volume prune
 echo y | docker container prune
diff --git a/scripts/mail.sh b/scripts/mail.sh
index a7c8208..00c111f 100755
--- a/scripts/mail.sh
+++ b/scripts/mail.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if [ "$1" = "-s" ]; then
   mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log
 else
diff --git a/scripts/once-only-nextcloud.sh b/scripts/once-only-nextcloud.sh
index 8400080..7886b6f 100755
--- a/scripts/once-only-nextcloud.sh
+++ b/scripts/once-only-nextcloud.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 if [ "$(pidof nextcloud)" ]
 then
diff --git a/scripts/single-monitor.sh b/scripts/single-monitor.sh
index ec6c5e2..5b0d03e 100755
--- a/scripts/single-monitor.sh
+++ b/scripts/single-monitor.sh
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env bash
 xrandr --output VIRTUAL1 --off --output eDP1 --primary --mode 1920x1080 --pos 640x1440 --rotate normal --output DP1 --off --output HDMI2 --off --output HDMI1 --off --output DP2 --off
diff --git a/scripts/startx b/scripts/startx
index 9b1d153..cca34a2 100755
--- a/scripts/startx
+++ b/scripts/startx
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 sudo systemctl restart display-manager &
diff --git a/scripts/three-monitors.sh b/scripts/three-monitors.sh
index d1ef7c6..d8c4e53 100755
--- a/scripts/three-monitors.sh
+++ b/scripts/three-monitors.sh
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env bash
 xrandr --output VIRTUAL1 --off --output eDP1 --primary --mode 1920x1080 --pos 640x1440 --rotate normal --output DP1 --off --output HDMI2 --off --output HDMI1 --mode 2560x1440 --pos 0x0 --rotate normal --output DP2 --mode 2560x1440 --pos 2560x0 --rotate left
diff --git a/templates/sr-ht-build.dhall b/templates/sr-ht-build.dhall
new file mode 100644
index 0000000..41b937b
--- /dev/null
+++ b/templates/sr-ht-build.dhall
@@ -0,0 +1,47 @@
+--    let buildTemplate =
+            λ ( repoName
+              : Text
+              )
+          → { image =
+                "debian/stretch"
+            , packages =
+                [ "curl" ]
+            , triggers =
+                [ { condition =
+                      "failure"
+                  , action =
+                      "email"
+                  , to =
+                      "EuAndreh <eu@euandre.org>"
+                  }
+                ]
+            , sources =
+                [ "https://git.sr.ht/~euandreh/" ++ repoName ]
+            , secrets =
+                [ "7159f943-811f-402d-bb6d-37cd764dc728" ]
+            , tasks =
+                [ { mapKey =
+                      "setup"
+                  , mapValue =
+                      ''
+                      curl https://nixos.org/nix/install | sh
+                      echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.buildenv''
+                  },
+                  { mapKey =
+                      "test"
+                  , mapValue =
+                      ''
+                      cd ${repoName}/
+                      nix-build -A test''
+                  },
+                  { mapKey =
+                      "publish"
+                  , mapValue =
+                      ''
+                      cd ${repoName}/
+                      nix-build -A publishScript
+                      source env.sh
+                      ./result/bin/publish.sh''
+                  }
+                ]
+            }
diff --git a/vps/push-receive-redeploy.sh b/vps/push-receive-redeploy.sh
index 87fecd5..46a65bc 100755
--- a/vps/push-receive-redeploy.sh
+++ b/vps/push-receive-redeploy.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-cd ~/
+cd ~/ || exit 1
 docker pull registry.gitlab.com/euandreh/songbooks/prod:latest
 docker-compose stop songbooks_app
 docker-compose up -d --no-deps songbooks_app
diff --git a/xmonad/xsession.sh b/xmonad/xsession.sh
index b25a9a1..542994f 100644
--- a/xmonad/xsession.sh
+++ b/xmonad/xsession.sh
@@ -1 +1,3 @@
+#!/usr/bin/env bash
+
 xmonad
-- 
cgit v1.2.3


From 9276899be730b652ea663478ac5724edcfe78a5b Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 13 Jan 2019 16:14:16 -0200
Subject: Fix cronjob path and remove cp-todos.sh job.

---
 nixos/configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index cfa4b02..ea971cc 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -327,10 +327,10 @@
     # We can see the actual generated crontab at /etc/crontab
     cron.systemCronJobs = [
       # Sync emails with mbsync every hour
-      "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s"
+      "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/mail.sh -s"
 
       # Make read-only copy of TODOs.org every hour
-      "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/cp-todos.sh -s"
+      # "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/cp-todos.sh -s"
     ];
 
     xserver = {
-- 
cgit v1.2.3


From 7f7ac488a546805703533e3eeae10d78203de60b Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 14 Jan 2019 11:35:53 -0200
Subject: Install rustracer.

---
 nixos/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ea971cc..0e24b25 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -246,6 +246,7 @@
     nodePackages.node2nix
     shellcheck
     (haskell.lib.justStaticExecutables haskellPackages.github-backup)
+    rustracer
 
     ## Containers and VMs
 
-- 
cgit v1.2.3


From bafea5e5ecc629f701c9468b7518eaed516283a5 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 20 Jan 2019 22:59:27 -0200
Subject: Setup newsboat configuration.

---
 .gitattributes          |   1 +
 bash/env.sh             |   1 +
 bash/symlinks.sh        |   5 +++++
 newsboat/config         |   1 +
 newsboat/urls           | Bin 0 -> 589 bytes
 nixos/configuration.nix |   1 +
 6 files changed, 9 insertions(+)
 create mode 100644 newsboat/config
 create mode 100644 newsboat/urls

(limited to 'nixos')

diff --git a/.gitattributes b/.gitattributes
index 76d2343..74fe0d5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,4 @@ emacs/gnus.el filter=git-crypt diff=git-crypt
 emacs/not-much.el filter=git-crypt diff=git-crypt
 lein/deps.edn filter=git-crypt diff=git-crypt
 ssh_config.conf filter=git-crypt diff=git-crypt
+newsboat/urls filter=git-crypt diff=git-crypt
diff --git a/bash/env.sh b/bash/env.sh
index 3e63aa3..d8233be 100644
--- a/bash/env.sh
+++ b/bash/env.sh
@@ -37,6 +37,7 @@ export CACHE_DIR="$HOME/Nextcloud/cache"
 export PATH="$HOME/dev/libre/website/:$PATH"
 export PATH="$DOTFILES/bin:$PATH"
 export PATH="$HOME/dev/misc/flutter/bin:$PATH"
+#export BROWSER="firefox"
 
 
 
diff --git a/bash/symlinks.sh b/bash/symlinks.sh
index e56ee58..70e66af 100644
--- a/bash/symlinks.sh
+++ b/bash/symlinks.sh
@@ -49,6 +49,11 @@ ln -fs "$DOTFILES/tmux/tmux.conf"               ~/.tmux.conf
 ln -fs "$DOTFILES/tmux/tmux-macos.conf"         ~/.tmux-macos.conf
 ln -fs "$DOTFILES/tmux/tmux-gnu-linux.conf"     ~/.tmux-gnu-linux.conf
 
+## Newsboat
+mkdir -p ~/.newsboat
+ln -fs "$DOTFILES/newsboat/urls"                ~/.newsboat/urls
+ln -fs "$DOTFILES/newsboat/config"              ~/.newsboat/config
+
 ## NixOS
 ln -fs "$DOTFILES/nixos/evince.destkop"         ~/.local/share/applications/evince.desktop
 ln -fs "$DOTFILES/nixos/firefox.destkop"        ~/.local/share/applications/firefox.desktop
diff --git a/newsboat/config b/newsboat/config
new file mode 100644
index 0000000..a7998d9
--- /dev/null
+++ b/newsboat/config
@@ -0,0 +1 @@
+browser firefox
\ No newline at end of file
diff --git a/newsboat/urls b/newsboat/urls
new file mode 100644
index 0000000..444e1a7
Binary files /dev/null and b/newsboat/urls differ
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 0e24b25..fc48b78 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -240,6 +240,7 @@
     rakudo
     bats
     ledger
+    newsboat
     perl
     dhall
     dhall-json
-- 
cgit v1.2.3


From a5859fad8b43fbefc24f969b6f794c9a8abe797c Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 20 Jan 2019 23:34:12 -0200
Subject: Initial setup for buku.

---
 nixos/configuration.nix | 2 ++
 scripts/buku-add.sh     | 3 +++
 xmonad/xmonad.hs        | 5 +++++
 3 files changed, 10 insertions(+)
 create mode 100755 scripts/buku-add.sh

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index fc48b78..36a2474 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -248,6 +248,8 @@
     shellcheck
     (haskell.lib.justStaticExecutables haskellPackages.github-backup)
     rustracer
+    xsel
+    buku
 
     ## Containers and VMs
 
diff --git a/scripts/buku-add.sh b/scripts/buku-add.sh
new file mode 100755
index 0000000..beccd0a
--- /dev/null
+++ b/scripts/buku-add.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+xsel | xargs -I{} buku -a "{}" ril
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index dd46d25..1f7d47a 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -95,6 +95,11 @@ myKeyBindings =
       -- restart network
     , ((mod4Mask, xK_x),
        spawn "gksudo -S systemctl restart network-manager")
+
+      -- save selection (link) in buku
+    , ((mod4Mask, xK_c),
+       -- spawn "gksudo -S systemctl restart network-manager")
+       spawn "$HOME/dev/libre/dotfiles/scripts/buku-add.sh")
     ]
 
 startup :: X()
-- 
cgit v1.2.3


From 8d490839b7ef11549bee6c92fdd86ef60afd55e0 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 21 Jan 2019 01:25:07 -0200
Subject: Generate local RSS feed from buku tags.

---
 .gitignore              |   3 +++
 bash/aliases.sh         |   1 +
 newsboat/urls           | Bin 589 -> 653 bytes
 nixos/configuration.nix |   3 +++
 scripts/atom.js         |  22 ++++++++++++++++++++++
 scripts/atom.sh         |  19 +++++++++++++++++++
 6 files changed, 48 insertions(+)
 create mode 100644 scripts/atom.js
 create mode 100755 scripts/atom.sh

(limited to 'nixos')

diff --git a/.gitignore b/.gitignore
index e671f1e..68b7e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 mail/offlineimap.pyc
 tam_required
 /result
+
+/scripts/node_modules/
+/scripts/package-lock.json
\ No newline at end of file
diff --git a/bash/aliases.sh b/bash/aliases.sh
index 52d24b4..e8ff449 100644
--- a/bash/aliases.sh
+++ b/bash/aliases.sh
@@ -24,6 +24,7 @@ alias sbcl="rlwrap sbcl"
 alias du="ncdu --color dark"
 alias perl6="rlwrap perl6"
 alias m="mail.sh"
+alias a="atom.sh"
 
 alias gnome-control-center="XDG_CURRENT_DESKTOP=GNOME gnome-control-center"
 
diff --git a/newsboat/urls b/newsboat/urls
index 444e1a7..1047793 100644
Binary files a/newsboat/urls and b/newsboat/urls differ
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 36a2474..6f8c7e0 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -333,6 +333,9 @@
       # Sync emails with mbsync every hour
       "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/mail.sh -s"
 
+      # Refresh local RSS files every hour
+      "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/atom.sh"
+
       # Make read-only copy of TODOs.org every hour
       # "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/cp-todos.sh -s"
     ];
diff --git a/scripts/atom.js b/scripts/atom.js
new file mode 100644
index 0000000..878df05
--- /dev/null
+++ b/scripts/atom.js
@@ -0,0 +1,22 @@
+const RSS = require('rss');
+
+const feedName = process.argv[2];
+const feedSrc = process.argv[3];
+
+const feed = new RSS({
+  title: `Buku feed tag for '${feedName}'.`,
+  description: `Buku feed tag for ${feedName}`,
+});
+
+const items = require(feedSrc);
+items.forEach(({ title, description, uri }) => {
+  feed.item({
+    title,
+    description,
+    url: uri
+  });
+});
+
+const xml = feed.xml({indent: true});
+
+console.log(xml);
diff --git a/scripts/atom.sh b/scripts/atom.sh
new file mode 100755
index 0000000..73c35ec
--- /dev/null
+++ b/scripts/atom.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+if [[ ! -d "node_modules" ]]; then
+  npm i rss
+fi
+
+feed() {
+  local tag="$1"
+  local tmp="/tmp/$tag.json"
+  buku -t "$tag" --json > "$tmp"
+  node atom.js "$tag" "$tmp"
+}
+
+mkdir -p ~/.newsboat
+feed ril            > ~/.newsboat/ril.xml
+feed simple-archive > ~/.newsboat/simple-archive.xml
+feed inbox          > ~/.newsboat/inbox.xml
-- 
cgit v1.2.3


From 4541e1126a934e7c4e8e9eb69ed751f9ac91e364 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Tue, 22 Jan 2019 13:12:05 -0200
Subject: Remove $HOME variable from npmrc.sh.

---
 nixos/npmrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/npmrc.sh b/nixos/npmrc.sh
index 2669f85..0bc6ecb 100644
--- a/nixos/npmrc.sh
+++ b/nixos/npmrc.sh
@@ -1,5 +1,5 @@
 # shellcheck disable=2148 disable=2034
-prefix="$HOME/.npm-packages"
+prefix=/home/andreh/.npm-packages
 # Taken from:
 # http://www.tomsquest.com/blog/2018/10/better-npm-ing/
 save-exact=true
-- 
cgit v1.2.3


From 5e0919db80267d5ed476c744e3f13f8d8f711571 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Tue, 22 Jan 2019 16:39:17 -0200
Subject: Nextcloud -> ownCloud

Client change only.
---
 bash/env.sh                    | 4 +---
 bash/youtube.sh                | 2 +-
 nixos/configuration.nix        | 3 ++-
 scripts/backup.sh              | 2 +-
 scripts/cp-todos.sh            | 4 ++--
 scripts/once-only-nextcloud.sh | 9 ---------
 scripts/once-only-owncloud.sh  | 9 +++++++++
 spacemacs.el                   | 7 ++++---
 xmonad/xmonad.hs               | 2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100755 scripts/once-only-nextcloud.sh
 create mode 100755 scripts/once-only-owncloud.sh

(limited to 'nixos')

diff --git a/bash/env.sh b/bash/env.sh
index d8233be..a0b750f 100644
--- a/bash/env.sh
+++ b/bash/env.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-export PATH="$HOME/Nextcloud/bin/:$PATH"
-
 #
 # Git Annex
 #
@@ -33,7 +31,7 @@ export EDITOR=vi
 export PATH="$DOTFILES/scripts/:$PATH"
 export PATH="$DOTFILES/encrypted/scripts/:$PATH"
 export INPUTRC=~/.inputrc
-export CACHE_DIR="$HOME/Nextcloud/cache"
+export CACHE_DIR="$HOME/ownCloud/cache"
 export PATH="$HOME/dev/libre/website/:$PATH"
 export PATH="$DOTFILES/bin:$PATH"
 export PATH="$HOME/dev/misc/flutter/bin:$PATH"
diff --git a/bash/youtube.sh b/bash/youtube.sh
index 19c9af0..14d0371 100644
--- a/bash/youtube.sh
+++ b/bash/youtube.sh
@@ -12,7 +12,7 @@ export -f yt_dl
 
 download() {
   youtube-dl "$1" \
-             --download-archive ~/Nextcloud/cache/youtube-dl-seen.conf \
+             --download-archive ~/ownCloud/cache/youtube-dl-seen.conf \
              --prefer-free-formats                                     \
              --playlist-end "$2"                                       \
              --write-description                                       \
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 6f8c7e0..95a3b27 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -105,6 +105,7 @@
     gnupg
     mr
     nextcloud-client
+    owncloud-client
     borgbackup
     git-sizer
 
@@ -366,7 +367,7 @@
         # xmodmap -e 'keycode 118 = bar Greek_lamda'
         sessionCommands = ''
           ${pkgs.haskellPackages.xmobar}/bin/xmobar ~/.xmobarrc &
-          ${pkgs.fvwm}/bin/xpmroot ~/Nextcloud/Images/emotion.png &
+          ${pkgs.fvwm}/bin/xpmroot ~/ownCloud/Images/emotion.png &
         '';
       };
     };
diff --git a/scripts/backup.sh b/scripts/backup.sh
index 6a4de25..f31a503 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -27,7 +27,7 @@ borg create                                         \
      --progress                                     \
      --compression lzma,6                           \
      ~/borgbackup::"{hostname}-{now}-${BACKUP_TAG}" \
-     ~/Nextcloud/                                   \
+     ~/ownCloud/                                    \
      ~/mbsync/
      # add folders to be backed up here
 green "Done"
diff --git a/scripts/cp-todos.sh b/scripts/cp-todos.sh
index d8e6f30..e839ae8 100755
--- a/scripts/cp-todos.sh
+++ b/scripts/cp-todos.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/Notes/org.txt"
-cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/cache/TODOs.org"
+cp "$HOME/annex/txt/TODOs.org" "$HOME/ownCloud/Notes/org.txt"
+cp "$HOME/annex/txt/TODOs.org" "$HOME/ownCloud/cache/TODOs.org"
diff --git a/scripts/once-only-nextcloud.sh b/scripts/once-only-nextcloud.sh
deleted file mode 100755
index 7886b6f..0000000
--- a/scripts/once-only-nextcloud.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$(pidof nextcloud)" ]
-then
-    echo "Nextcloud already running."
-else
-    echo "Nextcloud not running yet. Starting it."
-    nextcloud & disown
-fi
diff --git a/scripts/once-only-owncloud.sh b/scripts/once-only-owncloud.sh
new file mode 100755
index 0000000..66b3ee4
--- /dev/null
+++ b/scripts/once-only-owncloud.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [ "$(pidof owncloud)" ]
+then
+    echo "ownCloud already running."
+else
+    echo "ownCloud not running yet. Starting it."
+    owncloud & disown
+fi
diff --git a/spacemacs.el b/spacemacs.el
index 9c19ac2..f30415d 100644
--- a/spacemacs.el
+++ b/spacemacs.el
@@ -576,7 +576,7 @@ dump."
                              ("M-p"   . (lambda () (interactive) (find-file "~/annex/txt/money.ledger")))
                              ("M-SPC" . (lambda () (interactive) (just-one-space -1)))
                              ("M-["   . (lambda () (interactive) (find-file "~/tmp/scratch.org")))
-                             ("M-]"   . (lambda () (interactive) (find-file "~/Nextcloud/Notes/TODOs.txt")))
+                             ("M-]"   . (lambda () (interactive) (find-file "~/ownCloud/Notes/TODOs.txt")))
                              ("M-s-q"             . (lambda () (interactive) (insert "/")))
                              ("M-s-w"             . (lambda () (interactive) (insert "?")))
                              ("M-s-a"             . (lambda () (interactive) (insert "\\")))
@@ -728,7 +728,7 @@ This is the place where most of your configurations should be done. Unless it is
         ;; - http://cachestocaches.com/2016/9/my-workflow-org-agenda
         ;; - http://doc.norang.ca/org-mode.html
         org-todo-keywords '((sequence "TODO" "NEXT" "WAITING" "INACTIVE" "CANCELLED" "MEETING" "DOING" "|" "DONE"))
-        org-agenda-files '("~/Nextcloud/txt/TODOs.org")
+        org-agenda-files '("~/ownCloud/txt/TODOs.org")
         org-columns-default-format "%50ITEM(Task) %10CLOCKSUM %16TIMESTAMP_IA"
         org-default-notes-file "~/annex/txt/TODOs.org"
         org-scratch-notes-file "~/annex/txt/TODOs.org"
@@ -778,7 +778,8 @@ This function is called at the very end of Spacemacs initialization."
  ;; If there is more than one, they won't work right.
  '(ledger-reports
    (quote
-    (("balance" "ledger -f money.ledger balance Assets Liabilities"))))
+    (("balance-rs" "ledger -f money.ledger balance Assets Liabilities -V")
+     ("balance" "ledger -f money.ledger balance Assets Liabilities"))))
  '(package-selected-packages
    (quote
     (selectric-mode ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell))))
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 8c12ae5..c266676 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -115,5 +115,5 @@ startup = do
   spawn "xmobar ~/.xmobarrc"
   spawn "killall trayer; trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x191970 --height 17 --monitor 1"
   spawn "nm-applet"
-  spawn "~/annex/dev/code/dotfiles/scripts/once-only-nextcloud.sh"
+  spawn "~/annex/dev/code/dotfiles/scripts/once-only-owncloud.sh"
   setWMName "LG3D" -- https://stackoverflow.com/questions/30742662/java-swing-gui-not-displaying-in-xmonad
-- 
cgit v1.2.3


From 7cf187582a6af17fed55d580e8d173e59805ea01 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Tue, 22 Jan 2019 20:40:13 -0200
Subject: Fix dotfiles path.

---
 bash/bash_profile.sh    |   2 +-
 mail/mbsyncrc.ini       | Bin 2117 -> 2102 bytes
 nixos/configuration.nix |   2 +-
 spacemacs.el            |   2 +-
 xmonad/xmonad.hs        |   6 +++---
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'nixos')

diff --git a/bash/bash_profile.sh b/bash/bash_profile.sh
index 41bc7e9..0383eaa 100644
--- a/bash/bash_profile.sh
+++ b/bash/bash_profile.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source ~/annex/dev/code/dotfiles/bash/bashrc.sh
+source ~/dev/libre/dotfiles/bash/bashrc.sh
diff --git a/mail/mbsyncrc.ini b/mail/mbsyncrc.ini
index c3d1bc0..a74c30e 100644
Binary files a/mail/mbsyncrc.ini and b/mail/mbsyncrc.ini differ
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 95a3b27..bcd52a9 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -426,7 +426,7 @@
             uid = 1000;
             description = "EuAndreh";
             extraGroups = [ "wheel" "networkmanager" "docker" ];
-            passwordFile = "/home/andreh/annex/dev/code/dotfiles/encrypted/password-hash.txt";
+            passwordFile = "/home/andreh/dev/libre/dotfiles/encrypted/password-hash.txt";
           };
         };
         # From the Guix manual:
diff --git a/spacemacs.el b/spacemacs.el
index f30415d..f3cb704 100644
--- a/spacemacs.el
+++ b/spacemacs.el
@@ -582,7 +582,7 @@ dump."
                              ("M-s-a"             . (lambda () (interactive) (insert "\\")))
                              ("M-s-s"             . (lambda () (interactive) (insert "|")))))
 
-(defvar custom-el-files '("~/annex/dev/code/dotfiles/emacs/not-much.el"
+(defvar custom-el-files '("~/dev/libre/dotfiles/emacs/not-much.el"
                           "~/.quicklisp/slime-helper.el"))
 
 (defmacro measure-time (&rest body)
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index c266676..43e918b 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -86,11 +86,11 @@ myKeyBindings =
 
       -- xrandr single monitor setup
     , ((mod4Mask .|. controlMask, xK_1),
-      spawn "~/annex/dev/code/dotfiles/scripts/single-monitor.sh")
+      spawn "~/dev/libre/dotfiles/scripts/single-monitor.sh")
 
       -- xrandr three monitor setup
     , ((mod4Mask .|. controlMask, xK_3),
-      spawn "~/annex/dev/code/dotfiles/scripts/three-monitors.sh")
+      spawn "~/dev/libre/dotfiles/scripts/three-monitors.sh")
 
       -- restart network
     , ((mod4Mask, xK_x),
@@ -115,5 +115,5 @@ startup = do
   spawn "xmobar ~/.xmobarrc"
   spawn "killall trayer; trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x191970 --height 17 --monitor 1"
   spawn "nm-applet"
-  spawn "~/annex/dev/code/dotfiles/scripts/once-only-owncloud.sh"
+  spawn "~/dev/libre/dotfiles/scripts/once-only-owncloud.sh"
   setWMName "LG3D" -- https://stackoverflow.com/questions/30742662/java-swing-gui-not-displaying-in-xmonad
-- 
cgit v1.2.3


From 6a4e2e89a4223b30e524d47d0f8a62c88ef9911e Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 3 Feb 2019 13:31:07 -0200
Subject: Install python-ly and lame in configuration.nix.

---
 nixos/configuration.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index bcd52a9..5220a2e 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -215,6 +215,8 @@
 
     texlive.combined.scheme-full
     lilypond
+    python36Packages.python-ly
+    lame
     frescobaldi
     timidityWithEvenMoreFormats
 
-- 
cgit v1.2.3


From 93441ebbde6eeb536b4234a5a5b6b04c8433ebb6 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Thu, 14 Mar 2019 12:44:27 -0300
Subject: Remove gpaste.

---
 nixos/configuration.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 5220a2e..adcfd7e 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -301,6 +301,7 @@
     androidsdk_extras
     androidndk
     pkgsUnstable.patchwork-classic
+    # gnome3.gpaste
 
 
     ## Cryptocururencies
@@ -378,7 +379,7 @@
       gnome-keyring.enable = true;
       seahorse.enable = true;
       gnome-terminal-server.enable = true;
-      gpaste.enable = true;                # clipboard manager
+      # gpaste.enable = true;                # clipboard manager
       tracker.enable = true;
       sushi.enable = true;                 # nautilus previewer
       gnome-online-accounts.enable = true;
-- 
cgit v1.2.3


From f830325cdffd646a548f654a7c28417414f20967 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Thu, 14 Mar 2019 12:44:35 -0300
Subject: Uninstall Tor browser.

---
 nixos/configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index adcfd7e..7043ce0 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -294,7 +294,7 @@
     vlc
     keepassx2-http
     yubioath-desktop
-    tor-browser-bundle-bin
+    # tor-browser-bundle-bin
     transmission_gtk
     libreoffice
     android-studio
-- 
cgit v1.2.3


From f293e3203f934c92fb8bc9422a34ed1317fba578 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 23 Mar 2019 23:01:12 -0300
Subject: Add sshuttle package (for VPN network).

---
 encrypted/SSH/known_hosts.txt | Bin 4114 -> 4289 bytes
 nixos/configuration.nix       |   1 +
 2 files changed, 1 insertion(+)

(limited to 'nixos')

diff --git a/encrypted/SSH/known_hosts.txt b/encrypted/SSH/known_hosts.txt
index 79c3e9e..ec99d68 100644
Binary files a/encrypted/SSH/known_hosts.txt and b/encrypted/SSH/known_hosts.txt differ
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 7043ce0..18831f9 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -313,6 +313,7 @@
 
     ## nu specific packages
 
+    sshuttle
     slack
     chromium
   ];
-- 
cgit v1.2.3


From c779a8244dbc41138c2c485a7f7a16a5a1b15b73 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 23 Mar 2019 23:32:05 -0300
Subject: Add cozy audiobook package.

---
 nixos/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 18831f9..f5b38b3 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -286,6 +286,7 @@
 
     inkscape
     calibre
+    pkgsUnstable.cozy
     rhythmbox
     gpodder
     firefox
-- 
cgit v1.2.3