From d7b71cdb91943aa0db6337da66e353a92956d499 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 00:49:13 +0100
Subject: l 2 repo-sync: use new api

---
 lass/2configs/repo-sync.nix | 55 ++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

(limited to 'lass/2configs')

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")
   ];
 }
-
-- 
cgit v1.2.3


From 9a50ea0143161746f9be9dc99abb87c384b9cc27 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 00:58:09 +0100
Subject: l 2: add logf.nix

---
 lass/2configs/logf.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lass/2configs/logf.nix

(limited to 'lass/2configs')

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)}
+    '')
+  ];
+}
-- 
cgit v1.2.3


From 3374fe9566a366451ea59f325ecb1e2da7046322 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 01:06:31 +0100
Subject: l 2 nixpkgs: use cgit.lassul.us as gitserver

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 59851f25a..a6409b7db 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;
+    url = https://cgit.lassul.us/nixpkgs;
     ref = "c0ecd31";
   };
 }
-- 
cgit v1.2.3


From 4ccb7a1a2ccff15a9338de93924bda8e1640bb7d Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 16:06:05 +0100
Subject: l 2 nixpkgs: c0ecd31 -> c554a0c

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index a6409b7db..20918d294 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "c0ecd31";
+    ref = "c554a0c97f5030a66cc81d41e1f39bff5095efba";
   };
 }
-- 
cgit v1.2.3


From 4ebc0e7adc7605e154916aefad47331761036abb Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 17:12:48 +0100
Subject: l 2 htop: hide process information from other user

---
 lass/2configs/htop.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs')

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
-- 
cgit v1.2.3