From ca43811c164574c6474ae3ef7fc7ac26cfb1ff73 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 22 Nov 2022 05:11:02 +0000 Subject: [PATCH] remove sane.home-manager.extraPackages replaced by sane.packages.extraUserPkgs --- hosts/moby/default.nix | 2 +- hosts/servo/default.nix | 2 +- modules/gui/phosh.nix | 2 +- modules/gui/sway.nix | 2 +- modules/home-manager/default.nix | 18 +++++------------- modules/home-manager/nb.nix | 2 +- modules/packages.nix | 23 +++++++++++++++++------ 7 files changed, 27 insertions(+), 24 deletions(-) diff --git a/hosts/moby/default.nix b/hosts/moby/default.nix index c2cd836a..6c654dd6 100644 --- a/hosts/moby/default.nix +++ b/hosts/moby/default.nix @@ -29,7 +29,7 @@ ]; # sane.packages.enableGuiPkgs = false; # XXX faster builds/imaging for debugging - sane.home-manager.extraPackages = [ + sane.packages.extraUserPkgs = [ pkgs.plasma5Packages.konsole # terminal ]; diff --git a/hosts/servo/default.nix b/hosts/servo/default.nix index 7fea505e..3ea8ca88 100644 --- a/hosts/servo/default.nix +++ b/hosts/servo/default.nix @@ -9,7 +9,7 @@ ./services ]; - sane.home-manager.extraPackages = [ + sane.packages.extraUserPkgs = [ # for administering services pkgs.matrix-synapse pkgs.freshrss diff --git a/modules/gui/phosh.nix b/modules/gui/phosh.nix index 77183980..37d07a95 100644 --- a/modules/gui/phosh.nix +++ b/modules/gui/phosh.nix @@ -69,7 +69,7 @@ in NIXOS_OZONE_WL = "1"; }; - sane.home-manager.extraPackages = with pkgs; [ + sane.packages.extraUserPkgs = with pkgs; [ phosh-mobile-settings # TODO: see about removing this if the in-built gnome-settings bluetooth manager can work diff --git a/modules/gui/sway.nix b/modules/gui/sway.nix index 062eb617..db6c0858 100644 --- a/modules/gui/sway.nix +++ b/modules/gui/sway.nix @@ -597,7 +597,7 @@ in # } # ''; }; - sane.home-manager.extraPackages = with pkgs; [ + sane.packages.extraUserPkgs = with pkgs; [ swaylock swayidle # (unused) wl-clipboard diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 72ded908..c12d3b74 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -9,9 +9,9 @@ with lib; let cfg = config.sane.home-manager; - # extract package from `extraPackages` + # extract package from `sane.packages.enabledUserPkgs` pkg-list = pkgspec: builtins.map (e: e.pkg or e) pkgspec; - # extract `dir` from `extraPackages` + # extract `dir` from `sane.packages.enabledUserPkgs` dir-list = pkgspec: builtins.concatLists (builtins.map (e: if e ? "dir" then [ e.dir ] else []) pkgspec); private-list = pkgspec: builtins.concatLists (builtins.map (e: if e ? "private" then [ e.private ] else []) pkgspec); feeds = import ./feeds.nix { inherit lib; }; @@ -33,14 +33,6 @@ in ]; options = { - # packages to deploy to the user's home - sane.home-manager.extraPackages = mkOption { - default = [ ]; - # each entry can be either a package, or attrs: - # { pkg = package; dir = optional string; - type = types.listOf (types.either types.package types.attrs); - }; - # attributes to copy directly to home-manager's `wayland.windowManager` option sane.home-manager.windowManager = mkOption { default = {}; @@ -65,7 +57,7 @@ in "Music" "Pictures" "Videos" - ] ++ (dir-list cfg.extraPackages); + ] ++ (dir-list config.sane.packages.enabledUserPkgs); home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -79,7 +71,7 @@ in manual.html.enable = false; # TODO: set to true later (build failure) manual.manpages.enable = false; # TODO: enable after https://github.com/nix-community/home-manager/issues/3344 - home.packages = pkg-list cfg.extraPackages; + home.packages = pkg-list sysconfig.sane.packages.enabledUserPkgs; wayland.windowManager = cfg.windowManager; home.stateVersion = "21.11"; @@ -101,7 +93,7 @@ in name = path; value = { source = config.lib.file.mkOutOfStoreSymlink "/home/colin/private/${path}"; }; }) - (private-list cfg.extraPackages) + (private-list sysconfig.sane.packages.enabledUserPkgs) ); in { # convenience diff --git a/modules/home-manager/nb.nix b/modules/home-manager/nb.nix index adfc700a..a6e7b9c0 100644 --- a/modules/home-manager/nb.nix +++ b/modules/home-manager/nb.nix @@ -10,7 +10,7 @@ { lib, pkgs, ... }: lib.mkIf false # XXX disabled! { - sane.home-manager.extraPackages = [ pkgs.nb ]; + sane.packages.extraUserPkgs = [ pkgs.nb ]; home-manager.users.colin = { config, ... }: { # nb markdown/personal knowledge manager diff --git a/modules/packages.nix b/modules/packages.nix index 7c0472e0..32f51f60 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -221,6 +221,13 @@ let in { options = { + # packages to deploy to the user's home + sane.packages.extraUserPkgs = mkOption { + default = [ ]; + # each entry can be either a package, or attrs: + # { pkg = package; dir = optional string; private = optional string }; + type = types.listOf (types.either types.package types.attrs); + }; sane.packages.enableConsolePkgs = mkOption { default = false; type = types.bool; @@ -242,15 +249,19 @@ in type = types.bool; description = "enable system-wide packages"; }; + + sane.packages.enabledUserPkgs = mkOption { + default = cfg.extraUserPkgs + ++ (if cfg.enableConsolePkgs then consolePkgs else []) + ++ (if cfg.enableGuiPkgs then guiPkgs else []) + ++ (if cfg.enableDevPkgs then devPkgs else []) + ; + type = types.listOf (types.either types.package types.attrs); + description = "generated from other config options"; + }; }; config = { - sane.home-manager.extraPackages = [] - ++ (if cfg.enableConsolePkgs then consolePkgs else []) - ++ (if cfg.enableGuiPkgs then guiPkgs else []) - ++ (if cfg.enableDevPkgs then devPkgs else []) - ; - environment.systemPackages = mkIf cfg.enableSystemPkgs systemPkgs; }; }