common

_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
       ];
     };
   };

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

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;