diff options
| author | makefu <github@syntax-fehler.de> | 2017-09-04 09:05:06 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-09-04 09:05:06 +0200 |
| commit | 729549d15464e57e41fd143450c36274cedc84fa (patch) | |
| tree | c28cfa3576c601f7f665cebc7721ef3a08311792 /tv | |
| parent | 848acb85ccecbe25987bf6da45a96fc4eaaa74e9 (diff) | |
| parent | fcf59a00e2ab675cb171cbe4f21b8df73836d144 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/mu/config.nix | 36 | ||||
| -rw-r--r-- | tv/5pkgs/simple/viljetic-pages/index.html | 3 |
2 files changed, 20 insertions, 19 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 089481872..f3e7b515b 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"; }; }; @@ -51,18 +52,19 @@ with import <stockholm/lib>; networking.networkmanager.enable = true; environment.systemPackages = with pkgs; [ + chromium + firefoxWrapper + gimp + iptables + kdeApplications.l10n.de.qt5 + libreoffice + pidginotr + pidgin-with-plugins + skype slock tinc_pre - iptables vim - gimp xsane - firefoxWrapper - chromium - skype - libreoffice - pidgin-with-plugins - pidginotr #foomatic_filters #gutenprint 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 --> |