From 15bc4f78ec3fa9dd50b757c5b0c4de6aa600907e Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Mon, 17 Mar 2025 09:16:32 -0600
Subject: merge stuff?

---
 flake.lock | 22 ++++++++++++++++++++++
 flake.nix  | 12 ++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/flake.lock b/flake.lock
index c2fc251..f2d7eca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -145,6 +145,27 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736864502,
+        "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "0141aabed359f063de7413f80d906e1d98c0c123",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "latest",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -682,6 +703,7 @@
         "catppuccin-helix": "catppuccin-helix",
         "catppuccin-hyprland": "catppuccin-hyprland",
         "catppuccin-starship": "catppuccin-starship",
+        "disko": "disko",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "lix-module": "lix-module",
diff --git a/flake.nix b/flake.nix
index 679d58c..55f25a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    #for device formatting
+    disko = {
+      url = "github:nix-community/disko/latest";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # modern window compositor
     hyprland = {
       url = "github:hyprwm/Hyprland";
@@ -223,6 +229,12 @@
             home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; }
           ];
         };
+        biski = lib.nixosSystem { # another networking server, physical instead of cloud
+          modules = minimalConfigSettings ++ [ ./machines/biski
+            disko.nixosModules.disko
+            home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; }
+          ];
+        };
         picast = lib.nixosSystem { # anger at chromecast
           modules = minimalConfigSettings ++ [ ./machines/picast
             home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; }
-- 
cgit v1.2.3