Refactor user management functions to use inputs
Removed the `lib.nix` file and refactored various modules to utilize `inputs.self.lib` for user package and attribute management. This change enhances consistency and maintainability across the configuration files.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -40,7 +41,6 @@ in
|
||||
dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
|
||||
};
|
||||
config.users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = artPackages ++ gameDevPackages;
|
||||
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
hunspell
|
||||
@@ -20,6 +20,6 @@ in
|
||||
{
|
||||
options.my.apps.dictionaries.enable = lib.mkEnableOption "dictionaries and language tools";
|
||||
config = lib.mkIf config.my.apps.dictionaries.enable {
|
||||
users.users = userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
users.users = inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -51,7 +51,6 @@ in
|
||||
# };
|
||||
};
|
||||
users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = builtins.attrValues {
|
||||
inherit retroarchWithCores;
|
||||
inherit (pkgs)
|
||||
@@ -70,6 +69,6 @@ in
|
||||
prismlauncher # minecraft launcher with jdk overlays
|
||||
;
|
||||
};
|
||||
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -29,14 +30,11 @@ in
|
||||
{
|
||||
options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
|
||||
config = lib.mkIf config.my.apps.internet.enable {
|
||||
home-manager.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
in userLib.mkHomeManagerUsers config.my.toggleUsers.apps (user: {
|
||||
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.apps (user: {
|
||||
programs.librewolf = import ./librewolf.nix;
|
||||
});
|
||||
programs.geary.enable = true;
|
||||
users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = builtins.attrValues {
|
||||
# inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
|
||||
inherit krisp-patcher;
|
||||
@@ -54,6 +52,6 @@ in
|
||||
fractal # matrix client
|
||||
;
|
||||
};
|
||||
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -8,7 +9,6 @@
|
||||
options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
|
||||
config = lib.mkIf config.my.apps.misc.enable {
|
||||
users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
blanket # background noise
|
||||
@@ -17,6 +17,6 @@
|
||||
gnome-obfuscate # censor private information
|
||||
;
|
||||
};
|
||||
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -8,7 +9,6 @@
|
||||
options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
|
||||
config = lib.mkIf config.my.apps.multimedia.enable {
|
||||
users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
curtail # image compressor
|
||||
@@ -19,6 +19,6 @@
|
||||
tagger # tag music files
|
||||
;
|
||||
};
|
||||
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -8,7 +9,6 @@
|
||||
options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
|
||||
config = lib.mkIf config.my.apps.piano.enable {
|
||||
users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
neothesia
|
||||
@@ -16,6 +16,6 @@
|
||||
timidity
|
||||
;
|
||||
};
|
||||
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -9,7 +10,6 @@
|
||||
config = lib.mkIf config.my.apps.office.enable {
|
||||
environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
|
||||
users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
jre17_minimal # for libreoffice extensions
|
||||
@@ -20,6 +20,6 @@
|
||||
# planify # let's pretend I will organize my tasks
|
||||
;
|
||||
};
|
||||
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
|
||||
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user