From 74429f245d366e783ecbcfb0ebd83a7f57e78e6a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 10:01:16 +0200
Subject: tv: add htop to default systemPackages

---
 tv/1systems/cd.nix | 1 -
 tv/1systems/wu.nix | 1 -
 tv/1systems/xu.nix | 1 -
 tv/1systems/zu.nix | 1 -
 4 files changed, 4 deletions(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 108006f34..9f2cec574 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -25,7 +25,6 @@ with import <stockholm/lib>;
   };
 
   environment.systemPackages = with pkgs; [
-    htop
     iftop
     iotop
     iptables
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 60f9fa100..4b3bf8538 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -31,7 +31,6 @@ with import <stockholm/lib>;
         get
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         mkpasswd
         netcat
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 3add01748..d82f45ac0 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -34,7 +34,6 @@ with import <stockholm/lib>;
         file
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         krebszones
         mkpasswd
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index 5552ef065..4fae3ca75 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -36,7 +36,6 @@ with import <stockholm/lib>;
         file
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         mkpasswd
         netcat
-- 
cgit v1.2.3


From 3789c7698b4e076d907e31ab8c0ba60597ee3721 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 19:55:49 +0200
Subject: tv alnus nixpkgs: e924319 -> 9b948ea

---
 tv/1systems/alnus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus.nix
index 4bc0318e8..ef2a0500f 100644
--- a/tv/1systems/alnus.nix
+++ b/tv/1systems/alnus.nix
@@ -58,7 +58,7 @@ with import <stockholm/lib>;
   krebs.build = {
     host = config.krebs.hosts.alnus;
     user = mkForce config.krebs.users.dv;
-    source.nixpkgs.git.ref = mkForce "e924319cb6c74aa2a9c943eddeb0caef79db01bc";
+    source.nixpkgs.git.ref = mkForce "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
   };
 
   networking.networkmanager.enable = true;
-- 
cgit v1.2.3


From ebb68ee1f89d9387402effe0726809831e6de9b6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 21:30:05 +0200
Subject: tv mu: security.wrappers.slock.{slock => source}

---
 tv/1systems/mu.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index fcd0a2178..cb8e7d97a 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -101,7 +101,7 @@ with import <stockholm/lib>;
 
   security.wrappers = {
     sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
-    slock.slock = "${pkgs.slock}/bin/slock";
+    slock.source = "${pkgs.slock}/bin/slock";
   };
 
   security.pam.loginLimits = [
-- 
cgit v1.2.3


From 24adece79e47af6602ce1fc48a2d5b772c225b61 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 21:30:22 +0200
Subject: tv mu: kde4 -> plasma5, maybe

---
 tv/1systems/mu.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index cb8e7d97a..8e527b021 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -82,12 +82,9 @@ with import <stockholm/lib>;
     chromiumDev
     skype
     libreoffice
-    kde4.l10n.de
-    kde4.plasma-nm
     pidgin-with-plugins
     pidginotr
 
-    kde4.print_manager
     #foomatic_filters
     #gutenprint
     #cups_pdf_filter
@@ -138,7 +135,9 @@ with import <stockholm/lib>;
     twoFingerScroll = true;
   };
 
-  services.xserver.desktopManager.kde4.enable = true;
+  services.xserver.desktopManager.plasma5 = {
+    enable = true;
+  };
   services.xserver.displayManager.auto = {
     enable = true;
     user = "vv";
-- 
cgit v1.2.3


From 4fc9f53f7a44a52fafc4ba7e7d3bf8e3dd865dd5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 22:29:46 +0200
Subject: tv mu: chromiumDev -> chromium

---
 tv/1systems/mu.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index 8e527b021..3f3b2c2f4 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -79,7 +79,7 @@ with import <stockholm/lib>;
     gimp
     xsane
     firefoxWrapper
-    chromiumDev
+    chromium
     skype
     libreoffice
     pidgin-with-plugins
-- 
cgit v1.2.3