Skip to content

Commit

Permalink
expose configuration builders so they can be used from a local privat…
Browse files Browse the repository at this point in the history
…e flake
  • Loading branch information
gvolpe committed Feb 24, 2024
1 parent ba66185 commit 6048a64
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
17 changes: 9 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};

#sxm-flake = {
#url = git+file:///home/gvolpe/workspace/sxm/sxm-flake;
#};

neovim-flake = {
#url = git+file:///home/gvolpe/workspace/neovim-flake;
url = github:gvolpe/neovim-flake;
Expand Down Expand Up @@ -82,13 +78,18 @@
inherit (inputs.rycee-nurpkgs.lib.${system}) buildFirefoxXpiAddon;
addons = pkgs.nur.repos.rycee.firefox-addons;
};

mkHomeConfigurations = p:
import ./outputs/home-conf.nix { inherit inputs system extraArgs; pkgs = p; };

mkNixosConfigurations = p:
import ./outputs/nixos-conf.nix { inherit inputs system extraArgs; pkgs = p; };
in
{
homeConfigurations =
import ./outputs/home-conf.nix { inherit inputs system pkgs extraArgs; };
inherit mkHomeConfigurations mkNixosConfigurations pkgs;

nixosConfigurations =
import ./outputs/nixos-conf.nix { inherit inputs system pkgs extraArgs; };
homeConfigurations = mkHomeConfigurations pkgs;
nixosConfigurations = mkNixosConfigurations pkgs;

packages.${system} = {
inherit (pkgs) bazecor metals metals-updater;
Expand Down
8 changes: 1 addition & 7 deletions lib/overlays.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ with inputs;

let
cowsayOverlay = f: p: {
inherit (inputs.cowsay.packages.${system}) cowsay;
inherit (cowsay.packages.${system}) cowsay;
};

fishOverlay = f: p: {
Expand All @@ -22,11 +22,6 @@ let
inherit (libx) removeNewline secretManager;
});
};

sxmOverlay =
if (builtins.hasAttr "sxm-flake" inputs)
then sxm-flake.overlays.default
else (f: p: { });
in
[
cowsayOverlay
Expand All @@ -36,7 +31,6 @@ in
nurpkgs.overlay
neovim-flake.overlays.${system}.default
statix.overlays.default
sxmOverlay
(import ../home/overlays/bat-lvl)
(import ../home/overlays/bazecor)
(import ../home/overlays/juno-theme)
Expand Down

0 comments on commit 6048a64

Please sign in to comment.