diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix deleted file mode 100644 index ba4df46..0000000 --- a/modules/home-manager/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ inputs, ... }: -{ - imports = [ - inputs.home-manager.flakeModules.home-manager - ]; - flake-file.inputs = { - home-manager.url = "github:nix-community/home-manager"; - }; - - flake.homeModules.rebuild = { pkgs, lib, ... }: - let - nixBin = lib.getExe pkgs.nix; - flakeDir = "~/.config/home-manager/jsl-home"; - in - { - home.packages = with pkgs; [ - home-manager - (writeShellScriptBin "flake-parts-check" '' - cd ${flakeDir} - ${nixBin} run ".#write-flake" - ${nixBin} flake check - '') - (writeShellScriptBin "nhms" '' - cd ${flakeDir} - ${nixBin} run ".#write-flake" - ${lib.getExe home-manager} switch --impure --flake ${flakeDir} - '') - ]; - }; -} diff --git a/modules/home-manager/flake-parts.nix b/modules/home-manager/flake-parts.nix new file mode 100644 index 0000000..cdf6f93 --- /dev/null +++ b/modules/home-manager/flake-parts.nix @@ -0,0 +1,10 @@ +{ inputs, ... }: +{ + flake-file.inputs = { + home-manager.url = "github:nix-community/home-manager"; + }; + + imports = [ + inputs.home-manager.flakeModules.home-manager + ]; +} \ No newline at end of file diff --git a/modules/home-manager/rebuild.nix b/modules/home-manager/rebuild.nix new file mode 100644 index 0000000..f864693 --- /dev/null +++ b/modules/home-manager/rebuild.nix @@ -0,0 +1,24 @@ +{ inputs, ... }: +{ + flake.homeModules.rebuild = + { pkgs, lib, ... }: + let + nixBin = lib.getExe pkgs.nix; + flakeDir = "~/.config/home-manager/jsl-home"; + in + { + home.packages = with pkgs; [ + home-manager + (writeShellScriptBin "flake-parts-check" '' + cd ${flakeDir} + ${nixBin} run ".#write-flake" + ${nixBin} flake check + '') + (writeShellScriptBin "nhms" '' + cd ${flakeDir} + ${nixBin} run ".#write-flake" + ${lib.getExe home-manager} switch --impure --flake ${flakeDir} + '') + ]; + }; +}