Compare commits

...

2 commits

15 changed files with 60 additions and 29 deletions

View file

@ -47,14 +47,16 @@
inherit inputs rootPath; inherit inputs rootPath;
srcs = self.callPackage (rootPath + "/_sources/generated.nix") { }; srcs = self.callPackage (rootPath + "/_sources/generated.nix") { };
inherit (inputs'.nixvim.legacyPackages) makeNixvim makeNixvimWithModule; inherit (inputs'.nixvim.legacyPackages) makeNixvim makeNixvimWithModule;
inherit (self'.legacyPackages) nixvimPlugins editor-runtime;
neovim_git = inputs'.neovim-nightly.packages.default; neovim_git = inputs'.neovim-nightly.packages.default;
}); });
in in
lib.packagesFromDirectoryRecursive { inputsScope.overrideScope (
inherit (inputsScope) callPackage; final: _prev:
directory = rootPath + "/pkgs"; lib.packagesFromDirectoryRecursive {
}; inherit (final) callPackage;
directory = rootPath + "/pkgs";
}
);
packages = packages =
let let
flattenPkgs = flattenPkgs =
@ -68,7 +70,23 @@
else else
{ }; { };
in in
flattenPkgs [ ] self'.legacyPackages; flattenPkgs [ ] (
lib.removeAttrs self'.legacyPackages [
"inputs"
"srcs"
"rootPath"
"makeNixvim"
"makeNixvimWithModule"
"newScope"
"overrideScope"
"packages"
"callPackage"
]
);
checks = lib.concatMapAttrs (name: value: { checks = lib.concatMapAttrs (name: value: {
"package-${name}" = value; "package-${name}" = value;
}) self'.packages; }) self'.packages;

View file

@ -1,14 +0,0 @@
{
osConfig ? null,
lib,
...
}:
{
config = lib.mkIf (osConfig != null) {
xdg.dataFile = {
"fcitx5/rime/default.custom.yaml".source = ./default.custom.yaml;
"fcitx5/rime/double_pinyin_flypy.custom.yaml".source = ./double_pinyin_flypy.custom.yaml;
"fcitx5/rime/yustar_sc.custom.yaml".source = ./yustar_sc.custom.yaml;
};
};
}

View file

@ -37,10 +37,7 @@ in
fcitx5-fluent fcitx5-fluent
(fcitx5-rime.override { (fcitx5-rime.override {
rimeDataPkgs = [ rimeDataPkgs = [
rime-ice rime-all
rime-zhwiki
rime-moegirl
rime-yuhaostar
]; ];
}) })
]; ];

View file

@ -9,6 +9,7 @@ in
./editor-runtime.nix ./editor-runtime.nix
./wallpapers.nix ./wallpapers.nix
./rime-yuhaostar.nix ./rime-yuhaostar.nix
./rime-all.nix
./nixvim.nix ./nixvim.nix
./doom-emacs.nix ./doom-emacs.nix
./osu-lazer-bin.nix # typochecker: disable-line ./osu-lazer-bin.nix # typochecker: disable-line

View file

@ -0,0 +1,8 @@
{ outputs, ... }:
_final: prev:
let
inherit (prev.stdenv.hostPlatform) system;
in
{
inherit (outputs.packages.${system}) rime-all;
}

View file

@ -4,5 +4,5 @@ let
inherit (prev.stdenv.hostPlatform) system; inherit (prev.stdenv.hostPlatform) system;
in in
{ {
inherit (outputs.packages."${system}") cliphist; inherit (outputs.packages."${system}") cliphist';
} }

View file

@ -4,5 +4,5 @@ let
inherit (prev.stdenv.hostPlatform) system; inherit (prev.stdenv.hostPlatform) system;
in in
{ {
radicle-explorer = outputs.packages."${system}".radicle-explorer; radicle-explorer = outputs.packages."${system}".radicle-explorer';
} }

View file

@ -4,5 +4,5 @@ let
inherit (prev.stdenv.hostPlatform) system; inherit (prev.stdenv.hostPlatform) system;
in in
{ {
spotifyd = outputs.packages."${system}".spotifyd; spotifyd = outputs.packages.${system}.spotifyd';
} }

21
pkgs/rime-all/package.nix Normal file
View file

@ -0,0 +1,21 @@
{
rime-ice,
rime-yuhaostar,
rime-moegirl,
rime-zhwiki,
buildEnv,
}:
buildEnv {
name = "rime-all";
paths = [
rime-ice
rime-yuhaostar
rime-zhwiki
rime-moegirl
];
postBuild = ''
ln -s ${./yustar_sc.custom.yaml} $out/share/rime-data/yustar_sc.custom.yaml
ln -s ${./double_pinyin_flypy.custom.yaml} $out/share/rime-data/double_pinyin_flypy.custom.yaml
ln -s ${./default.custom.yaml} $out/share/rime-data/default.custom.yaml
'';
}

View file

@ -8,7 +8,7 @@ let
inherit (srcs.spotifyd) src date version; inherit (srcs.spotifyd) src date version;
in in
spotifyd.overrideAttrs ( spotifyd.overrideAttrs (
final: prev: { _final: prev: {
inherit src; inherit src;
version = version =
if prev.version != "0.4.1" then if prev.version != "0.4.1" then
@ -18,7 +18,7 @@ spotifyd.overrideAttrs (
else else
"0-unstable-${date}-git${version}"; "0-unstable-${date}-git${version}";
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
inherit (final) inherit (prev)
src src
; ;
hash = "sha256-WwShp1ebk89cBqRXqKDgbwGZraCDjQAOxoL4uEIq2aw="; hash = "sha256-WwShp1ebk89cBqRXqKDgbwGZraCDjQAOxoL4uEIq2aw=";