diff --git a/lib/nixos/home-manager/default.nix b/lib/nixos/home-manager/default.nix index 74c01294..0044ae4c 100644 --- a/lib/nixos/home-manager/default.nix +++ b/lib/nixos/home-manager/default.nix @@ -8,8 +8,8 @@ ... }: let desktop-config = import ./desktop.nix {inherit config inputs pkgs username;}; - shared-config = import ../../shared/home-manager.nix {inherit inputs pkgs self username;}; - shared-packages = import ../../shared/home-manager-packages.nix {inherit inputs pkgs;}; + shared-config = import "${self}/lib/shared/home-manager.nix" {inherit inputs pkgs self username;}; + shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {inherit inputs pkgs;}; pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${pkgs.system}; in { diff --git a/lib/shared/modules/bin.nix b/lib/shared/modules/bin.nix index c3ed1aff..eb784e8f 100644 --- a/lib/shared/modules/bin.nix +++ b/lib/shared/modules/bin.nix @@ -1,8 +1,8 @@ -{ +{self, ...}: { home.sessionPath = ["$HOME/.config/bin"]; xdg.configFile.bin = { - source = ../../../bin; + source = "${self}/bin"; recursive = true; }; } diff --git a/lib/shared/modules/phpactor.nix b/lib/shared/modules/phpactor.nix index 07b63161..edbb2462 100644 --- a/lib/shared/modules/phpactor.nix +++ b/lib/shared/modules/phpactor.nix @@ -1,6 +1,6 @@ -{ +{self, ...}: { xdg.configFile.phpactor = { - source = ../../../config/phpactor; + source = "${self}/config/phpactor"; recursive = true; }; } diff --git a/lib/wsl2/default.nix b/lib/wsl2/default.nix index 0c629918..7ff4e9ef 100644 --- a/lib/wsl2/default.nix +++ b/lib/wsl2/default.nix @@ -6,8 +6,8 @@ }: let pkgs = inputs.nixpkgs.legacyPackages.${system}; - shared-config = import ../shared/home-manager.nix {inherit inputs pkgs self username;}; - shared-packages = import ../shared/home-manager-packages.nix {inherit inputs pkgs;}; + shared-config = import "${self}/lib/shared/home-manager.nix" {inherit inputs pkgs self username;}; + shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {inherit inputs pkgs;}; in inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs;