Revamp

machines/hermes.nix

@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ../profiles/minimal.nix
-    ../profiles/desktop.darwin.nix
-  ];
-
   environment.darwinConfig = "/Users/${config.system.primaryUser}/Development/systems";
 
   system.primaryUser = "pml";

machines/hermes/default.nix

@@ -1,13 +0,0 @@
-{ self, pkgs, ... }:
-
-{
-  environment.systemPackages = [
-    pkgs.vim
-  ];
-
-  nix.settings.experimental-features = "nix-command flakes";
-
-  system.stateVersion = 6;
-
-  nixpkgs.hostPlatform = "aarch64-darwin";
-}

machines/persephone.nix

@@ -4,13 +4,13 @@
   pkgs,
   ...
 }:
-
+let
+  boot = "cb03cf78-715e-4030-ba82-189ff8897eaf";
+  esp = "4E4C-1139";
+  luks = "0cf52ea1-16d1-4dec-a69a-bdac82bbcf25";
+  cryptroot = "6fb9ce3c-c870-4eb7-8199-6536ff898701";
+in
 {
-  imports = [
-    ../profiles/minimal.linux.nix
-    ../profiles/desktop.linux.nix
-  ];
-
   boot = {
     blacklistedKernelModules = [
       "spd5118"
@@ -24,14 +24,18 @@
     kernelParams = [ "i915.enable_guc=3" ];
   };
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "thunderbolt"
-    "nvme"
-    "ahci"
-    "usbhid"
-    "sd_mod"
-  ];
+  boot.initrd = {
+    availableKernelModules = [
+      "xhci_pci"
+      "thunderbolt"
+      "nvme"
+      "ahci"
+      "usbhid"
+      "sd_mod"
+    ];
+    luks.devices."cryptroot".device = "/dev/disk/by-uuid/${luks}";
+
+  };
 
   console = {
     keyMap = "us";
@@ -40,6 +44,18 @@
 
   i18n.defaultLocale = "en_US.UTF-8";
 
+  fileSystems."/".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/boot".device = "/dev/disk/by-uuid/${boot}";
+  fileSystems."/efi".device = "/dev/disk/by-uuid/${esp}";
+  fileSystems."/home".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/nix".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/var/cache".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/var/lib/machines".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/var/lib/portables".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/var/log".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/var/spool".device = "/dev/disk/by-uuid/${cryptroot}";
+  fileSystems."/var/tmp".device = "/dev/disk/by-uuid/${cryptroot}";
+
   hardware.enableRedistributableFirmware = true;
   hardware.bluetooth.enable = true;
 
@@ -126,15 +142,6 @@
     trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ];
   };
 
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "1password"
-      "1password-cli"
-      "nvidia-x11"
-      "nvidia-settings"
-    ];
-
   programs._1password.enable = true;
 
   services.hardware.openrgb = {
@@ -159,16 +166,6 @@
       "i2c"
       "wheel"
     ];
-    packages = with pkgs; [
-      (vscode-with-extensions.override {
-        vscode = vscodium;
-        vscodeExtensions = with vscode-extensions; [
-          jnoortheen.nix-ide
-          mkhl.direnv
-          yzhang.markdown-all-in-one
-        ];
-      })
-    ];
   };
 
   # DO NOT EDIT