Merge branch 'master' of git.yggdrasil.li:nixos

2 files changed, 13 insertions, 1 deletions

diff --git a/vali-hw.nix b/vali-hw.nix
index eb387a41..0182ebad 100644
--- a/vali-hw.nix
+++ b/vali-hw.nix
@@ -28,6 +28,18 @@
       fsType = "ext2";
     };
 
+  fileSystems."/media/C" =
+    { device = "/dev/disk/by-uuid/72AEB04AAEB0089D";
+      fsType = "ntfs";
+      options = [ "ro" "noexec" "nosuid" ];
+    };
+
+  fileSystems."/media/D" =
+    { device = "/dev/disk/by-uuid/48281D17281D061A";
+      fsType = "ntfs";
+      options = [ "ro" "noexec" "nosuid" ];
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-uuid/53fd36a6-9d1e-4316-ac21-8d38d89753ac"; }
     ];
diff --git a/vali.nix b/vali.nix
index 4123cd75..a1948421 100644
--- a/vali.nix
+++ b/vali.nix
@@ -54,6 +54,7 @@ rec {
     vim
     tmux
     mosh
+    ntfs3g
   ];
 
   # List services that you want to enable:
@@ -104,7 +105,6 @@ rec {
         enable = true;
         defaultUser = "gkleen";
       };
-      desktopManagerHandlesLidAndPower = false;
       sessionCommands = ''
         ${pkgs.xorg.xrandr}/bin/xrandr --output DP-2 --primary --mode '2560x1440' # services.xserver.xrandrHeads is proving unreliable
         ${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --left-of DP-2