diff --git a/home/default.nix b/home/default.nix index e71ab90..22b8c3a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,6 +10,7 @@ let let inherit (metadata.hosts.${host}) system; pkgs = nixpkgs.${system}; + pkgs' = top.self.packages.${system}; username = if builtins.hasAttr "user" metadata.hosts.${host} then metadata.hosts.${host}.user else "greg"; in @@ -25,6 +26,7 @@ let host username metadata + pkgs' ; nixvim = top.nixvimunstable; gui = false; diff --git a/home/home.nix b/home/home.nix index a5f5c49..0a78340 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,5 +1,6 @@ { pkgs, + pkgs', lib, host ? "most", top, @@ -38,7 +39,7 @@ in gh git gnupatch - hms + pkgs'.hms btop inetutils jq @@ -46,7 +47,7 @@ in nix-prefetch nmap openssl - setup-ssh + pkgs'.setup-ssh tmux tree unzip diff --git a/hosts/default.nix b/hosts/default.nix index 3142fb7..02edf23 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -15,11 +15,17 @@ let }: let inherit (metadata.hosts.${name}) system; + pkgs' = top.self.packages.${system}; in channel.lib.nixosSystem { pkgs = nixpkgs.${system}; specialArgs = { - inherit metadata top lib'; + inherit + metadata + top + lib' + pkgs' + ; }; modules = [ { diff --git a/hosts/unstable/genesis/default.nix b/hosts/unstable/genesis/default.nix index f00eb72..188771e 100644 --- a/hosts/unstable/genesis/default.nix +++ b/hosts/unstable/genesis/default.nix @@ -2,7 +2,12 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ top, pkgs, ... }: +{ + top, + pkgs, + pkgs', + ... +}: { imports = [ # Include the results of the hardware scan. @@ -31,7 +36,7 @@ }; environment.systemPackages = with pkgs; [ - create_ssl + pkgs'.create_ssl step-ca ]; diff --git a/hosts/unstable/linode/postgres.nix b/hosts/unstable/linode/postgres.nix index 3de9363..10c39c0 100644 --- a/hosts/unstable/linode/postgres.nix +++ b/hosts/unstable/linode/postgres.nix @@ -1,7 +1,12 @@ -{ config, pkgs, ... }: +{ + config, + pkgs, + pkgs', + ... +}: { - environment.systemPackages = [ pkgs.upgrade-pg-cluster ]; + environment.systemPackages = [ pkgs'.upgrade-pg-cluster ]; services.postgresql = { enable = true;