From 19f7ff60e89adca79eb0f9e215e30b3f8e59c0cc Mon Sep 17 00:00:00 2001
From: panotaka <panotaka@additionalpenguin.com>
Date: Sat, 25 Nov 2023 00:23:44 -0400
Subject: [PATCH] Fix flake.nix and home/default.nix configurations

---
 flake.nix          | 63 +++++++++++++++++++++++++---------------------
 home/default.nix   | 13 ++--------
 home/shell/git.nix | 12 +++++++++
 3 files changed, 49 insertions(+), 39 deletions(-)
 create mode 100644 home/shell/git.nix

diff --git a/flake.nix b/flake.nix
index f17049e..b5ae684 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,34 +27,41 @@
               home-manager.users.panotaka = import ./home;
             }
           ];
-        };
-        msi-rtx4090 = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            ./hosts/msi-rtx4090
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = inputs;
-              home-manager.users.panotaka = import ./home;
-            }
-          ];
-        }; */
-        Equinox = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./hosts/Equinox
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = inputs;
-              home-manager.users.panotaka = import ./home;
-            }
-          ];
-        };
+        };*/
+        Equinox = nixpkgs.lib.nixosSystem
+          {
+            system = "x86_64-linux";
+            specialArgs = { inherit inputs; };
+            modules = [
+              ./hosts/Equinox
+              home-manager.nixosModules.home-manager
+              {
+                home-manager.useGlobalPkgs = true;
+                home-manager.useUserPackages = true;
+                home-manager.extraSpecialArgs = inputs;
+
+                home-manager.users.panotaka =
+                  {
+                    imports = [
+                      ./home
+                      ./home/shell
+                      ./home/desktop
+                    ];
+                  };
+              }
+            ];
+          };
       };
+
+      homeConfigurations.panotaka = home-manager.lib.homeManagerConfiguration
+        {
+          homeDirectory = "/home/panotaka";
+          configuration = { pkgs, ... }: {
+            imports = [
+              ./home
+              ./home/shell
+            ];
+          };
+        };
     };
 }
diff --git a/home/default.nix b/home/default.nix
index d479a0e..fdda8f0 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 {
-
-  imports = [
-
-  ];
-
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home = {
@@ -24,12 +19,8 @@
   };
 
   # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-
-  programs.firefox.enable = true;
 
   home.packages = [
-pkgs.teams-for-linux
-];
+    pkgs.teams-for-linux
+  ];
 }
diff --git a/home/shell/git.nix b/home/shell/git.nix
new file mode 100644
index 0000000..a70bea1
--- /dev/null
+++ b/home/shell/git.nix
@@ -0,0 +1,12 @@
+{ pkgs
+, ...
+}: {
+  home.packages = [ pkgs.gh ];
+
+  programs.git = {
+    enable = true;
+
+    userName = "Thomas Syms";
+    userEmail = "thomassyms@gmail.com";
+  };
+}