modularise, combine

configuration.nix

@@ -1,13 +1,13 @@
-{lib, ...}: {
+{
+  lib,
+  machine,
+  ...
+}: {
   boot.loader = {
     efi.canTouchEfiVariables = true;
-    limine = {
-      enable = true;
-      efiSupport = true;
-    };
-    timeout = lib.mkDefault 2;
+    systemd-boot.enable = true;
   };
-  environment.persistence."/persist" = {
+  environment.persistence."/nix/persist" = {
     enable = true;
     hideMounts = true;
     directories = [
@@ -17,11 +17,24 @@
       "/var/lib/systemd/coredump"
       "/etc/NetworkManager/system-connections"
     ];
-    users."mtgmonkey" = {
+    files = [
+      "/etc/machine-id"
+      "/etc/ly/save.txt"
+    ];
+    users."andromeda" = {
       directories = [
-        "Downloads"
         ".backups"
+        ".local/share/Anki2"
+        ".local/share/chat.fluffy.fluffychat"
+        ".local/share/zoxide"
         ".ssh"
+        "conf"
+        "Downloads"
+        "pp"
+      ];
+      files = [
+        ".bash_history"
+        ".brush_history"
       ];
     };
   };
@@ -33,7 +46,7 @@
   networking = {
     dhcpcd.enable = true;
     firewall.enable = true;
-    hostName = "nixos";
+    hostName = machine.hostname;
     networkmanager.enable = true;
   };
   nix.settings.experimental-features = [
@@ -63,9 +76,10 @@
   };
   system.stateVersion = "26.05";
   time.timeZone = "Europe/Berlin";
-  users.users."mtgmonkey" = {
+  users.users."andromeda" = {
     isNormalUser = true;
-    description = "mtgmonkey";
+    description = "andromeda";
+    initialPassword = "password";
     extraGroups = [
       "networkmanager"
       "wheel"