Disable atuin on images
This commit is contained in:
parent
7620350eba
commit
cfd307d0cc
4 changed files with 10 additions and 3 deletions
4
home-manager/common/image-specific.nix
Normal file
4
home-manager/common/image-specific.nix
Normal file
|
@ -0,0 +1,4 @@
|
|||
{ lib, ... }: {
|
||||
# Requires secrets not available in images
|
||||
programs.atuin.enable = mkDefault false;
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, inputs, hostname, username, desktop, hmStateVersion, system, ... }: {
|
||||
{ lib, inputs, hostname, username, desktop, hmStateVersion, system, image, ... }: {
|
||||
imports = [
|
||||
# Common configs
|
||||
./common/software/cli
|
||||
|
@ -16,6 +16,7 @@
|
|||
++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages
|
||||
++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs
|
||||
++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop} # Machine-specific desktop configs
|
||||
++ lib.optional {builtins.isString image } ./common/image-specific.nix # Disables things that require secrets
|
||||
;
|
||||
|
||||
news.display = "silent";
|
||||
|
|
|
@ -155,10 +155,11 @@
|
|||
theme ? "default",
|
||||
repo ? "nixpkgs",
|
||||
unfree ? false,
|
||||
image ? true,
|
||||
format
|
||||
}: inputs.nixos-generators.nixosGenerate {
|
||||
specialArgs = {
|
||||
inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format;
|
||||
inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format image;
|
||||
# Choose whether to pull from stable or unstable
|
||||
pkgs = import inputs.${repo} {
|
||||
inherit system;
|
||||
|
@ -182,7 +183,7 @@
|
|||
inputs.sops-nix.nixosModules.sops
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
inputs.home-manager.nixosModules.home-manager {
|
||||
home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme format; };
|
||||
home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme format image; };
|
||||
home-manager.users."${username}" = import ../home-manager;
|
||||
}
|
||||
];
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
networkmanager = {
|
||||
enable = true;
|
||||
logLevel = "INFO";
|
||||
dns = "dnsmasq";
|
||||
};
|
||||
|
||||
useDHCP = lib.mkDefault true;
|
||||
|
|
Loading…
Reference in a new issue