From 122771db93cc9cdef2caaae439d78fcf2601ece1 Mon Sep 17 00:00:00 2001 From: wxlyyy <1556588440@qq.com> Date: Mon, 27 Oct 2025 22:50:24 +0800 Subject: [PATCH 1/2] Nix: add package options to home-module --- flake.nix | 1 + nix/home-module.nix | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index cc212c74..5f985ddd 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,7 @@ ... }: { imports = [./nix/home-module.nix]; + programs.noctalia-shell.package = lib.mkDefault self.packages.${pkgs.system}.default; programs.noctalia-shell.app2unit.package = lib.mkDefault nixpkgs.legacyPackages.${pkgs.system}.app2unit; diff --git a/nix/home-module.nix b/nix/home-module.nix index 08410911..713c8f65 100644 --- a/nix/home-module.nix +++ b/nix/home-module.nix @@ -16,6 +16,11 @@ in { options.programs.noctalia-shell = { enable = lib.mkEnableOption "Noctalia shell configuration"; + package = lib.mkOption { + type = lib.types.nullOr lib.types.package; + description = "The noctalia-shell package to use"; + }; + settings = lib.mkOption { type = with lib.types; nullOr (oneOf [ @@ -98,7 +103,8 @@ in { useApp2Unit = cfg.settings.appLauncher.useApp2Unit or false; in lib.mkIf cfg.enable { - home.packages = lib.optional useApp2Unit cfg.app2unit.package; + home.packages = lib.optional useApp2Unit cfg.app2unit.package + ++ lib.optional (cfg.package != null) cfg.package; xdg.configFile = { "noctalia/settings.json" = { From db97c87ebd814639abc42802b014fab7dce270a7 Mon Sep 17 00:00:00 2001 From: Lysec <52084453+Ly-sec@users.noreply.github.com> Date: Tue, 28 Oct 2025 14:21:33 +0100 Subject: [PATCH 2/2] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 3 ++- .github/ISSUE_TEMPLATE/feature_request.md | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 92f7bcc8..b2130130 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,9 +1,10 @@ --- name: Bug Report about: Report a bug from noctalia-shell -title: "[Bug] " +title: '' labels: bug assignees: '' + --- ### Description diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 43a81700..5a4fc425 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,9 +1,10 @@ --- name: Feature Request about: Suggest a new feature or improvement -title: "[Feature] " -labels: enhancement +title: '' +labels: feature assignees: '' + --- ### Feature Description