From 64293ab8bfcd78e54d1c6d42a5e4bcc28b5db1c4 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Tue, 17 Jan 2023 03:43:58 -0600
Subject: [PATCH] wip

---
 flake.lock                                    | 83 +------------------
 flake.nix                                     | 19 +----
 .../configuration.nix                         |  6 +-
 environment.nix => modules/environment.nix    |  0
 overlays.nix => modules/overlays.nix          |  0
 5 files changed, 10 insertions(+), 98 deletions(-)
 rename configuration.nix => modules/configuration.nix (97%)
 rename environment.nix => modules/environment.nix (100%)
 rename overlays.nix => modules/overlays.nix (100%)

diff --git a/flake.lock b/flake.lock
index 4435e54..c165e90 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,54 +1,12 @@
 {
   "nodes": {
-    "hyprland": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "wlroots": "wlroots"
-      },
-      "locked": {
-        "lastModified": 1669054465,
-        "narHash": "sha256-4xBCexof83T4eFR2EP6HGfpHGLPJf3x6hsWt8LlhIHU=",
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "rev": "d504c1e5ab84bcbf7648350e867ccdda9b38b9c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "type": "github"
-      }
-    },
-    "nix-ld": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1652641841,
-        "narHash": "sha256-TTBz20XR2vmvOSDu8hXcbHbOEI0t/IWq8vZuRKyep1E=",
-        "owner": "Mic92",
-        "repo": "nix-ld",
-        "rev": "c25cc4b5ec65f03c2bb96f927ae724a59c51d7ee",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "nix-ld",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1668132053,
-        "narHash": "sha256-eQ2/vjxbkEJmG1YJu58TK8S/AEB52MKrXPy5IhTH6nE=",
+        "lastModified": 1673948162,
+        "narHash": "sha256-g42vnm7dzVkb+l1Rzkyv1ttHto889ApbEq7DVb/faw8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "34f89bcce8711acb0e4de1203ed078b7976e08b2",
+        "rev": "682381bf3f24c4d2ddeace757ce506c69b8f7c07",
         "type": "github"
       },
       "original": {
@@ -60,43 +18,8 @@
     },
     "root": {
       "inputs": {
-        "hyprland": "hyprland",
-        "nix-ld": "nix-ld",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1652372896,
-        "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "wlroots": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.freedesktop.org",
-        "lastModified": 1668785720,
-        "narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.freedesktop.org",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "type": "gitlab"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index bece7f4..8b7fcb7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,15 +3,6 @@
 
   inputs = {
     nixpkgs = { url = "github:nixos/nixpkgs/master"; };
-    nix-ld = {
-      url = "github:Mic92/nix-ld";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      # build with your own instance of nixpkgs
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
 
@@ -22,14 +13,10 @@
         nixos-vm = inputs.nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
-            ./configuration.nix
-            ./overlays.nix
-            ./environment.nix
-            inputs.hyprland.nixosModules.default
-            { programs.hyprland.enable = true; }
-            inputs.nix-ld.nixosModules.nix-ld
+            ./modules/configuration.nix
+            ./modules/overlays.nix
+            ./modules/environment.nix
           ];
-          specialArgs = { inherit inputs; };
         };
       };
     };
diff --git a/configuration.nix b/modules/configuration.nix
similarity index 97%
rename from configuration.nix
rename to modules/configuration.nix
index f98ba8c..b566409 100644
--- a/configuration.nix
+++ b/modules/configuration.nix
@@ -18,7 +18,9 @@
   time.timeZone = "America/Chicago";
 
   programs.zsh.enable = true;
-  # overwrite demo as default login
+
+  programs.nix-ld.enable = true;
+
   services.xserver = {
     enable = true;
     displayManager.startx.enable = true;
@@ -92,7 +94,7 @@
     # firefox
     wavebox
 
-pciutils
+    pciutils
     (vivaldi.override {
       proprietaryCodecs = true;
       enableWidevine = false;
diff --git a/environment.nix b/modules/environment.nix
similarity index 100%
rename from environment.nix
rename to modules/environment.nix
diff --git a/overlays.nix b/modules/overlays.nix
similarity index 100%
rename from overlays.nix
rename to modules/overlays.nix