From cece7c1c0f56e36ed767b3309d495aae0d145ca3 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Thu, 18 Apr 2024 07:03:06 -0500
Subject: [PATCH] updates from makefile

---
 flake.lock        | 51 ++++++++---------------------------------------
 flake.nix         |  3 ---
 home/gui/sway.nix |  3 +++
 3 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/flake.lock b/flake.lock
index 30985d8..7c61963 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "disko": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1712798444,
-        "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -93,7 +75,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "libgit2": "libgit2",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
@@ -127,16 +109,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712757991,
-        "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=",
+        "lastModified": 1709083642,
+        "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932",
+        "rev": "b550fe4b4776908ac2a861124307045f8e717c8e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -176,22 +158,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1709083642,
-        "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b550fe4b4776908ac2a861124307045f8e717c8e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1712778888,
         "narHash": "sha256-JTssetEdUSdocmrq8UCIRr414fhQp1errtarYqo9IYs=",
@@ -207,7 +173,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1695644571,
         "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
@@ -225,17 +191,16 @@
     },
     "root": {
       "inputs": {
-        "disko": "disko",
         "home-manager": "home-manager",
         "nix": "nix",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "wayland-pipewire-idle-inhibit": "wayland-pipewire-idle-inhibit"
       }
     },
     "treefmt-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1704649711,
diff --git a/flake.nix b/flake.nix
index 88ad3b8..6548543 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,5 @@
 {
   inputs = {
-    disko.url = "github:nix-community/disko";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
     home-manager = {
@@ -17,7 +16,6 @@
     self,
       nixpkgs,
       nix,
-      disko,
       nixos-hardware,
       home-manager,
       wayland-pipewire-idle-inhibit,
@@ -113,7 +111,6 @@
         };
 
         # test system
-        # use this for a blank ISO + disko to work
         nixos = lib.nixosSystem {
           modules = [ ./hosts/nixos ];
           specialArgs = { inherit inputs outputs; };
diff --git a/home/gui/sway.nix b/home/gui/sway.nix
index eabd9f1..88580cd 100644
--- a/home/gui/sway.nix
+++ b/home/gui/sway.nix
@@ -1,4 +1,7 @@
 { inputs, pkgs, hostname, outputs, ... }:
+# let
+#   hostname = config.networking.hostName;
+# in
 {
   xdg.configFile."sway/config".source = files/sway/default;
   # xdg.configFile."sway/config".source = files/sway/${inputs.networking.hostName};