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

1 files changed, 12 insertions, 2 deletions

diff --git a/vali.nix b/vali.nix
index 958faf2f..d6e6df4c 100644
--- a/vali.nix
+++ b/vali.nix
@@ -55,6 +55,7 @@ rec {
     tmux
     mosh
     ntfs3g
+    sshfsFuse
   ];
 
   # List services that you want to enable:
@@ -74,6 +75,8 @@ rec {
   # services.xserver.displayManager.kdm.enable = true;
   # services.xserver.desktopManager.kde4.enable = true;
 
+  users.mutableUsers = false;
+
   users.extraUsers.root = let
     template = (import users/gkleen.nix);
     in {
@@ -81,6 +84,11 @@ rec {
         openssh.authorizedKeys.keyFiles = template.openssh.authorizedKeys.keyFiles;
       };
 
+  users.extraGroups.media = {
+    gid = 498;
+    members = [ "gkleen" ];
+  };
+
   system.activationScripts = let
     setupUsers = pkgs.callPackage custom/dotfiles.nix {};
     toRec = name : {
@@ -168,16 +176,18 @@ rec {
   #     automountConfig = {
   #       DirectoryMode = "555";
   #     };
+  #     wantedBy = [ "remote-fs.target" ];
   #   }
   # ];
 
   # systemd.mounts = [
   #   { enable = true;
   #     where = "/var/media";
-  #     what = "gkleen@hel.asgard.yggdrasil:/var/media";
+  #     what = "media@hel.asgard.yggdrasil:/var/media";
   #     type = "fuse.sshfs";
-  #     options = "users,idmap=gkleen,IdentityFile=/home/user/.ssh/id_ed25519,allow_other,reconnect,_netdev";
+  #     options = "idmap=user,IdentityFile=/home/gkleen/.ssh/media@hel,allow_other,reconnect,_netdev";
   #     mountConfig = {
+  #       Environment = "PATH=/run/current-system/sw/bin:/run/current/system/sw/sbin";
   #       DirectoryMode = "555";
   #     };
   #   }