From 67a1317e13fcdab650498c909570c43d301e066a Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Mon, 21 Nov 2022 15:12:09 -0600
Subject: [PATCH] changes

---
 configuration.nix | 21 +++++++++------------
 environment.nix   | 21 +++++++++++++++++++++
 flake.lock        | 40 ++++++++++++++++++++++++++++++++++++++++
 flake.nix         | 11 +++++++++--
 4 files changed, 79 insertions(+), 14 deletions(-)
 create mode 100644 environment.nix

diff --git a/configuration.nix b/configuration.nix
index 6bf1397..f98ba8c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -17,8 +17,7 @@
 
   time.timeZone = "America/Chicago";
 
-    programs.zsh.enable = true;
-programs.dconf.enable = true;
+  programs.zsh.enable = true;
   # overwrite demo as default login
   services.xserver = {
     enable = true;
@@ -69,7 +68,7 @@ programs.dconf.enable = true;
     chezmoi
     delta
     gh
-    
+
     nixpkgs-fmt
 
     xdotool
@@ -77,12 +76,12 @@ programs.dconf.enable = true;
     eww
     rofi
     dunst
-   feh
-  
+    feh
+
     picom
     gtk3
-    
-gnome.adwaita-icon-theme
+
+    gnome.adwaita-icon-theme
     gnome.gnome-settings-daemon
     catppuccin-gtk
 
@@ -93,19 +92,18 @@ gnome.adwaita-icon-theme
     # firefox
     wavebox
 
-
+pciutils
     (vivaldi.override {
       proprietaryCodecs = true;
       enableWidevine = false;
       commandLineArgs = "--force-dark-mode";
     })
 
-vscode.fhs
-  
+    vscode.fhs
+
     go
     rustup
 
-
   ];
 
 
@@ -119,7 +117,6 @@ vscode.fhs
       openssl
 
       zlib # for delta
-      fuse # for libfuse/Neovim Appimage
     ];
     NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
   };
diff --git a/environment.nix b/environment.nix
new file mode 100644
index 0000000..09ad785
--- /dev/null
+++ b/environment.nix
@@ -0,0 +1,21 @@
+{ lib, config, pkgs, ... }:
+
+{
+  # for compatibility add zsh to list of /etc/shells
+  environment.shells = with pkgs; [ zsh ];
+
+  environment.etc = {
+    issue.source = ./etc/issue;
+  };
+
+  environment.variables = {
+    NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
+      stdenv.cc.cc
+      openssl
+
+      zlib # for delta
+    ];
+    NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
+  };
+
+}
diff --git a/flake.lock b/flake.lock
index b72a86a..4435e54 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "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": [
@@ -39,6 +60,7 @@
     },
     "root": {
       "inputs": {
+        "hyprland": "hyprland",
         "nix-ld": "nix-ld",
         "nixpkgs": "nixpkgs"
       }
@@ -57,6 +79,24 @@
         "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 5eea289..bece7f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,11 +7,15 @@
       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";
+    };
   };
 
 
   outputs = inputs:
-    /* ignore:: */
     {
       nixosConfigurations = {
 
@@ -19,8 +23,11 @@
           system = "x86_64-linux";
           modules = [
             ./configuration.nix
-            inputs.nix-ld.nixosModules.nix-ld
             ./overlays.nix
+            ./environment.nix
+            inputs.hyprland.nixosModules.default
+            { programs.hyprland.enable = true; }
+            inputs.nix-ld.nixosModules.nix-ld
           ];
           specialArgs = { inherit inputs; };
         };