snapshot

common/boot.nix

@@ -11,5 +11,6 @@
         efiSysMountPoint = "/boot";
       };
     };
+    tmp.cleanOnBoot = true;
   };
 }

common/fish.nix

@@ -0,0 +1,15 @@
+{pkgs, ...}: {
+  programs.fish.enable = true;
+
+  users.defaultUserShell = pkgs.fish;
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      fish = prev.fish.overrideAttrs (_: {
+        postInstall = ''
+          rm $out/share/applications/fish.desktop
+        '';
+      });
+    })
+  ];
+}

common/fs.nix

@@ -1,15 +0,0 @@
-{
-  boot.tmp.cleanOnBoot = true;
-
-  fileSystems = {
-    "/" = {
-      fsType = "ext4";
-      label = "main";
-      options = ["noatime"];
-    };
-    "/boot" = {
-      label = "BOOT";
-      fsType = "vfat";
-    };
-  };
-}

common/time.nix

@@ -1,3 +0,0 @@
-{
-  time.timeZone = "UTC";
-}

common/user.nix

@@ -0,0 +1,13 @@
+{lib, ...}: let
+  inherit (lib) types;
+in {
+  options = {
+    users.mainUser = lib.mkOption {
+      type = types.passwdEntry types.str;
+      default = "lukas";
+      description = ''
+        The main user.
+      '';
+    };
+  };
+}

common/users.nix

@@ -1,5 +1,11 @@
-{config, ...}: {
-  age.secrets.user-lukas.file = ../secrets/user-lukas.age;
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (config.users) mainUser;
+in {
+  age.secrets = lib.mkSecrets {"user-${mainUser}" = {};};
 
   users = {
     mutableUsers = false;
@@ -9,10 +15,10 @@
         hashedPassword = "!";
         openssh.authorizedKeys.keys = builtins.attrValues (import ../pubkeys.nix).hosts;
       };
-      lukas = {
+      ${mainUser} = {
         uid = 1000;
         isNormalUser = true;
-        hashedPasswordFile = config.age.secrets.user-lukas.path;
+        hashedPasswordFile = config.age.secrets."user-${mainUser}".path;
         openssh.authorizedKeys.keys = builtins.attrValues (import ../pubkeys.nix).users;
         extraGroups = ["wheel"];
       };