Merge branch 'master' of git.yggdrasil.li:nixos

5 files changed, 19 insertions, 134 deletions

diff --git a/bragi.nix b/bragi.nix
index 10f42e88..932d0cdf 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -7,7 +7,6 @@ in rec {
   imports =
     [
       ./bragi-hw.nix
-      ./customized/autofs.nix
       ./custom/zsh.nix
       ./users.nix
     ];
@@ -243,12 +242,18 @@ in rec {
     home = "/var/lib/thermoprint";
   };
 
-    systemd.services."thermoprint" = {
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = ''${thermoprint-servant}/bin/thermoprint --database ${users.extraUsers."thermoprint".home}/database.sqlite /dev/usb/lp0'';
-        User = users.extraUsers."thermoprint".name;
-        Group = users.extraUsers."thermoprint".group;
-      };
+  systemd.services."thermoprint" = {
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = ''${thermoprint-servant}/bin/thermoprint --database ${users.extraUsers."thermoprint".home}/database.sqlite /dev/usb/lp0'';
+      User = users.extraUsers."thermoprint".name;
+      Group = users.extraUsers."thermoprint".group;
     };
+  };
+
+  nix = {
+    extraOptions = ''
+      binary-caches-parallel-connections = 10
+    '';
+  };
 }
diff --git a/custom/redo-wrapper.nix b/custom/redo-wrapper.nix
index 5b446636..3a3d7bbc 100644
--- a/custom/redo-wrapper.nix
+++ b/custom/redo-wrapper.nix
@@ -1,8 +1,8 @@
-{ stdenv, makeWrapper, haskellngPackages }:
+{ stdenv, makeWrapper, haskellPackages }:
 
 let
   #redo = haskellPackages.callPackage ./redo.nix {};
-  redo = stdenv.lib.overrideDerivation (haskellngPackages.redo) (attrs: {
+  redo = stdenv.lib.overrideDerivation (haskellPackages.redo) (attrs: {
     patches = attrs.patches ++ [./redo.patch];
   });
 in stdenv.mkDerivation {
diff --git a/custom/trivmix b/custom/trivmix
-Subproject d40917517feeaffc3d8e90cf8e06004623b0c5f
+Subproject 782b5b37976fce5e10b4e7df96bcc19c48fff0b
diff --git a/customized/autofs.nix b/customized/autofs.nix
deleted file mode 100644
index f4a1059d..00000000
--- a/customized/autofs.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.autofs;
-
-  autoMaster = pkgs.writeText "auto.master" cfg.autoMaster;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.autofs = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Mount filesystems on demand. Unmount them automatically.
-          You may also be interested in afuese.
-        ";
-      };
-
-      autoMaster = mkOption {
-        example = literalExample ''
-          autoMaster = let
-            mapConf = pkgs.writeText "auto" '''
-             kernel    -ro,soft,intr       ftp.kernel.org:/pub/linux
-             boot      -fstype=ext2        :/dev/hda1
-             windoze   -fstype=smbfs       ://windoze/c
-             removable -fstype=ext2        :/dev/hdd
-             cd        -fstype=iso9660,ro  :/dev/hdc
-             floppy    -fstype=auto        :/dev/fd0
-             server    -rw,hard,intr       / -ro myserver.me.org:/ \
-                                           /usr myserver.me.org:/usr \
-                                           /home myserver.me.org:/home
-            ''';
-          in '''
-            /auto file:''${mapConf}
-          '''
-        '';
-        description = "
-          file contents of /etc/auto.master. See man auto.master
-          See man 5 auto.master and man 5 autofs.
-        ";
-      };
-
-      timeout = mkOption {
-        default = 600;
-        description = "Set the global minimum timeout, in seconds, until directories are unmounted";
-      };
-
-      debug = mkOption {
-        default = false;
-        description = "
-        pass -d and -7 to automount and write log to /var/log/autofs
-        ";
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.etc = singleton
-      { target = "auto.master";
-        source = pkgs.writeText "auto.master" cfg.autoMaster;
-      };
-
-    boot.kernelModules = [ "autofs4" ];
-
-    jobs.autofs =
-      { description = "Filesystem automounter";
-
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        path = [ pkgs.nfs-utils pkgs.sshfsFuse ];
-
-        preStop =
-          ''
-            set -e; while :; do pkill -TERM automount; sleep 1; done
-          '';
-
-        # automount doesn't clean up when receiving SIGKILL.
-        # umount -l should unmount the directories recursively when they are no longer used
-        # It does, but traces are left in /etc/mtab. So unmount recursively..
-        postStop =
-          ''
-          PATH=${pkgs.gnused}/bin:${pkgs.coreutils}/bin
-          exec &> /tmp/logss
-          # double quote for sed:
-          escapeSpaces(){ sed 's/ /\\\\040/g'; }
-          unescapeSpaces(){ sed 's/\\040/ /g'; }
-          sed -n 's@^\s*\(\([^\\ ]\|\\ \)*\)\s.*@\1@p' ${autoMaster} | sed 's/[\\]//' | while read mountPoint; do
-            sed -n "s@[^ ]\+\s\+\($(echo "$mountPoint"| escapeSpaces)[^ ]*\).*@\1@p" /proc/mounts | sort -r | unescapeSpaces| while read smountP; do
-              ${pkgs.utillinux}/bin/umount -l "$smountP" || true
-            done
-          done
-          '';
-
-        script =
-          ''
-            ${if cfg.debug then "exec &> /var/log/autofs" else ""}
-            exec ${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} "${autoMaster}" ${if cfg.debug then "-l7" else ""}
-          '';
-      };
-
-  };
-
-}
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix
index b67696a5..a32fa0d1 100644
--- a/users/gkleen@bragi.nix
+++ b/users/gkleen@bragi.nix
@@ -30,12 +30,12 @@
     };
     myHaskellPackages = pkgs.recurseIntoAttrs (
       pkgs.haskellPackages.override {
-        extension = self: super: let
+        overrides = self: super: let
           callPackage = pkgs.lib.callPackageWith ( pkgs // self );
         in {
-          attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {};
-          shellMonad = callPackage ../custom/shell-monad.nix {};
-          filelock = callPackage ../custom/filelock.nix {};
+          # attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {};
+          # shellMonad = callPackage ../custom/shell-monad.nix {};
+          # filelock = callPackage ../custom/filelock.nix {};
           trivmix = callPackage ../custom/trivmix.nix {};
         };
       }