Format

machines/tounge/configuration.nix

@@ -41,6 +41,7 @@
     };
     config = {
       setupGrub = false;
+      userUid = "1001";
       nix = {
         autoUpdate = true;
         autoGC = true;

modules/linux/default.nix

@@ -138,6 +138,12 @@ in {
             description = "Whether to install the 'nathan' user";
             type = lib.types.bool;
           };
+          homeTmpfs = mkEnableOptionT "~/.tmp as tmpfs";
+          userUid = mkOption {
+            default = "1000";
+            example = "1000";
+            description = "UID of the user";
+          };
           # Should we harden this system?
           # On by default
           harden = mkEnableOptionT "Apply system hardening";

modules/linux/user.nix

@@ -19,8 +19,7 @@ in with lib; {
       };
       environment.shells = [ pkgs.fish ];
       users = {
-        # If we install the user and the system is hardended, then disable mutable users
+        mutableUsers = !nc.installUser;
-        mutableUsers = !(nc.installUser && nc.harden);
         # Configure our user, if enabled
         users."${nc.user}" = mkMerge [
           (mkIf nc.installUser {
@@ -65,5 +64,11 @@ in with lib; {
     (mkIf config.nathan.hardware.amdPassthrough {
       users.users."${nc.user}".extraGroups = [ "libvirtd" ];
     })
+    (mkIf (nc.homeTmpfs && nc.installUser) {
+      fileSystems."/home/${nc.user}/.tmp" = {
+        fsType = "tmpfs";
+        options = [ "mode=700" "uid=${nc.userUid}" "gid=100" ];
+      };
+    })
   ];
 }

packages/sommelier/default.nix

@@ -1,7 +1,7 @@
-  { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
-  , libxkbcommon, mesa, pixman, xorg, wayland, gtest }:
+, libxkbcommon, mesa, pixman, xorg, wayland, gtest }:
 
-  stdenv.mkDerivation {
+stdenv.mkDerivation {
   pname = "sommelier";
   version = "104.0";
 
@@ -26,4 +26,4 @@
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
-  }
+}