From 13d0581f882ce38a8d2d605a0980b589afc4898d Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler@tylermayoff.com>
Date: Tue, 1 Oct 2024 10:37:19 -0400
Subject: [PATCH] Cleanup + flake update

---
 dot_config/home-manager/flake.lock         | 18 +++++++++---------
 dot_config/home-manager/home/common.nix    |  8 ++------
 dot_config/home-manager/home/gui.nix       |  3 ++-
 dot_config/home-manager/home/wash/wash.nix |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dot_config/home-manager/flake.lock b/dot_config/home-manager/flake.lock
index 303ad0f..b503e20 100644
--- a/dot_config/home-manager/flake.lock
+++ b/dot_config/home-manager/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726985855,
-        "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
+        "lastModified": 1727383923,
+        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
+        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "lastModified": 1727634051,
+        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1727397532,
-        "narHash": "sha256-pojbL/qteElw/nIXlN8kmHn/w6PQbEHr7Iz+WOXs0EM=",
+        "lastModified": 1727672256,
+        "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f65141456289e81ea0d5a05af8898333cab5c53d",
+        "rev": "1719f27dd95fd4206afb9cec9f415b539978827e",
         "type": "github"
       },
       "original": {
diff --git a/dot_config/home-manager/home/common.nix b/dot_config/home-manager/home/common.nix
index 4fa1fb6..3f40c8f 100644
--- a/dot_config/home-manager/home/common.nix
+++ b/dot_config/home-manager/home/common.nix
@@ -1,13 +1,11 @@
 {
-  inputs,
+  # inputs,
   outputs,
   # lib,
   # config,
   pkgs,
   ...
-}: let
-  nixGLIntel = inputs.nixgl.packages."${pkgs.system}".nixGLIntel;
-in {
+}: {
   nixpkgs.config.allowUnfree = true;
 
   home.username = "tyler";
@@ -35,8 +33,6 @@ in {
   fonts.fontconfig.enable = true;
 
   home.packages = with pkgs; [
-    nixGLIntel
-
     # Fonts
     (nerdfonts.override {fonts = ["JetBrainsMono"];})
 
diff --git a/dot_config/home-manager/home/gui.nix b/dot_config/home-manager/home/gui.nix
index 7aa4a8b..f209c39 100644
--- a/dot_config/home-manager/home/gui.nix
+++ b/dot_config/home-manager/home/gui.nix
@@ -16,7 +16,8 @@ in {
   nixGL.prefix = "${nixGLIntel}/bin/nixGLIntel";
 
   home.packages = with pkgs; [
-    # Gnome
+    nixGLIntel
+
     adw-gtk3
 
     discord
diff --git a/dot_config/home-manager/home/wash/wash.nix b/dot_config/home-manager/home/wash/wash.nix
index 4ef3ff1..d23f256 100644
--- a/dot_config/home-manager/home/wash/wash.nix
+++ b/dot_config/home-manager/home/wash/wash.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  imports = [../common.nix ../gnome.nix ../home-backup.nix];
+  imports = [../common.nix ../gnome.nix ../home-backup.nix ../gui.nix];
 
   home.packages = with pkgs; [
     ventoy