From fd6c056a720544319f02cf02b64fa8dd2b657aa8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 5 Mar 2017 01:02:19 +0100
Subject: l 2 programs: remove obsolete livestreamer

---
 lass/2configs/programs.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/programs.nix b/lass/2configs/programs.nix
index 6cf23deaf..241d263f8 100644
--- a/lass/2configs/programs.nix
+++ b/lass/2configs/programs.nix
@@ -12,7 +12,6 @@
     pavucontrol
     pv
     pwgen
-    python34Packages.livestreamer
     remmina
     silver-searcher
     wget
-- 
cgit v1.2.3


From ed8a05bf44a57da17c396c655217b16c2c472d6a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 19:36:57 +0100
Subject: l 2 websites domsen: style

---
 lass/2configs/websites/domsen.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 0b75425c4..daecdcd2f 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -25,15 +25,10 @@ in {
   imports = [
     ./sqlBackup.nix
     (servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ])
-
     (servePage [ "karlaskop.de" "www.karlaskop.de" ])
-
     (servePage [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ])
-
     (servePage [ "pixelpocket.de" ])
-
     (serveOwncloud [ "o.ubikmedia.de" ])
-
     (serveWordpress [
       "ubikmedia.de"
       "apanowicz.de"
-- 
cgit v1.2.3


From e1045698d6e563ec9ad10cb1b0036252a34a010a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 19:41:25 +0100
Subject: l 5 xmonad: use correct wallpaper path

---
 lass/5pkgs/xmonad-lass.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index bc70417f5..82f507138 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -95,7 +95,7 @@ displaySomeException = displayException
 
 myKeyMap :: [([Char], X ())]
 myKeyMap =
-    [ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i $HOME/wallpaper -f")
+    [ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i $HOME/wallpaper/wallpaper -f")
     , ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png")
     , ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
     , ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ +4%")
-- 
cgit v1.2.3


From c48e40e2877789fcda17b494e637e9d99d33ba18 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 20:16:28 +0100
Subject: l 2 baseX: activate rtkit for pulseaudio

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

(limited to 'lass')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 275b93f26..af5092ef8 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -15,6 +15,7 @@ in {
         enable = true;
         systemWide = true;
       };
+      security.rtkit.enable = true;
     }
     {
       krebs.per-user.lass.packages = [
-- 
cgit v1.2.3


From b311628ee2819136f8a7adda608645d9a7d8712a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 20:17:23 +0100
Subject: l 2 baseX: disable OSS emulation

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

(limited to 'lass')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index af5092ef8..3032e244f 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -16,6 +16,7 @@ in {
         systemWide = true;
       };
       security.rtkit.enable = true;
+      sound.enableOSSEmulation = false;
     }
     {
       krebs.per-user.lass.packages = [
-- 
cgit v1.2.3


From 484dc992f83bd7d6aadd6d7621f973ab824777d8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 20:18:07 +0100
Subject: l 2 nixpkgs: 5b0c9d4 -> c0ecd31

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

(limited to 'lass')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 9c3eafffd..59851f25a 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://github.com/nixos/nixpkgs;
-    ref = "5b0c9d4";
+    ref = "c0ecd31";
   };
 }
-- 
cgit v1.2.3


From 8e490fa31dfb7c1401ab486784cf99bfe4f01b7d Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 22:56:25 +0100
Subject: l 2 mc: use concat

---
 lass/2configs/mc.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/mc.nix b/lass/2configs/mc.nix
index b7d5a4ceb..fc347ba3c 100644
--- a/lass/2configs/mc.nix
+++ b/lass/2configs/mc.nix
@@ -322,13 +322,19 @@ let
 
 in {
   environment.systemPackages = [
-    (pkgs.lib.overrideDerivation pkgs.mc (original : {
-      postInstall = ''
-        rm -f $out/etc/mc/mc.ext
-        ln -s ${mcExt} $out/etc/mc/mc.ext
-        cp $out/share/mc/skins/nicedark.ini $out/share/mc/skins/default.ini
-      '';
-    }))
+    (pkgs.concat "mc" [
+      pkgs.mc
+      (pkgs.writeDashBin "mc" ''
+        export MC_DATADIR=${pkgs.concat "mc-datadir" [
+          (pkgs.writeOut "mc-ext" {
+            "/mc.ext".link = mcExt;
+            "/sfs.ini".text = "";
+          })
+        ]}
+        export TERM=xterm-256color
+        exec ${pkgs.mc}/bin/mc -S xoria256 "$@"
+      '')
+    ])
   ];
 }
 
-- 
cgit v1.2.3


From 6a9ff979548fdc28193569b0e514353838c87896 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 22:57:02 +0100
Subject: l 2 vim: use concat

---
 lass/2configs/vim.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 4e0af0dc7..e6cf8d101 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -207,11 +207,14 @@ let
     alldirs = attrValues dirs ++ map dirOf (attrValues files);
   in unique (sort lessThan alldirs);
 
-  vim = pkgs.writeDashBin "vim" ''
-    set -efu
-    (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
-    exec ${pkgs.vim}/bin/vim "$@"
-  '';
+  vim = pkgs.concat "vim" [
+    pkgs.vim
+    (pkgs.writeDashBin "vim" ''
+      set -efu
+      (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
+      exec ${pkgs.vim}/bin/vim "$@"
+    '')
+  ];
 
   hs.vim = pkgs.writeText "hs.vim" ''
     syn region String start=+\[[[:alnum:]]*|+ end=+|]+
-- 
cgit v1.2.3


From f66d7f4d4720d1166520eae6a552245bc92e6a2d Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 22:57:21 +0100
Subject: l 2: add htop.nix

---
 lass/2configs/default.nix |  1 +
 lass/2configs/htop.nix    | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 lass/2configs/htop.nix

(limited to 'lass')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 3e7881fb4..96f70d312 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -9,6 +9,7 @@ with import <stockholm/lib>;
     ../2configs/nixpkgs.nix
     ../2configs/vim.nix
     ../2configs/monitoring/client.nix
+    ./htop.nix
     ./backups.nix
     ./security-workarounds.nix
     {
diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix
new file mode 100644
index 000000000..0296101ac
--- /dev/null
+++ b/lass/2configs/htop.nix
@@ -0,0 +1,40 @@
+{ pkgs, ... }:
+
+with import <stockholm/lib>;
+
+{
+  nixpkgs.config.packageOverrides = super: {
+    htop = pkgs.concat "htop" [
+      super.htop
+      (pkgs.writeDashBin "htop" ''
+        export HTOPRC=${pkgs.writeText "htoprc" ''
+          fields=0 48 17 18 38 39 40 2 46 47 49 1
+          sort_key=46
+          sort_direction=1
+          hide_threads=0
+          hide_kernel_threads=1
+          hide_userland_threads=0
+          shadow_other_users=1
+          show_thread_names=1
+          show_program_path=1
+          highlight_base_name=1
+          highlight_megabytes=1
+          highlight_threads=1
+          tree_view=1
+          header_margin=1
+          detailed_cpu_time=0
+          cpu_count_from_zero=0
+          update_process_names=0
+          account_guest_in_cpu_meter=1
+          color_scheme=6
+          delay=15
+          left_meters=LeftCPUs2 RightCPUs2 Memory Swap
+          left_meter_modes=1 1 1 1
+          right_meters=Uptime Tasks LoadAverage Battery
+          right_meter_modes=2 2 2 2
+        ''}
+        exec ${super.htop}/bin/htop "$@"
+      '')
+    ];
+  };
+}
-- 
cgit v1.2.3


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')

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/1systems/mors.nix |  2 +-
 lass/2configs/logf.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 lass/2configs/logf.nix

(limited to 'lass')

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/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 9d1653fe7526922680f93b0990de85619d9a9dca Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 01:06:04 +0100
Subject: l 1 prism: saner repo-sync timers

---
 lass/1systems/prism.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lass')

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";
       };
     }
-- 
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')

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