From 489bbeef3c8b34d1fdd0c5b4fdb54436956ddcd5 Mon Sep 17 00:00:00 2001
From: Greg Burd <gburd@symas.com>
Date: Thu, 28 Sep 2023 13:15:12 -0400
Subject: [PATCH] fixes

---
 NOTES                                        |  4 ++-
 home-manager/_mixins/users/gburd/default.nix |  1 +
 nixos/_mixins/filesystems/btrfs.nix          | 33 --------------------
 nixos/floki/default.nix                      |  3 +-
 nixos/floki/disks.nix                        |  7 +++--
 5 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 nixos/_mixins/filesystems/btrfs.nix

diff --git a/NOTES b/NOTES
index bb0218e..db691d8 100644
--- a/NOTES
+++ b/NOTES
@@ -22,6 +22,7 @@
   * udevadm trigger
 
 INSTALL:
+nix-env -iA nixos.pkgs.gitAndTools.gitFull
 export device=/dev/nvme0n1
 export hostname=floki
 wipefs/shread/scrub ${device}
@@ -96,7 +97,7 @@ home-manager switch --flake .#username@hostname
 
 sudo nixos-rebuild switch --flake .#my-hostname
 clear; sudo nixos-rebuild dry-activate --flake .#${hostname}
-sudo nix run github:nix-community/disko -- --mode disko /tmp/disko-config.nix --arg disks '[ "/dev/nvme0n1" ]'
+sudo nix --extra-experimental-features "flakes nix-command" run github:nix-community/disko -- --mode disko nixos/${hostname}/disks.nix --arg disks '[ "/dev/nvme0n1" ]' --arg config.networking.hostName ${hostname}
 
 -------
 services.pcscd.enable = true;
@@ -123,4 +124,5 @@ TODO:
 EXAMPLE COMMANDS:
 
 * nh os switch --ask
+* nix run github:viperML/nh os switch --ask --nom .
 * clear; sudo nixos-rebuild dry-activate --flake .#floki
diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix
index 9975539..4e19947 100644
--- a/home-manager/_mixins/users/gburd/default.nix
+++ b/home-manager/_mixins/users/gburd/default.nix
@@ -126,6 +126,7 @@
     ];
     sessionVariables = {
       PAGER = "moar";
+      FLAKE = "/home/${username}/ws/nix-config";
     };
   };
   programs = {
diff --git a/nixos/_mixins/filesystems/btrfs.nix b/nixos/_mixins/filesystems/btrfs.nix
deleted file mode 100644
index 8b805c9..0000000
--- a/nixos/_mixins/filesystems/btrfs.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-_:
-{
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
-      fsType = "btrfs";
-      options = [ "subvol=root" "compress=zstd" ];
-    };
-
-  fileSystems."/nix" =
-    {
-      device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
-      fsType = "btrfs";
-      options = [ "subvol=nix" "noatime" "compress=zstd" ];
-    };
-
-  fileSystems."/persist" =
-    {
-      device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
-      fsType = "btrfs";
-      options = [ "subvol=persist" "noatime" "compression=zstd" ];
-      neededForBoot = true;
-    };
-
-  fileSystems."/var/logs" =
-    {
-      device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
-      fsType = "btrfs";
-      options = [ "subvol=logs" "noatime" "compress=zstd" ];
-      neededForBoot = true;
-    };
-
-}
diff --git a/nixos/floki/default.nix b/nixos/floki/default.nix
index 25ca2de..e9e05ce 100644
--- a/nixos/floki/default.nix
+++ b/nixos/floki/default.nix
@@ -5,11 +5,10 @@
     #inputs.nixos-hardware.nixosModules.common-gpu-nvidia
     inputs.nixos-hardware.nixosModules.common-pc
     inputs.nixos-hardware.nixosModules.common-pc-ssd
-    (import ./disks.nix { })
+    (import ./disks.nix)
 
     ../_mixins/hardware/systemd-boot.nix
     ../_mixins/filesystems/encrypted-root.nix
-    ../_mixins/filesystems/btrfs.nix
     ../_mixins/services/bluetooth.nix
     ../_mixins/services/pipewire.nix
     ../_mixins/virt
diff --git a/nixos/floki/disks.nix b/nixos/floki/disks.nix
index 4e4598e..74eaa87 100644
--- a/nixos/floki/disks.nix
+++ b/nixos/floki/disks.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/nvme0n1" ], ... }:
+{ config, disk ? "/dev/nvme0n1", ... }:
 let
   hostname = config.networking.hostName;
 in
@@ -7,7 +7,7 @@ in
     disk = {
       nvme = {
         type = "disk";
-        device = "/dev/nvme0n1";
+        device = disk;
         content = {
           type = "gpt";
           partitions = {
@@ -63,5 +63,6 @@ in
       };
     };
   };
-}
 
+  fileSystems."/persist".neededForBoot = true;
+}