Massive nixfmt reformatting
This commit is contained in:
parent
fe4492f004
commit
b29ddd5e65
109 changed files with 4323 additions and 2368 deletions
73
overlay.nix
73
overlay.nix
|
@ -1,9 +1,18 @@
|
|||
{ nixpkgs, nixpkgs-unstable, ... }@inputs:
|
||||
let
|
||||
overlay-unstable = final: prev: {
|
||||
stable = import nixpkgs { config.allowUnfree = true; system = prev.system; };
|
||||
unstable = import nixpkgs-unstable { config.allowUnfree = true; system = prev.system; };
|
||||
x86 = import nixpkgs-unstable { system = prev.system; config.allowUnsupportedSystem = true; };
|
||||
stable = import nixpkgs {
|
||||
config.allowUnfree = true;
|
||||
system = prev.system;
|
||||
};
|
||||
unstable = import nixpkgs-unstable {
|
||||
config.allowUnfree = true;
|
||||
system = prev.system;
|
||||
};
|
||||
x86 = import nixpkgs-unstable {
|
||||
system = prev.system;
|
||||
config.allowUnsupportedSystem = true;
|
||||
};
|
||||
};
|
||||
overlay-needs-unstable = final: prev: {
|
||||
# Typst updates really quickly.
|
||||
|
@ -50,19 +59,20 @@ let
|
|||
|
||||
input-remapper = final.unstable.input-remapper;
|
||||
|
||||
kakoune-unwrapped =
|
||||
prev.kakoune-unwrapped.overrideAttrs (attrs: {
|
||||
version = "r${builtins.substring 0 6 inputs.kakoune.rev}";
|
||||
src = inputs.kakoune;
|
||||
patches = [
|
||||
# patches in the original package was already applied
|
||||
];
|
||||
});
|
||||
|
||||
librewolf = (prev.librewolf.override {
|
||||
nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
|
||||
kakoune-unwrapped = prev.kakoune-unwrapped.overrideAttrs (attrs: {
|
||||
version = "r${builtins.substring 0 6 inputs.kakoune.rev}";
|
||||
src = inputs.kakoune;
|
||||
patches = [
|
||||
# patches in the original package was already applied
|
||||
];
|
||||
});
|
||||
|
||||
librewolf = (
|
||||
prev.librewolf.override {
|
||||
nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
|
||||
}
|
||||
);
|
||||
|
||||
vikunja =
|
||||
# builtins.seq
|
||||
# (final.lib.assertMsg (prev.vikunja.version == "0.24.5") "Vikunja probably doesn't need custom versions anymore")
|
||||
|
@ -71,20 +81,28 @@ let
|
|||
luminance = prev.luminance.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ final.wrapGAppsHook ];
|
||||
buildInputs = attrs.buildInputs ++ [ final.glib ];
|
||||
postInstall = attrs.postInstall + ''
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
postInstall =
|
||||
attrs.postInstall
|
||||
+ ''
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
});
|
||||
|
||||
vesktop = prev.vesktop.overrideAttrs (attrs: {
|
||||
postFixup =
|
||||
let
|
||||
flagToReplace = if final.lib.hasInfix "--enable-wayland-ime=true" attrs.postFixup then "--enable-wayland-ime=true" else "--enable-wayland-ime";
|
||||
flagToReplace =
|
||||
if final.lib.hasInfix "--enable-wayland-ime=true" attrs.postFixup then
|
||||
"--enable-wayland-ime=true"
|
||||
else
|
||||
"--enable-wayland-ime";
|
||||
in
|
||||
builtins.replaceStrings [ "NIXOS_OZONE_WL" flagToReplace ] [ "WAYLAND_DISPLAY" "${flagToReplace} --wayland-text-input-version=3" ] attrs.postFixup;
|
||||
builtins.replaceStrings
|
||||
[ "NIXOS_OZONE_WL" flagToReplace ]
|
||||
[ "WAYLAND_DISPLAY" "${flagToReplace} --wayland-text-input-version=3" ]
|
||||
attrs.postFixup;
|
||||
});
|
||||
|
||||
|
||||
editline-lix =
|
||||
assert final.lib.assertMsg (final.lix.version == "2.92.0") "we only need to patch this for 2.92";
|
||||
final.editline.overrideAttrs (prev: {
|
||||
|
@ -106,7 +124,9 @@ let
|
|||
};
|
||||
|
||||
overlay-packages = final: prev: {
|
||||
kak-tree-sitter = final.callPackage ./packages/common/kak-tree-sitter { rustPlatform = final.unstable.rustPlatform; };
|
||||
kak-tree-sitter = final.callPackage ./packages/common/kak-tree-sitter {
|
||||
rustPlatform = final.unstable.rustPlatform;
|
||||
};
|
||||
|
||||
kak-lsp = final.unstable.rustPlatform.buildRustPackage {
|
||||
name = "kak-lsp";
|
||||
|
@ -129,9 +149,14 @@ let
|
|||
|
||||
zen-browser-bin = inputs.zen-browser.packages.${final.stdenv.system}.zen-browser.override {
|
||||
inherit (inputs.zen-browser.packages.${final.stdenv.system}) zen-browser-unwrapped;
|
||||
wrapFirefox = opts: final.wrapFirefox (opts // {
|
||||
nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
|
||||
});
|
||||
wrapFirefox =
|
||||
opts:
|
||||
final.wrapFirefox (
|
||||
opts
|
||||
// {
|
||||
nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
|
||||
}
|
||||
);
|
||||
# zen-browser-unwrapped = final.callPackage inputs.zen-browser.packages.${final.stdenv.system}.zen-browser-unwrapped.override {
|
||||
# sources = inputs.zen-browser.inputs;
|
||||
# };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue