diff options
| -rw-r--r-- | home/default.nix | 4 | ||||
| -rw-r--r-- | lib/default.nix | 72 | ||||
| -rw-r--r-- | options.nix | 9 | ||||
| -rw-r--r-- | system/default.nix | 4 |
4 files changed, 53 insertions, 36 deletions
diff --git a/home/default.nix b/home/default.nix index 6ea1b04..d64a401 100644 --- a/home/default.nix +++ b/home/default.nix @@ -58,7 +58,9 @@ in { # media ffmpeg imagemagick - ]); + ]) + # mirrored from system + ++ config.extraPackages; xdg.configFile = { "aacs/keydb.cfg" = { diff --git a/lib/default.nix b/lib/default.nix index 2da5bd9..62efd3f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -4,38 +4,42 @@ in { inherit (files) getFiles certs sshKeys gpgKeys; - homeConfig = config: { - inherit - (config) - # System Information - hostName - timeZone - stateVersion - # System Modules - battery - bluetooth - fingerprint - network - tpm - minimal - # Primary User - user - fullName - email - homePath - dotfilesPath - # Monitors - monitors - # Theme - theme - # Programs - apps - browsers - desktops - gaming - development - virt - autoRun - ; - } // config.extraHome; + homeConfig = config: + { + inherit + (config) + # System Information + hostName + timeZone + stateVersion + # System Modules + battery + bluetooth + fingerprint + network + tpm + minimal + # Primary User + user + fullName + email + homePath + dotfilesPath + # Monitors + monitors + # Theme + theme + # Programs + apps + browsers + desktops + gaming + development + virt + autoRun + # Packages + extraPackages + ; + } + // config.extraHome; } diff --git a/options.nix b/options.nix index db68544..2dcdc54 100644 --- a/options.nix +++ b/options.nix @@ -483,5 +483,14 @@ in { description = "Extra home manager configuration"; default = {}; }; + + # + # Extra packages to add to home to mirror in system config + # + extraPackages = mkOption { + type = with types; listOf package; + description = "List of system pacakges to mirror into home env"; + default = []; + }; }; } diff --git a/system/default.nix b/system/default.nix index 9760184..b913bd5 100644 --- a/system/default.nix +++ b/system/default.nix @@ -57,7 +57,7 @@ networking.hostName = config.hostName; # common system packages - environment.systemPackages = with pkgs; [ + extraPackages = with pkgs; [ # editor vim # lib @@ -85,6 +85,8 @@ wget ]; + environment.systemPackages = config.extraPackages; + # system shell programs.zsh.enable = true; |