Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
pkgs ? import <nixpkgs> { },
}:
{
vicinae = pkgs.callPackage ./vicinae.nix { };
vicinae = pkgs.callPackage ./nix/vicinae.nix { };
}
6 changes: 4 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
system:
let
pkgs = nixpkgs.legacyPackages.${system};
vicinaePkg = pkgs.callPackage ./vicinae.nix { };
vicinaePkg = pkgs.callPackage ./nix/vicinae.nix { };
nix-update-script = pkgs.writeShellScriptBin "nix-update-script" ''
OLD_API_DEPS_HASH=$(${pkgs.lib.getExe pkgs.nix} eval --raw .#packages.x86_64-linux.default.passthru.apiDeps.hash)
OLD_EXT_MAN_DEPS_HASH=$(${pkgs.lib.getExe pkgs.nix} eval --raw .#packages.x86_64-linux.default.passthru.extensionManagerDeps.hash)
Expand All @@ -40,6 +40,7 @@
{
packages.default = vicinaePkg;
packages.nix-update-script = nix-update-script;
mkVicinaeExtension = import ./nix/mkVicinaeExtension.nix;
devShells.default = pkgs.mkShell {
inputsFrom = [ vicinaePkg ]; # automatically pulls nativeBuildInputs + buildInputs
buildInputs = [
Expand All @@ -56,6 +57,7 @@
// {
overlays.default = final: prev: {
vicinae = self.packages.${final.system}.default;
mkVicinaeExtension = import ./nix/mkVicinaeExtension.nix;
};
homeManagerModules.default =
{
Expand All @@ -64,7 +66,7 @@
lib,
...
}:
import ./module.nix {
import ./nix/module.nix {
inherit
config
pkgs
Expand Down
18 changes: 18 additions & 0 deletions nix/mkVicinaeExtension.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
pkgs,
name,
src,
}:
pkgs.buildNpmPackage {
inherit name src;
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r /build/.local/share/vicinae/extensions/${name}/* $out/
runHook postInstall
'';
npmDeps = pkgs.importNpmLock { npmRoot = src; };
npmConfigHook = pkgs.importNpmLock.npmConfigHook;
}
16 changes: 16 additions & 0 deletions module.nix → nix/module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ in
description = "If vicinae should use the layer shell";
};

extensions = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
description = ''
List of Vicinae extensions to install.
You can use the `mkVicinaeExtension` function from the overlay to create extensions.
'';
};

themes = lib.mkOption {
default = { };
description = ''
Expand Down Expand Up @@ -111,6 +120,13 @@ in
}
) cfg.themes;

xdg.dataFile = builtins.listToAttrs (
builtins.map (item: {
name = "vicinae/extensions/${item.name}";
value.source = item;
}) config.services.vicinae.extensions
);

systemd.user.services.vicinae = {
Unit = {
Description = "Vicinae server daemon";
Expand Down
2 changes: 1 addition & 1 deletion vicinae.nix → nix/vicinae.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
wayland,
}:
let
src = ./.;
src = ../.;

manifestRaw = builtins.readFile (src + /manifest.yaml);

Expand Down
Loading