From 91f3c2a716bc9acdc661a7181b9730eeca201e37 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrel@tyrelsouza.com>
Date: Mon, 2 Jan 2023 12:04:37 -0500
Subject: [PATCH] ubuntu works

---
 _ubuntu/flake.nix                  |  2 +-
 hosts/_common/home.nix             |  1 -
 hosts/blackbox-jr/default.nix      |  1 -
 hosts/blackbox-jr/home-manager.nix | 18 +++++++++---------
 hosts/ts-tl-mbp/home-manager.nix   |  3 +++
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/_ubuntu/flake.nix b/_ubuntu/flake.nix
index 60d774e..0613005 100644
--- a/_ubuntu/flake.nix
+++ b/_ubuntu/flake.nix
@@ -17,7 +17,7 @@
           inherit pkgs;
           modules = [
             ../hosts/blackbox-jr/default.nix
-            ../hosts/_common/home-manager.nix
+            ../hosts/blackbox-jr/home-manager.nix
             {
             home = {
               homeDirectory = "/home/tyrel";
diff --git a/hosts/_common/home.nix b/hosts/_common/home.nix
index 7db5f7d..1447f36 100644
--- a/hosts/_common/home.nix
+++ b/hosts/_common/home.nix
@@ -2,7 +2,6 @@
 {
     home.stateVersion = "22.05";
     home.sessionVariables = {
-      XDG_CONFIG_HOME = "/Users/tyrel/.config";
       PAGER = "less -R";
       EDITOR = "nvim";
     };
diff --git a/hosts/blackbox-jr/default.nix b/hosts/blackbox-jr/default.nix
index ac03ce6..8c55841 100644
--- a/hosts/blackbox-jr/default.nix
+++ b/hosts/blackbox-jr/default.nix
@@ -1,5 +1,4 @@
 { pkgs, config, lib, ... }:
 {
-  services.nix-daemon.enable = true;
   programs.zsh.enable = true;
 }
diff --git a/hosts/blackbox-jr/home-manager.nix b/hosts/blackbox-jr/home-manager.nix
index 54f0c40..7970ceb 100644
--- a/hosts/blackbox-jr/home-manager.nix
+++ b/hosts/blackbox-jr/home-manager.nix
@@ -1,14 +1,14 @@
 { pkgs, ... }:
 {
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.users.tyrel = { pkgs, ... }: {
-    programs.home-manager.enable = true;
-    home.stateVersion = "22.05";
-    home.sessionVariables = {
-      XDG_CONFIG_HOME = "/home/tyrel/.config";
-    };
+  # Common Imports
+  imports = [
+      ../_common/home.nix
+      ../_common/programs.nix
+      ../_common/xdg.nix
+  ];
+  home.sessionVariables = {
+    XDG_CONFIG_HOME = "/home/tyrel/.config";
+  };
 
-  }; # -- HomeManager
  
 }
diff --git a/hosts/ts-tl-mbp/home-manager.nix b/hosts/ts-tl-mbp/home-manager.nix
index d5231ec..9a704e4 100644
--- a/hosts/ts-tl-mbp/home-manager.nix
+++ b/hosts/ts-tl-mbp/home-manager.nix
@@ -9,6 +9,9 @@
         ../_common/programs.nix
         ../_common/xdg.nix
     ];
+    home.sessionVariables = {
+      XDG_CONFIG_HOME = "/Users/tyrel/.config";
+    };
 
     # XDG CONFIGS
     xdg.configFile."karabiner" = {