quickshell/quickshell-web
3
1
Fork 0
Code Issues Projects Activity

Compare commits

base: quickshell:27d84c8a82ffb6d94c26c066f3d193eca5357a85
Branches Tags
quickshell:main
..
compare: quickshell:fd9cd4f3fd7d4b1236854ef97728dc5379cfd432
Branches Tags
quickshell:main

No commits in common. "27d84c8a82ffb6d94c26c066f3d193eca5357a85" and "fd9cd4f3fd7d4b1236854ef97728dc5379cfd432" have entirely different histories.
27d84c8a82 ... fd9cd4f3fd

3 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
default.nix
View file

@ -7,7 +7,6 @@
nodejs, nodejs,
cacert, cacert,
quickshell-types ? null, quickshell-types ? null,
masterBranch ? false,
}: stdenv.mkDerivation (final: let }: stdenv.mkDerivation (final: let
nodeModules = stdenv.mkDerivation { nodeModules = stdenv.mkDerivation {
pname = "${final.pname}-node_modules"; pname = "${final.pname}-node_modules";
@ -70,7 +69,6 @@ in {
''; '';
PRODUCTION = true; PRODUCTION = true;
MASTER_BRANCH = masterBranch;
SECRET_MODULES_PATH = if quickshell-types == null then "" else quickshell-types; SECRET_MODULES_PATH = if quickshell-types == null then "" else quickshell-types;
buildPhase = '' buildPhase = ''

10
src/components/navigation/sidebars/nav/RootNav.astro
View file

@ -57,18 +57,8 @@ const types = {
}) })
), ),
}; };
const masterBranch = import.meta.env.MASTER_BRANCH;
--- ---
<nav class="navtree"> <nav class="navtree">
{masterBranch && <Link
title="Docs Version: Master Branch (Switch)"
link=`https://quickshell.outfoxxed.me${Astro.url.pathname}`
/>}
{!masterBranch && <Link
title="Docs Version: Release 0.1.0 (Switch)"
link=`https://quickshell-master.outfoxxed.me${Astro.url.pathname}`
/>}
<Link <Link
title="About Quickshell" title="About Quickshell"
link="/docs/about" link="/docs/about"

8
src/guide/install-setup.mdx
View file

@ -11,9 +11,7 @@ index: 0
All packages currently track quickshell's master branch. This may change in the future. All packages currently track quickshell's master branch. This may change in the future.
### Nix ### Nix
Quickshell releases are packaged in nixpkgs as `quickshell`. The Quickshell repo has an embedded flake.
The Quickshell repo also has an embedded flake.
You can use either `git+https://git.outfoxxed.me/outfoxxed/quickshell` You can use either `git+https://git.outfoxxed.me/outfoxxed/quickshell`
or `github:quickshell-mirror/quickshell`. Use `?ref=` to specify a tag or `github:quickshell-mirror/quickshell`. Use `?ref=` to specify a tag
if you want a tagged release. if you want a tagged release.
@ -24,8 +22,8 @@ if you want a tagged release.
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
quickshell = { quickshell = {
# add ?ref=<tag> to track a tag # remove ?ref=v0.1.0 to track the master branch
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; url = "git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=v0.1.0";
# THIS IS IMPORTANT # THIS IS IMPORTANT
# Mismatched system dependencies will lead to crashes and other issues. # Mismatched system dependencies will lead to crashes and other issues.