feat(nixos/alpha): system fixup

5 files changed, 36 insertions, 55 deletions

diff --git a/flake.lock b/flake.lock
index 446147d..1dcac8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651652192,
-        "narHash": "sha256-3FUsIJ81p57rOxODRVZ+anhnVav96VWbgNA1H3Np+TY=",
+        "lastModified": 1654422613,
+        "narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "267462dfb36d447421c789a3adf9d460cd09c147",
+        "rev": "20703892473d01c70fb10248442231fe94f4ceb4",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1651678465,
-        "narHash": "sha256-H/MiQyb9PJX1YNO27ez3uIXON4hIHP3pwkH0H2OWldE=",
+        "lastModified": 1654465559,
+        "narHash": "sha256-7VqJVidpdGJ7P5UMDYdj0wKZhqieWWCtpX8FmV2u+MQ=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "4f17e7e1c38e53eb214fd85cde1cbbe332e86498",
+        "rev": "ae02c02f1f71e8e3a5324c4857a03156c0691ad8",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
     },
     "nixpkgs-2111": {
       "locked": {
-        "lastModified": 1651571855,
-        "narHash": "sha256-KZie6c2J2DUPLjG2PkYSwGLvD6RygA3TxZSPQpctbNI=",
+        "lastModified": 1654346688,
+        "narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd43ce017d4c95f47166d28664a004f57458a0b1",
+        "rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45",
         "type": "github"
       },
       "original": {
@@ -162,11 +162,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651632340,
-        "narHash": "sha256-Kq1yghXZxJ12Sw1nbzoO2Ag8/AxqbbD84wiz8go159o=",
+        "lastModified": 1654483484,
+        "narHash": "sha256-Ki/sMgrUEj+31P3YMzZZp5Nea7+MQVVTdaRWQVS1PL4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "88991ffbd57e10b474ea768ec0b54c4f379c566c",
+        "rev": "6bc59b9c4ad1cc1089219e935aa727a96d948c5d",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1651558728,
-        "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=",
+        "lastModified": 1654230545,
+        "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cbe587c735b734405f56803e267820ee1559e6c1",
+        "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
     },
     "unstable-small": {
       "locked": {
-        "lastModified": 1651654660,
-        "narHash": "sha256-ZuQ3wQwIEwqBAEOeL/mY5dV0pxuz7OIz/lzeLBIskAE=",
+        "lastModified": 1654414801,
+        "narHash": "sha256-HSzC2kS7zRYfd4qw/IICrcP46jZFdWGgSSR7DtlgOiI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c04ef155994d060aceedf946eeba0ab756b19c01",
+        "rev": "34a7b3142e34796133fcb3f9c857d7b17982fdaa",
         "type": "github"
       },
       "original": {
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix
index abed77b..21ff03d 100644
--- a/home/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -111,7 +111,7 @@ in
       pkgs.cargo-deny
     ];
 
-    home.file.".codelldb".source = pkgs.vscode-extensions.vadimcn.vscode-lldb;
+    # home.file.".codelldb".source = pkgs.vscode-extensions.vadimcn.vscode-lldb;
   };
 }
 
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index bf9b7e1..e259f33 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -221,10 +221,16 @@
     ];
   };
 
+  users.mutableUsers = false;
+
+  fileSystems."/persist".neededForBoot = true;
+
   users.users = {
+    root.passwordFile = "/persist/passwords/root";
     zach = {
       isNormalUser = true;
       shell = pkgs.zsh;
+      passwordFile = "/persist/passwords/zach";
 
       extraGroups = [
         "wheel"
diff --git a/nixos/alpha/hardware-configuration.nix b/nixos/alpha/hardware-configuration.nix
index 0d0593f..8636fad 100644
--- a/nixos/alpha/hardware-configuration.nix
+++ b/nixos/alpha/hardware-configuration.nix
@@ -10,52 +10,27 @@
   hardware.enableRedistributableFirmware = true;
 
   fileSystems."/" = {
-    device = "rpool/root/nixos";
+    device = "rpool/local/root";
     fsType = "zfs";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/55B4-0E38";
+    device = "/dev/disk/by-uuid/31C2-3406";
     fsType = "vfat";
   };
 
   fileSystems."/nix" = {
-    device = "rpool/root/nixos/nix";
-    fsType = "zfs";
-  };
-
-  fileSystems."/etc" = {
-    device = "rpool/root/nixos/etc";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var" = {
-    device = "rpool/root/nixos/var";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var/lib" = {
-    device = "rpool/root/nixos/var/lib";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var/log" = {
-    device = "rpool/root/nixos/var/log";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var/spool" = {
-    device = "rpool/root/nixos/var/spool";
+    device = "rpool/local/nix";
     fsType = "zfs";
   };
 
   fileSystems."/home" = {
-    device = "rpool/home";
+    device = "rpool/safe/home";
     fsType = "zfs";
   };
 
-  fileSystems."/home/zach" = {
-    device = "rpool/home/zach";
+  fileSystems."/persist" = {
+    device = "rpool/safe/persist";
     fsType = "zfs";
   };
 
@@ -64,7 +39,7 @@
     fsType = "ext4";
   };
 
-  swapDevices = [ ];
+  swapDevices = [ { device = "/dev/disk/by-uuid/ff8bd8d2-2b3b-495d-8865-9cd140dd1f54"; } ];
 
   nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";
diff --git a/packages/default.nix b/packages/default.nix
index 811fcfd..2e418f1 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -7,9 +7,9 @@ in
 
 {
   "neovim" = neovim.packages.x86_64-linux.neovim;
-  "codelldb" = pkgs.writeScriptBin "codelldb" ''
-    ${vscode-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/adapter/.codelldb-wrapped_ \
-    --liblldb ${vscode-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/lldb/lib/liblldb.so $@
-  '';
+  # "codelldb" = pkgs.writeScriptBin "codelldb" ''
+    # ${vscode-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/adapter/.codelldb-wrapped_ \
+    # --liblldb ${vscode-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/lldb/lib/liblldb.so $@
+  # '';
   "athens" = pkgs.callPackage ./athens.nix { };
 }