Rename myWrappers to wrappers

This commit is contained in:
SebastianStork 2024-05-09 23:39:59 +02:00
parent 0624562069
commit 08dae72f8d
3 changed files with 11 additions and 11 deletions

View file

@ -1,7 +1,7 @@
{ {
config, config,
lib, lib,
myWrappers, wrappers,
... ...
}: { }: {
options.myConfig.de.waybar.enable = lib.mkEnableOption ""; options.myConfig.de.waybar.enable = lib.mkEnableOption "";
@ -9,7 +9,7 @@
config = lib.mkIf config.myConfig.de.waybar.enable { config = lib.mkIf config.myConfig.de.waybar.enable {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = myWrappers.waybar; package = wrappers.waybar;
systemd.enable = true; systemd.enable = true;
}; };

View file

@ -2,7 +2,7 @@
config, config,
pkgs, pkgs,
osConfig, osConfig,
myWrappers, wrappers,
... ...
}: { }: {
xdg.userDirs.extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots"; xdg.userDirs.extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
@ -40,12 +40,12 @@
pkgs.hunspellDicts.de_DE pkgs.hunspellDicts.de_DE
pkgs.hunspellDicts.en_US pkgs.hunspellDicts.en_US
myWrappers.bottom wrappers.bottom
myWrappers.spotify wrappers.spotify
myWrappers.obsidian wrappers.obsidian
myWrappers.marktext wrappers.marktext
myWrappers.webcord wrappers.webcord
(myWrappers.kitty {inherit (config.myConfig.de) theme;}) (wrappers.kitty {inherit (config.myConfig.de) theme;})
(myWrappers.rofi {inherit (config.myConfig.de) theme;}) (wrappers.rofi {inherit (config.myConfig.de) theme;})
]; ];
} }

View file

@ -14,7 +14,7 @@
.wrappedPackage .wrappedPackage
.wrapped; .wrapped;
in { in {
_module.args.myWrappers = lib.pipe (builtins.readDir ./.) [ _module.args.wrappers = lib.pipe (builtins.readDir ./.) [
(lib.filterAttrs (name: value: name != "default.nix")) (lib.filterAttrs (name: value: name != "default.nix"))
(lib.concatMapAttrs (name: _: {${lib.removeSuffix ".nix" name} = import ./${name} {inherit assembleWrapper pkgs lib;};})) (lib.concatMapAttrs (name: _: {${lib.removeSuffix ".nix" name} = import ./${name} {inherit assembleWrapper pkgs lib;};}))
]; ];