From e7b1359a3345e9929120506c3da5eea08ec35338 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Aug 2017 07:51:15 +0200
Subject: tv viljetic-pages: bump comment

---
 tv/5pkgs/simple/viljetic-pages/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tv')

diff --git a/tv/5pkgs/simple/viljetic-pages/index.html b/tv/5pkgs/simple/viljetic-pages/index.html
index c06b3f97b..fc186d6ed 100644
--- a/tv/5pkgs/simple/viljetic-pages/index.html
+++ b/tv/5pkgs/simple/viljetic-pages/index.html
@@ -3,8 +3,7 @@
 <link rel="shortcut icon" href="favicon2.png" type="image/png">
 <i>This page intentionally left blank.</i>
 <!--
-  Ok, it's not blank, here are the cookies (bots welcome):
   mailto:tomislav@viljetic.de
   https://github.com/4z3
-  irc://freenode.net/#krebs
+  irc://freenode.net/krebs
 -->
-- 
cgit v1.2.3


From b9a4e834c06bc32fa38389e13c0ec42467c0fc46 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Aug 2017 09:06:27 +0200
Subject: tv mu: 300G HDD -> 120G SSD

---
 tv/1systems/mu/config.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 089481872..ee0f4f7f5 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -15,9 +15,9 @@ with import <stockholm/lib>;
   tv.x0vncserver.enable = true;
 
   # hardware configuration
-  boot.initrd.luks.devices = [
-    { name = "vgmu1"; device = "/dev/sda2"; }
-  ];
+  boot.initrd.luks.devices.muca = {
+    device = "/dev/disk/by-uuid/a8796bb3-6c03-4ddf-b2e4-c2e44c51d352";
+  };
   boot.initrd.luks.cryptoModules = [ "aes" "sha512" "xts" ];
   boot.initrd.availableKernelModules = [ "ahci" ];
   boot.kernelModules = [ "fbcon" "kvm-intel" ];
@@ -25,16 +25,17 @@ with import <stockholm/lib>;
 
   fileSystems = {
     "/" = {
-      device = "/dev/vgmu1/nixroot";
-      fsType = "ext4";
-      options = [ "defaults" "noatime" ];
+      device = "/dev/mapper/muvga-root";
+      fsType = "btrfs";
+      options = ["defaults" "noatime" "ssd" "compress=lzo"];
     };
     "/home" = {
-      device = "/dev/vgmu1/home";
-      options = [ "defaults" "noatime" ];
+      device = "/dev/mapper/muvga-home";
+      fsType = "btrfs";
+      options = ["defaults" "noatime" "ssd" "compress=lzo"];
     };
     "/boot" = {
-      device = "/dev/sda1";
+      device = "/dev/disk/by-uuid/DC38-F165";
     };
   };
 
-- 
cgit v1.2.3


From a9ce94115873bb6bb679919c18e8afd336f2d479 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 22:02:52 +0200
Subject: tv mu: sort systemPackages

---
 tv/1systems/mu/config.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index ee0f4f7f5..10d7b2197 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -52,18 +52,18 @@ with import <stockholm/lib>;
   networking.networkmanager.enable = true;
 
   environment.systemPackages = with pkgs; [
+    chromium
+    firefoxWrapper
+    gimp
+    iptables
+    libreoffice
+    pidginotr
+    pidgin-with-plugins
+    skype
     slock
     tinc_pre
-    iptables
     vim
-    gimp
     xsane
-    firefoxWrapper
-    chromium
-    skype
-    libreoffice
-    pidgin-with-plugins
-    pidginotr
 
     #foomatic_filters
     #gutenprint
-- 
cgit v1.2.3


From 056b02ed05a38a8a032ad70b4ec092dd07ba6736 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 22:03:14 +0200
Subject: tv mu: add kdeApplications.l10n.de.qt5

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

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 10d7b2197..f3e7b515b 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -56,6 +56,7 @@ with import <stockholm/lib>;
     firefoxWrapper
     gimp
     iptables
+    kdeApplications.l10n.de.qt5
     libreoffice
     pidginotr
     pidgin-with-plugins
-- 
cgit v1.2.3