Merge branch 'master' of https://git.alanpearce.eu/nixos-configuration

7 files changed, 33 insertions, 8 deletions

diff --git a/modules/development/base.nix b/modules/development/base.nix
index e8d2b76..d2d67db 100644
--- a/modules/development/base.nix
+++ b/modules/development/base.nix
@@ -8,6 +8,7 @@
 
     editorconfig-core-c
     multimarkdown
+    go
     gocode
 
     surf
diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix
index 2e92509..c882860 100644
--- a/modules/development/javascript.nix
+++ b/modules/development/javascript.nix
@@ -4,12 +4,17 @@
     nodejs-8_x
     phantomjs2
     yarn
+
     nodePackages.tern
     nodePackages.node2nix
     nodePackages.nodemon
     nodePackages.javascript-typescript-langserver
     nodePackages.eslint_d
+
+    # npm install may use any of these
+    python2
     nodePackages.node-gyp
-    gnumake
+    nodePackages.node-gyp-build
+    nodePackages.node-pre-gyp
   ];
 }
diff --git a/modules/hardware/bare-metal.nix b/modules/hardware/bare-metal.nix
index eacc9f4..9d79fb5 100644
--- a/modules/hardware/bare-metal.nix
+++ b/modules/hardware/bare-metal.nix
@@ -11,6 +11,11 @@
 
   hardware.cpu.intel.updateMicrocode = true;
 
+  boot.kernel.sysctl = {
+    "net.ipv4.tcp_allowed_congestion_control" = "illinois reno lp";
+    "net.ipv4.tcp_congestion_control" = "illinois";
+  };
+
   boot.tmpOnTmpfs = true;
 
   fileSystems."/".options = [ "noatime" "nodiratime" ];
diff --git a/modules/machines/t470s.nix b/modules/machines/t470s.nix
index e6fb8cb..304bfd5 100644
--- a/modules/machines/t470s.nix
+++ b/modules/machines/t470s.nix
@@ -5,6 +5,8 @@
     firmwareLinuxNonfree
   ];
 
+  boot.kernelPackages = pkgs.linuxPackages_4_17;
+
   systemd.services.ModemManager.enable = true;
 
   hardware.pulseaudio.extraConfig = ''
@@ -12,11 +14,11 @@
   '';
 
   # Try a different acceleration method; maybe it helps with screen corruption
-  services.xserver.deviceSection = ''
-    Option      "AccelMethod"  "sna"
-    Option      "TearFree"     "true"
-    Option      "TripleBuffer" "false"
-  '';
+  # services.xserver.deviceSection = ''
+  #   Option      "AccelMethod"  "sna"
+  #   Option      "TearFree"     "true"
+  #   Option      "TripleBuffer" "false"
+  # '';
 
   services.xserver.monitorSection = ''
     DisplaySize 310 176
diff --git a/modules/programs/accounting.nix b/modules/programs/accounting.nix
index 5882436..7c17c14 100644
--- a/modules/programs/accounting.nix
+++ b/modules/programs/accounting.nix
@@ -6,5 +6,6 @@
     bean-add
     beancount
     fava
+    reckon
   ];
 }
diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix
index bbde34e..75a0407 100644
--- a/modules/satoshipay.nix
+++ b/modules/satoshipay.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, fetchurl, lib, ... }:
 
 { virtualisation = {
     docker = {
@@ -23,11 +23,13 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
+    openssl
     google-chrome
     docker_compose
     meteor
     minikube
     mongodb-tools
+    s3cmd
     sops
     unstable.google-cloud-sdk
     unstable.kubernetes
@@ -41,6 +43,7 @@
   services.mongodb = {
     enable = true;
     replSetName = "rs0";
+    dbpath = "/tmp/mongodb";
   };
   systemd.services.mongodb.wantedBy = lib.mkForce  [];
   systemd.timers.mongodb = {
@@ -65,7 +68,13 @@
 
 
   services.printing.drivers = with pkgs; [
-    unstable.cups-toshiba-estudio
+    (cups-toshiba-estudio.overrideAttrs (oldAttrs: {
+      version = "7.89";
+      src = pkgs.fetchurl {
+        url = http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar;
+        sha256 = "0qz4r7q55i0adf4fv3aqnfqgi2pz3jb1jixkqm9x6nk4vanyjf4r";
+      };
+    }))
   ];
 
   networking.domain = "satoshipay.io";
diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index a91dc4a..26699da 100644
--- a/modules/user-interface.nix
+++ b/modules/user-interface.nix
@@ -43,8 +43,10 @@ in
     aspell
     aspellDicts.en
 
+    cifs-utils
     hexchat
     signal-desktop
+    nextcloud-client
 
     trash-cli
   ];