Merge remote-tracking branch 'prism/lassulus'

6 files changed, 61 insertions, 29 deletions

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index bffb08ad3..223e16bae 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -24,6 +24,7 @@ with import <stockholm/lib>;
     ../2configs/krebs-pass.nix
     ../2configs/repo-sync.nix
     ../2configs/ircd.nix
+    ../2configs/logf.nix
     {
       #risk of rain port
       krebs.iptables.tables.filter.INPUT.rules = [
@@ -192,7 +193,6 @@ with import <stockholm/lib>;
     remmina
     thunderbird
 
-    logf
     iodine
 
     macchanger
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index b55732f65..a7a7f6129 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -215,8 +215,13 @@ in {
     }
     {
       krebs.repo-sync.timerConfig = {
+        OnBootSec = "15min";
+        OnUnitInactiveSec = "90min";
+        RandomizedDelaySec = "30min";
+      };
+      krebs.repo-sync.repos.stockholm.timerConfig = {
         OnBootSec = "5min";
-        OnUnitInactiveSec = "3min";
+        OnUnitInactiveSec = "2min";
         RandomizedDelaySec = "2min";
       };
     }
diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix
index 0296101ac..69e04a05b 100644
--- a/lass/2configs/htop.nix
+++ b/lass/2configs/htop.nix
@@ -3,6 +3,7 @@
 with import <stockholm/lib>;
 
 {
+  security.hideProcessInformation = true;
   nixpkgs.config.packageOverrides = super: {
     htop = pkgs.concat "htop" [
       super.htop
diff --git a/lass/2configs/logf.nix b/lass/2configs/logf.nix
new file mode 100644
index 000000000..3c4948db1
--- /dev/null
+++ b/lass/2configs/logf.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+let
+  host-colors = {
+    mors = "131";
+    prism = "95";
+    uriel = "61";
+    shodan = "51";
+    icarus = "53";
+    echelon = "197";
+    helios = "199";
+    cloudkrebs = "119";
+  };
+in {
+  environment.systemPackages = [
+    (pkgs.writeDashBin "logf" ''
+      export LOGF_HOST_COLORS=${pkgs.writeJSON "host-colors" host-colors}
+      ${pkgs.logf}/bin/logf ${concatMapStringsSep " " (name: "root@${name}") (attrNames config.lass.hosts)}
+    '')
+  ];
+}
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 59851f25a..20918d294 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -2,7 +2,7 @@
 
 {
   krebs.build.source.nixpkgs.git = {
-    url = https://github.com/nixos/nixpkgs;
-    ref = "c0ecd31";
+    url = https://cgit.lassul.us/nixpkgs;
+    ref = "c554a0c97f5030a66cc81d41e1f39bff5095efba";
   };
 }
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index 83f646130..dfea637ed 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -36,25 +36,27 @@ let
   sync-retiolum = name:
     {
       krebs.repo-sync.repos.${name} = {
-        makefu = {
-          origin.url = "http://cgit.gum/${name}";
-          mirror.url = "${mirror}${name}";
+        branches = {
+          makefu = {
+            origin.url = "http://cgit.gum/${name}";
+            mirror.url = "${mirror}${name}";
+          };
+          tv = {
+            origin.url = "http://cgit.ni.r/${name}";
+            mirror.url = "${mirror}${name}";
+          };
+          nin = {
+            origin.url = "http://cgit.onondaga.r/${name}";
+            mirror.url = "${mirror}${name}";
+          };
+          lassulus = {
+            origin.url = "http://cgit.lassul.us/${name}";
+            mirror.url = "${mirror}${name}";
+          };
         };
-        tv = {
-          origin.url = "http://cgit.ni.r/${name}";
-          mirror.url = "${mirror}${name}";
-        };
-        nin = {
-          origin.url = "http://cgit.onondaga.r/${name}";
-          mirror.url = "${mirror}${name}";
-        };
-        lassulus = {
-          origin.url = "http://cgit.lassul.us/${name}";
-          mirror.url = "${mirror}${name}";
-        };
-        "@latest" = {
-          mirror.url = "${mirror}${name}";
-          mirror.ref = "heads/newest";
+        latest = {
+          url = "${mirror}${name}";
+          ref = "heads/newest";
         };
       };
       krebs.git = defineRepo name (config.networking.hostName == "prism");
@@ -63,9 +65,11 @@ let
   sync-remote = name: url:
     {
       krebs.repo-sync.repos.${name} = {
-        remote = {
-          origin.url = url;
-          mirror.url = "${mirror}${name}";
+        branches = {
+          remote = {
+            origin.url = url;
+            mirror.url = "${mirror}${name}";
+          };
         };
       };
       krebs.git = defineRepo name (config.networking.hostName == "prism");
@@ -74,9 +78,11 @@ let
   sync-remote-silent = name: url:
     {
       krebs.repo-sync.repos.${name} = {
-        remote = {
-          origin.url = url;
-          mirror.url = "${mirror}${name}";
+        branches = {
+          remote = {
+            origin.url = url;
+            mirror.url = "${mirror}${name}";
+          };
         };
       };
       krebs.git = defineRepo name false;
@@ -109,4 +115,3 @@ in {
     (sync-retiolum "xmonad-stockholm")
   ];
 }
-