From 3af7c0d27afd874bde65d375fd8082f7f0a96194 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrel@tyrelsouza.com>
Date: Mon, 2 Jan 2023 10:23:09 -0500
Subject: [PATCH] linuxy

---
 _ubuntu/flake.nix                  | 33 +++++++++++++++++-------------
 hosts/blackbox-jr/home-manager.nix | 14 +++++++++++++
 rebuild-ubuntu.sh                  |  3 ++-
 3 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 hosts/blackbox-jr/home-manager.nix

diff --git a/_ubuntu/flake.nix b/_ubuntu/flake.nix
index 1b965ff..60d774e 100644
--- a/_ubuntu/flake.nix
+++ b/_ubuntu/flake.nix
@@ -6,22 +6,27 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
-  outputs = { self, nixpkgs, home-manager} : {
-    defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
-
-    homeConfigurations = {
-      "tyrel" = home-manager.lib.homeManagerConfiguration {
-        targets.genericLinux.enable = true;
-        system = "x86_64-linux";
-        homeDirectory = "/home/tyrel";
-        username = "tyrel";
-        configuration.imports = [ 
-	      ../hosts/blackbox-jr/default.nix
-	      ../hosts/blackbox-jr/home-manager.nix
+  outputs = { self, nixpkgs, home-manager } : 
+    let
+      system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+      defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
+      homeConfigurations = {
+        "tyrel" = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          modules = [
+            ../hosts/blackbox-jr/default.nix
+            ../hosts/_common/home-manager.nix
+            {
+            home = {
+              homeDirectory = "/home/tyrel";
+              username = "tyrel";
+              stateVersion = "22.05";
+            };
+          }
         ];
       };
     };
-
-
   };
 }
diff --git a/hosts/blackbox-jr/home-manager.nix b/hosts/blackbox-jr/home-manager.nix
new file mode 100644
index 0000000..54f0c40
--- /dev/null
+++ b/hosts/blackbox-jr/home-manager.nix
@@ -0,0 +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";
+    };
+
+  }; # -- HomeManager
+ 
+}
diff --git a/rebuild-ubuntu.sh b/rebuild-ubuntu.sh
index 62cadc8..c3ce012 100755
--- a/rebuild-ubuntu.sh
+++ b/rebuild-ubuntu.sh
@@ -2,4 +2,5 @@
 
 #git add . # YOLO
 #nix build ./_ubuntu --extra-experimental-features "nix-command flakes" -vvv
-nix run _ubuntu switch
+nix run ./_ubuntu switch -vv
+home-manager switch --flake ./_ubuntu