undid all of the wrapper nonsense

This commit is contained in:
2026-07-07 14:32:16 +01:00
parent 86188bc3d8
commit f9b5c03e87
5 changed files with 11 additions and 11 deletions

View File

@@ -1,5 +1,4 @@
{ {
wrappers,
self, self,
moduleWithSystem, moduleWithSystem,
... ...

View File

@@ -1,5 +1,5 @@
{ {
wrappers, inputs,
moduleWithSystem, moduleWithSystem,
... ...
}: { }: {
@@ -24,9 +24,9 @@
min_priority = 1 min_priority = 1
''; '';
in in
wrappers.lib.wrapPackage ({...}: { inputs.wrappers.lib.wrapPackage ({...}: {
inherit pkgs; inherit pkgs;
package = inputs'.gotify-desktop.default; package = inputs'.gotify-desktop.packages.default;
flags = { flags = {
"-c" = config-file; "-c" = config-file;
}; };

View File

@@ -1,7 +1,7 @@
{ {
wrappers,
moduleWithSystem, moduleWithSystem,
self, self,
inputs,
... ...
}: { }: {
flake.nixosModules.hyprland = moduleWithSystem ({ flake.nixosModules.hyprland = moduleWithSystem ({
@@ -29,13 +29,14 @@
perSystem = { perSystem = {
pkgs, pkgs,
self', self',
system,
inputs', inputs',
... ...
}: { }: {
packages = { packages = {
hyprland = inputs'.hyprland.packages.default.override { hyprland = inputs'.hyprland.packages.default.override {
runtimePackages = runtimePackages =
inputs'.hyprland.lib.defaultRuntimePkgs inputs.hyprland.lib.defaultRuntimePkgs.${system}
// { // {
wpaperd = self'.packages.wpaperd; wpaperd = self'.packages.wpaperd;
kitty = self'.packages.kitty; kitty = self'.packages.kitty;
@@ -58,7 +59,7 @@
path = "${./wallpapers/topo3.png}" path = "${./wallpapers/topo3.png}"
''; '';
in in
wrappers.lib.wrapPackage ({...}: { inputs.wrappers.lib.wrapPackage ({...}: {
inherit pkgs; inherit pkgs;
package = pkgs.wpaperd; package = pkgs.wpaperd;
flags = { flags = {

View File

@@ -1,5 +1,5 @@
{ {
wrappers, inputs,
moduleWithSystem, moduleWithSystem,
... ...
}: { }: {
@@ -20,7 +20,7 @@
fontDirectories = [fira-mono]; fontDirectories = [fira-mono];
}; };
in in
wrappers.wrappers.kitty.wrap { inputs.wrappers.wrappers.kitty.wrap {
inherit pkgs; inherit pkgs;
environment = { environment = {
"FONTCONFIG_FILE" = "${fontsConf}"; "FONTCONFIG_FILE" = "${fontsConf}";

View File

@@ -1,5 +1,5 @@
{ {
wrappers, inputs,
moduleWithSystem, moduleWithSystem,
... ...
}: { }: {
@@ -29,7 +29,7 @@
${extra-config} ${extra-config}
''; '';
in in
wrappers.lib.wrapPackage ({...}: { inputs.wrappers.lib.wrapPackage ({...}: {
inherit pkgs; inherit pkgs;
package = inputs'.otter-launcher.packages.default; package = inputs'.otter-launcher.packages.default;
runtimePkgs = with pkgs; [ runtimePkgs = with pkgs; [