diff --git a/_outputs.nix b/_outputs.nix index 6549003d..1a333448 100644 --- a/_outputs.nix +++ b/_outputs.nix @@ -95,9 +95,7 @@ perSystem (pkgs: import ./apps {inherit pkgs self;}); - appsPackages = - perSystem (pkgs: - import ./apps/packages.nix {inherit inputs pkgs;}); + appsPackages = perSystem (pkgs: pkgs.appsPackages); devShells = perSystem (pkgs: diff --git a/apps/README.md b/apps/README.md index eb52ac5a..b8db149f 100644 --- a/apps/README.md +++ b/apps/README.md @@ -8,5 +8,6 @@ This directory contains every derivations for apps exposed by this flake. | ---- | ----------- | | `extract-subs` | Extract all `srt` subtitle files from a `mkv` video with the appropriate name. | | `gen-docs` | Generates the READMEs in this repository from nix attributes. | +| `mc-mods` | Checks if a list of mods have a version available for a specific Minecraft version and a specific loader. | | `pin-inputs` | Takes a list of inputs to pin to their current rev in `flake.lock`. | | `update-sources` | Updates all derivation sources in this repository and generates a commit message for the changes made. | diff --git a/apps/gen-docs/getScopesMeta.nix b/apps/gen-docs/getScopesMeta.nix index a6090d04..6d11055a 100644 --- a/apps/gen-docs/getScopesMeta.nix +++ b/apps/gen-docs/getScopesMeta.nix @@ -2,7 +2,7 @@ attr: selfPath: let inherit (builtins) currentSystem getFlake mapAttrs removeAttrs replaceStrings; self = getFlake selfPath; - scopes = import "${selfPath}/${attr}" {description = true;}; + scopes = ((import "${selfPath}/${attr}" {description = true;}) {} {}).scopedPackages; trimNewlines = s: replaceStrings ["\n"] [" "] s; in { diff --git a/modules/desktop/environment/modules/packages.nix b/modules/desktop/environment/modules/packages.nix index a0c315cb..7f50ae15 100644 --- a/modules/desktop/environment/modules/packages.nix +++ b/modules/desktop/environment/modules/packages.nix @@ -86,7 +86,7 @@ in { } else pkgs.discord; - # FIXME: https://github.com/KaylorBen/nixcord/issues/84 + # FIXME: wait for https://github.com/KaylorBen/nixcord/pull/85 vencord.unstable = false; openASAR.enable = false; diff --git a/overlays/README.md b/overlays/README.md index e0906472..1720a73d 100644 --- a/overlays/README.md +++ b/overlays/README.md @@ -6,6 +6,9 @@ This directory contains every overlay exposed by this flake. | Name | Description | | ---- | ----------- | +| `appsPackages` | This overlay puts every derivations for apps exposed by this flake under pkgs.appsPackages. | | `misc-fixes` | Fixes build failures, missing meta attributes, evaluation failures, etc. of the current `nixpkgs` revision of this flake. | | `nix-version` | Overrides the nix package for everything so I don't need multiple versions. | +| `scopedPackages` | This overlay puts every package scopes exposed by this flake under pkgs.scopedPackages. | +| `selfPackages` | This overlay puts every derivations for packages exposed by this flake under pkgs.selfPackages. | | `xdg-desktop-portal-kde` | Fixes this issue: https://invent.kde.org/plasma/xdg-desktop-portal-kde/-/issues/15 | diff --git a/packages/README.md b/packages/README.md index ebe744ba..1cc75b1b 100644 --- a/packages/README.md +++ b/packages/README.md @@ -6,6 +6,7 @@ This directory contains every derivations for packages exposed by this flake. | Name | Description | Homepage | | ---- | ----------- | -------- | +| `coloryou` | Get Material You colors from an image. | https://git.nelim.org/matt1432/nixos-configs/src/branch/master/packages/coloryou | | `gpu-screen-recorder` | Screen recorder that has minimal impact on system performance by recording a window using the GPU only. | https://git.dec05eba.com/gpu-screen-recorder/about | | `gsr-kms-server` | Small program giving safe KMS access to gpu-screen-recorder when recording a monitor. This is the only part of gpu-screen-recorder that could require root permissions. | https://git.dec05eba.com/gpu-screen-recorder/about | | `homepage` | Highly customisable dashboard with Docker and service API integrations. | https://gethomepage.dev | diff --git a/packages/coloryou/default.nix b/packages/coloryou/default.nix index 72f4faa0..74267ae9 100644 --- a/packages/coloryou/default.nix +++ b/packages/coloryou/default.nix @@ -20,5 +20,6 @@ in meta = { inherit (project) description; + homepage = "https://git.nelim.org/matt1432/nixos-configs/src/branch/master/packages/coloryou"; }; }