From 193a4a25461ba06d1c9a588efadd28206e288900 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 4 Sep 2023 12:32:53 -0500
Subject: [PATCH] WIP colmena stuff

---
 flake.nix | 25 +++++--------------------
 readme.md |  4 ++--
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/flake.nix b/flake.nix
index e67f748..f0e16f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
     };
   };
 
-  outputs = inputs: {
+  outputs = { self, ... }@inputs: {
     diskoConfigurations = {
       encryptedUefiBtrfs = import ./machines/thinker-disks.nix;
       normalUefiBtrfs = import ./machines/musicbox-disks.nix;
@@ -118,27 +118,12 @@
           system = "x86_64-linux";
         };
       };
-      musicbot = inputs.nixpkgs.lib.nixosSystem {
+      beefcake = inputs.nixpkgs.lib.nixosSystem {
         deployment = {
-          targetHost = "musicbox";
-          targetPort = 1234;
-          targetUser = "nixos";
+          targetHost = "beefcake";
+          targetUser = "daniel";
         };
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules =
-          [
-            inputs.disko.nixosModules.disko
-            ./machines/musicbox-disks.nix
-            { _module.args.disks = [ "/dev/sda" ]; }
-            ./machines/musicbox.nix
-            inputs.home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.daniel = import ./daniel.nix;
-            }
-          ];
+        modules = [ self.nixosConfigurations.beefcake ];
       };
     };
   };
diff --git a/readme.md b/readme.md
index baecc77..7b30885 100644
--- a/readme.md
+++ b/readme.md
@@ -51,7 +51,7 @@ sudo nix-shell --packages git --run "
     --extra-experimental-features nix-command \
     --extra-experimental-features flakes \
     github:nix-community/disko -- \
-      --flake 'git+https://git.lyte.dev/lytedev/dotfiles?ref=main&dir=/os/linux/nix#diskoConfigOfChoice' \
+      --flake 'git+https://git.lyte.dev/lytedev/nix#diskoConfigOfChoice' \
       --mode disko \
       --arg disks '[ \"/dev/your_disk\" ]'
 "
@@ -63,7 +63,7 @@ And finally install NixOS as specified by this flake:
 nix-shell --packages git \
   --run "
     sudo nixos-install \
-      --flake 'git+https://git.lyte.dev/lytedev/dotfiles?ref=main&dir=/os/linux/nix#yourNixosConfig'
+      --flake 'git+https://git.lyte.dev/lytedev/nix#yourNixosConfig'
   "
 ```