Merge branch 'master' of gum.krebsco.de:stockholm

9 files changed, 5 insertions, 17 deletions

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 798cf36be..d6ae9f12f 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -35,6 +35,7 @@ with config.krebs.lib;
           addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128"];
           aliases = [
             "darth.retiolum"
+            "darth.r"
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix
index 95a37006b..a33744f0b 100644
--- a/makefu/1systems/darth.nix
+++ b/makefu/1systems/darth.nix
@@ -8,9 +8,7 @@ with config.krebs.lib;
         ../.
   ];
 
-  krebs.build.host = config.krebs.hosts.darth;
   krebs.retiolum.enable = true;
-  nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
 
   boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039";
   users.users.root.openssh.authorizedKeys.keys = [
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 3976a1eb0..e784fdc12 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -24,7 +24,6 @@ in {
   ];
 
   services.smartd.devices = [ { device = "/dev/sda";} ];
-  nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
 
   ###### stable
   krebs.build.host = config.krebs.hosts.gum;
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index eed6d2316..bfcd2298a 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -122,7 +122,6 @@ in {
   hardware.cpu.amd.updateMicrocode = true;
 
   zramSwap.enable = true;
-  zramSwap.numDevices = 2;
 
   krebs.build.host = config.krebs.hosts.omo;
 }
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index ca7caa35f..4b8d39c89 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -43,10 +43,8 @@
 
   krebs.build.host = config.krebs.hosts.pnp;
 
-  nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
-
   networking.firewall.allowedTCPPorts = [
-  25
+    25
   ];
 
 }
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index c27bd5dfc..119f0e5e4 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -38,9 +38,6 @@
     ];
 
   krebs.retiolum.enable = true;
-  nixpkgs.config.packageOverrides = pkgs: {
-    tinc = pkgs.tinc_pre;
-  };
   # steam
   hardware.opengl.driSupport32Bit = true;
   hardware.pulseaudio.support32Bit = true;
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix
index f9421cfa2..bf6ff9fb6 100644
--- a/makefu/1systems/repunit.nix
+++ b/makefu/1systems/repunit.nix
@@ -41,7 +41,7 @@
   };
 
 # $ nix-env -qaP | grep wget
-    environment.systemPackages = with pkgs; [
-      jq
-    ];
+  environment.systemPackages = with pkgs; [
+    jq
+  ];
 }
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index e07525d0d..748b08ef1 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -14,9 +14,6 @@
 
     ];
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.packageOverrides = pkgs: {
-    tinc = pkgs.tinc_pre;
-  };
 
   krebs.build.source.upstream-nixpkgs = {
     url = https://github.com/makefu/nixpkgs;
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index c49b48ea1..edaf1b803 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -52,7 +52,6 @@ in {
   krebs.nginx.enable = true;
   krebs.retiolum-bootstrap.enable = true;
 
-  nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
   krebs.tinc_graphs = {
     enable = true;
     nginx = {