From 19018240374598e0a1ce13671c225a30a1688504 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Mon, 2 Jan 2023 10:54:36 -0500 Subject: [PATCH] refactoring a bit --- _macos/flake.nix | 3 +-- hosts/_common/{home-manager.nix => homepkgs.nix} | 7 ------- hosts/ts-tl-mbp/home-manager.nix | 3 ++- 3 files changed, 3 insertions(+), 10 deletions(-) rename hosts/_common/{home-manager.nix => homepkgs.nix} (86%) diff --git a/_macos/flake.nix b/_macos/flake.nix index 7955e67..fcc5cf1 100644 --- a/_macos/flake.nix +++ b/_macos/flake.nix @@ -16,10 +16,9 @@ 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/_common/fonts.nix ]; }; }; diff --git a/hosts/_common/home-manager.nix b/hosts/_common/homepkgs.nix similarity index 86% rename from hosts/_common/home-manager.nix rename to hosts/_common/homepkgs.nix index 879b4ce..beed1c9 100644 --- a/hosts/_common/home-manager.nix +++ b/hosts/_common/homepkgs.nix @@ -1,9 +1,5 @@ { 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 = { PAGER = "less -R"; @@ -74,7 +70,4 @@ recursive = true; }; }; - - }; # -- HomeManager - } diff --git a/hosts/ts-tl-mbp/home-manager.nix b/hosts/ts-tl-mbp/home-manager.nix index 0e58da4..3b97c5f 100644 --- a/hosts/ts-tl-mbp/home-manager.nix +++ b/hosts/ts-tl-mbp/home-manager.nix @@ -9,6 +9,8 @@ XDG_CONFIG_HOME = "/Users/tyrel/.config"; }; + # Load Common Packages + common = pkgs.callPackage ../_common/homepkgs.nix {}; # XDG CONFIGS xdg.configFile = { @@ -17,7 +19,6 @@ recursive = true; }; }; - }; # -- HomeManager }