From d371cb9d7cc3a224278989492f9cd4975e017b4a Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Mon, 2 Jan 2023 01:39:05 -0500
Subject: [PATCH] common

---
 _macos/flake.nix                       |  3 +-
 hosts/{ts-tl-mbp => _common}/fonts.nix |  0
 hosts/_common/home-manager.nix         |  5 ---
 hosts/ts-tl-mbp/home-manager.nix       | 62 --------------------------
 4 files changed, 2 insertions(+), 68 deletions(-)
 rename hosts/{ts-tl-mbp => _common}/fonts.nix (100%)

diff --git a/_macos/flake.nix b/_macos/flake.nix
index 4499af7..7955e67 100644
--- a/_macos/flake.nix
+++ b/_macos/flake.nix
@@ -16,9 +16,10 @@
       modules = [
   	    home-manager.darwinModules.home-manager
 	      ../hosts/ts-tl-mbp/default.nix
+	      ../hosts/_common/home-manager.nix
+	      ../hosts/_common/ts-tl-mbp/fonts.nix
 	      ../hosts/ts-tl-mbp/home-manager.nix
 	      ../hosts/ts-tl-mbp/brew.nix
-	      ../hosts/ts-tl-mbp/fonts.nix
       ];
     };
   };
diff --git a/hosts/ts-tl-mbp/fonts.nix b/hosts/_common/fonts.nix
similarity index 100%
rename from hosts/ts-tl-mbp/fonts.nix
rename to hosts/_common/fonts.nix
diff --git a/hosts/_common/home-manager.nix b/hosts/_common/home-manager.nix
index 764b434..879b4ce 100644
--- a/hosts/_common/home-manager.nix
+++ b/hosts/_common/home-manager.nix
@@ -8,7 +8,6 @@
     home.sessionVariables = {
       PAGER = "less -R";
       EDITOR = "nvim";
-      XDG_CONFIG_HOME = "/Users/tyrel/.config";
     };
 
     home.packages = with pkgs; [
@@ -74,10 +73,6 @@
         source = ../../home/config/fish;
         recursive = true;
       };
-      "karabiner" = {
-        source = ../../home/config/karabiner;
-        recursive = true;
-      };
     };
 
   }; # -- HomeManager
diff --git a/hosts/ts-tl-mbp/home-manager.nix b/hosts/ts-tl-mbp/home-manager.nix
index 764b434..0e58da4 100644
--- a/hosts/ts-tl-mbp/home-manager.nix
+++ b/hosts/ts-tl-mbp/home-manager.nix
@@ -6,74 +6,12 @@
     programs.home-manager.enable = true;
     home.stateVersion = "22.05";
     home.sessionVariables = {
-      PAGER = "less -R";
-      EDITOR = "nvim";
       XDG_CONFIG_HOME = "/Users/tyrel/.config";
     };
 
-    home.packages = with pkgs; [
-      bat
-      ctags
-      exa
-      fzf
-      ripgrep
-      wget
-    ];
-
-    programs.tmux = {
-      enable = true;
-    };
-    home.file = {
-      ".tmux.conf" = {
-        source = ../../home/tmux.conf;
-        recursive = true;
-      };
-    };
-
-    programs.git = {
-      enable = true;
-      includes = [
-        { path = "~/code/tyrel.dev/dotfiles/home/gitconfig"; }
-      ];
-      aliases = {
-        ap = "add -p";
-      };
-      extraConfig = {
-        pull.ff = "only";
-      };
-    };
-
-    programs.neovim = {
-      enable = true;
-    };
-    programs.fish = {
-     enable = true;
-    };
-
-
-
-    programs.htop = {
-      enable = true;
-    };
-    #xdg.configFile = {
-    #  "htop" = {
-    #    source = ../../home/config/htop;
-    #    recursive = true;
-    #  };
-    #};
-
-
 
     # XDG CONFIGS
     xdg.configFile = {
-      "nvim" = {
-        source = ../../home/config/nvim;
-        recursive = true;
-      };
-      "fish" = {
-        source = ../../home/config/fish;
-        recursive = true;
-      };
       "karabiner" = {
         source = ../../home/config/karabiner;
         recursive = true;