diff --git a/nix/nixos-module.nix b/nix/nixos-module.nix index 5116f91..d687470 100644 --- a/nix/nixos-module.nix +++ b/nix/nixos-module.nix @@ -1,14 +1,22 @@ self: { + config, options, lib, ... }: +let + cfg = config.programs.nova-shell; +in { - config = lib.optionalAttrs (options ? home-manager) { - home-manager.sharedModules = [ - self.homeModules.default - ] - ++ lib.optionals (options ? stylix) [ self.homeModules.stylix ]; - }; + options.programs.nova-shell.enable = lib.mkEnableOption "nova-shell Quickshell bar"; + + config = lib.mkIf cfg.enable ( + lib.optionalAttrs (options ? home-manager) { + home-manager.sharedModules = [ + self.homeModules.default + ] + ++ lib.optionals (options ? stylix) [ self.homeModules.stylix ]; + } + ); } diff --git a/nix/package.nix b/nix/package.nix index 93c9e3d..57314cc 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -26,8 +26,6 @@ let runHook preInstall mkdir -p $out/share/nova-shell cp -r shell/shell.qml shell/modules shell/services shell/applets shell/dock shell/lock shell/assets $out/share/nova-shell/ - mkdir -p $out/share/applications - cp shell/assets/space.darkest.nova-shell.desktop $out/share/applications/ runHook postInstall ''; }; diff --git a/shell/assets/space.darkest.nova-shell.desktop b/shell/assets/space.darkest.nova-shell.desktop deleted file mode 100644 index 95da1e7..0000000 --- a/shell/assets/space.darkest.nova-shell.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=nova-shell -Comment=Minimal Quickshell bar for niri -Exec=nova-shell -Type=Application -NoDisplay=true diff --git a/shell/shell.qml b/shell/shell.qml index 6e0122b..5c6411a 100644 --- a/shell/shell.qml +++ b/shell/shell.qml @@ -1,5 +1,4 @@ //@ pragma Env QS_NO_RELOAD_POPUP=1 -//@ pragma AppId space.darkest.nova-shell import "modules" import "services"