From ea9fcce6944eb71ebb03862ced66cf280dad55a2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 11 Sep 2018 18:49:19 +0200
Subject: shell.nix: RIP

---
 tv/1systems/alnus/source.nix  | 4 ----
 tv/1systems/mu/source.nix     | 3 ---
 tv/1systems/nomic/source.nix  | 4 ----
 tv/1systems/querel/source.nix | 3 ---
 tv/1systems/wu/source.nix     | 4 ----
 tv/1systems/xu/source.nix     | 4 ----
 tv/1systems/zu/source.nix     | 4 ----
 7 files changed, 26 deletions(-)
 delete mode 100644 tv/1systems/alnus/source.nix
 delete mode 100644 tv/1systems/mu/source.nix
 delete mode 100644 tv/1systems/nomic/source.nix
 delete mode 100644 tv/1systems/querel/source.nix
 delete mode 100644 tv/1systems/wu/source.nix
 delete mode 100644 tv/1systems/xu/source.nix
 delete mode 100644 tv/1systems/zu/source.nix

(limited to 'tv/1systems')

diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix
deleted file mode 100644
index 9fd2f668..00000000
--- a/tv/1systems/alnus/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "alnus";
-  override.nixpkgs.git.ref = "d0f0657ca06cc8cb239cb94f430b53bcdf755887";
-}
diff --git a/tv/1systems/mu/source.nix b/tv/1systems/mu/source.nix
deleted file mode 100644
index 7e148cf3..00000000
--- a/tv/1systems/mu/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "mu";
-}
diff --git a/tv/1systems/nomic/source.nix b/tv/1systems/nomic/source.nix
deleted file mode 100644
index f173b65a..00000000
--- a/tv/1systems/nomic/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "nomic";
-  secure = true;
-}
diff --git a/tv/1systems/querel/source.nix b/tv/1systems/querel/source.nix
deleted file mode 100644
index 74eab51e..00000000
--- a/tv/1systems/querel/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "querel";
-}
diff --git a/tv/1systems/wu/source.nix b/tv/1systems/wu/source.nix
deleted file mode 100644
index 2e9cdeb8..00000000
--- a/tv/1systems/wu/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "wu";
-  secure = true;
-}
diff --git a/tv/1systems/xu/source.nix b/tv/1systems/xu/source.nix
deleted file mode 100644
index 46e1aee9..00000000
--- a/tv/1systems/xu/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "xu";
-  secure = true;
-}
diff --git a/tv/1systems/zu/source.nix b/tv/1systems/zu/source.nix
deleted file mode 100644
index 7a5c4f52..00000000
--- a/tv/1systems/zu/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "zu";
-  secure = true;
-}
-- 
cgit v1.2.3


From 4d0e453e8a778766a4e72ffc9bf9b07c61f8a5cd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 16 Sep 2018 21:31:14 +0200
Subject: tv mu: import <stockholm/tv>

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

(limited to 'tv/1systems')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 6c22971b..014d1445 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -2,9 +2,7 @@ with import <stockholm/lib>;
 { config, pkgs, ... }: {
 
   imports = [
-    <stockholm/krebs>
-    <stockholm/tv/2configs>
-    <stockholm/tv/3modules>
+    <stockholm/tv>
     <stockholm/tv/2configs/exim-retiolum.nix>
     <stockholm/tv/2configs/retiolum.nix>
   ];
-- 
cgit v1.2.3


From b3b50f8d39f3a72fa383b82234f8fa571d3e18d9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 16 Sep 2018 22:02:16 +0200
Subject: tv mu: add plasma-pa

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

(limited to 'tv/1systems')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 014d1445..f5136654 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -55,6 +55,7 @@ with import <stockholm/lib>;
     gimp
     iptables
     libreoffice
+    plasma-pa
     (pkgs.pidgin-with-plugins.override {
       plugins = [ pkgs.pidginotr ];
     })
-- 
cgit v1.2.3