From f596a050abe07d0162ee00c2b742cbe0fa517cad Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 19 Jun 2025 00:30:12 -0700 Subject: [PATCH 1/2] mention quickshell package in nixpkgs --- src/guide/install-setup.mdx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/guide/install-setup.mdx b/src/guide/install-setup.mdx index ebbfb47..d00ebd8 100644 --- a/src/guide/install-setup.mdx +++ b/src/guide/install-setup.mdx @@ -11,7 +11,9 @@ index: 0 All packages currently track quickshell's master branch. This may change in the future. ### Nix -The Quickshell repo has an embedded flake. +Quickshell releases are packaged in nixpkgs as `quickshell`. + +The Quickshell repo also has an embedded flake. You can use either `git+https://git.outfoxxed.me/outfoxxed/quickshell` or `github:quickshell-mirror/quickshell`. Use `?ref=` to specify a tag if you want a tagged release. @@ -22,8 +24,8 @@ if you want a tagged release. nixpkgs.url = "nixpkgs/nixos-unstable"; quickshell = { - # remove ?ref=v0.1.0 to track the master branch - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=v0.1.0"; + # add ?ref= to track a tag + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; # THIS IS IMPORTANT # Mismatched system dependencies will lead to crashes and other issues. From 27d84c8a82ffb6d94c26c066f3d193eca5357a85 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 19 Jun 2025 01:40:34 -0700 Subject: [PATCH 2/2] add master branch toggle --- default.nix | 2 ++ src/components/navigation/sidebars/nav/RootNav.astro | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/default.nix b/default.nix index abe0fa5..b46718b 100644 --- a/default.nix +++ b/default.nix @@ -7,6 +7,7 @@ nodejs, cacert, quickshell-types ? null, + masterBranch ? false, }: stdenv.mkDerivation (final: let nodeModules = stdenv.mkDerivation { pname = "${final.pname}-node_modules"; @@ -69,6 +70,7 @@ in { ''; PRODUCTION = true; + MASTER_BRANCH = masterBranch; SECRET_MODULES_PATH = if quickshell-types == null then "" else quickshell-types; buildPhase = '' diff --git a/src/components/navigation/sidebars/nav/RootNav.astro b/src/components/navigation/sidebars/nav/RootNav.astro index 6e9f22e..334e575 100644 --- a/src/components/navigation/sidebars/nav/RootNav.astro +++ b/src/components/navigation/sidebars/nav/RootNav.astro @@ -57,8 +57,18 @@ const types = { }) ), }; + +const masterBranch = import.meta.env.MASTER_BRANCH; ---