diff --git a/modules/home/de/waybar.nix b/modules/home/de/waybar.nix index afb976a..82f2d67 100644 --- a/modules/home/de/waybar.nix +++ b/modules/home/de/waybar.nix @@ -1,7 +1,7 @@ { config, lib, - myWrappers, + wrappers, ... }: { options.myConfig.de.waybar.enable = lib.mkEnableOption ""; @@ -9,7 +9,7 @@ config = lib.mkIf config.myConfig.de.waybar.enable { programs.waybar = { enable = true; - package = myWrappers.waybar; + package = wrappers.waybar; systemd.enable = true; }; diff --git a/users/seb/home.nix b/users/seb/home.nix index 912593b..5a55bf1 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -2,7 +2,7 @@ config, pkgs, osConfig, - myWrappers, + wrappers, ... }: { xdg.userDirs.extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots"; @@ -40,12 +40,12 @@ pkgs.hunspellDicts.de_DE pkgs.hunspellDicts.en_US - myWrappers.bottom - myWrappers.spotify - myWrappers.obsidian - myWrappers.marktext - myWrappers.webcord - (myWrappers.kitty {inherit (config.myConfig.de) theme;}) - (myWrappers.rofi {inherit (config.myConfig.de) theme;}) + wrappers.bottom + wrappers.spotify + wrappers.obsidian + wrappers.marktext + wrappers.webcord + (wrappers.kitty {inherit (config.myConfig.de) theme;}) + (wrappers.rofi {inherit (config.myConfig.de) theme;}) ]; } diff --git a/wrappers/default.nix b/wrappers/default.nix index 077f0bb..9c15548 100644 --- a/wrappers/default.nix +++ b/wrappers/default.nix @@ -14,7 +14,7 @@ .wrappedPackage .wrapped; in { - _module.args.myWrappers = lib.pipe (builtins.readDir ./.) [ + _module.args.wrappers = lib.pipe (builtins.readDir ./.) [ (lib.filterAttrs (name: value: name != "default.nix")) (lib.concatMapAttrs (name: _: {${lib.removeSuffix ".nix" name} = import ./${name} {inherit assembleWrapper pkgs lib;};})) ];