From d577ef212980783bae4c846102f14b3d40cb9789 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Fri, 4 Nov 2022 13:02:24 +0000
Subject: [PATCH] formatting

---
 configuration.nix          | 18 ++-------------
 flake.lock                 | 45 ++++++++++++++++++++++++++++++++++----
 flake.nix                  |  4 ++--
 hardware-configuration.nix |  9 ++++----
 4 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 8000c0a..a773651 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -15,7 +15,7 @@
     	experimental-features = nix-command flakes
     	'';
 
-  programs.nix-ld.enable = true;
+  #  programs.nix-ld.enable = true;
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -78,7 +78,7 @@
     nixpkgs-fmt
 
     autorandr
-    wezterm
+    #    wezterm
     eww
     rofi
     picom
@@ -89,25 +89,11 @@
   ];
 
 
-  ## make qtile's python handle the extra dependency
-  #nixpkgs.overlays = [
-  #(self: super: {
-  #qtile = super.qtile.overrideAttrs(oldAttrs: { 
-  #pythonPath = oldAttrs.pythonPath ++ (with self.python3Packages; [
-  #tomli
-  #]);
-  #});
-  #
-  #})];
-
-
   fonts.fonts = with pkgs; [
     (nerdfonts.override { fonts = [ "FiraCode" ]; })
   ];
 
 
-
-
   environment.variables = {
     NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
       stdenv.cc.cc
diff --git a/flake.lock b/flake.lock
index e302a0b..d245ebc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,62 @@
 {
   "nodes": {
+    "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": 1603153815,
-        "narHash": "sha256-uCav0CJ0Zm0vbqJiS9NUYD4XZg4Ww9bbsFzcDUzh2+U=",
+        "lastModified": 1667518366,
+        "narHash": "sha256-BOkyI/yJFSTVESvojmv6uP5nuYunn2ZoUHJoMwN3Ufs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "007126eef72271480cb7670e19e501a1ad2c1ff2",
+        "rev": "ec8c2ba98d5020318a9d5635918861b494aa6831",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
+        "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"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 545a6a8..96db85e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "An example NixOS configuration";
 
   inputs = {
-    nixpkgs = { url = "github:nixos/nixpkgs/nixos-unstable"; };
+    nixpkgs = { url = "github:nixos/nixpkgs/master"; };
     nix-ld = {
       url = "github:Mic92/nix-ld";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -20,7 +20,7 @@
           system = "x86_64-linux";
           modules = [
             ./configuration.nix
-            nix-ld.nixosModules.nix-ld
+            inputs.nix-ld.nixosModules.nix-ld
 
           ];
           specialArgs = { inherit inputs; };
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index c36dad7..0a6fd34 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -12,18 +12,19 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/07e57f41-bbe1-4e4e-950b-9be902bc6484";
+    {
+      device = "/dev/disk/by-uuid/07e57f41-bbe1-4e4e-950b-9be902bc6484";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0F7D-6BD7";
+    {
+      device = "/dev/disk/by-uuid/0F7D-6BD7";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/9a725db7-d6dd-42a6-b13a-920eada1c154"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/9a725db7-d6dd-42a6-b13a-920eada1c154"; }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's