summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/mu/config.nix19
-rw-r--r--tv/5pkgs/simple/viljetic-pages/index.html3
2 files changed, 11 insertions, 11 deletions
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";
};
};
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
-->