albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Disable atuin on images

Browse source
This commit is contained in:
albert 2024-07-15 18:50:11 +09:00
parent 7620350eba
commit cfd307d0cc
Signed by: albert
GPG key ID: 3895DD267CA11BA9
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home-manager/common/image-specific.nix Normal file
View file

@ -0,0 +1,4 @@
{ lib, ... }: {
# Requires secrets not available in images
programs.atuin.enable = mkDefault false;
}

3
home-manager/default.nix
View file

@ -1,4 +1,4 @@
{ lib, inputs, hostname, username, desktop, hmStateVersion, system, ... }: { { lib, inputs, hostname, username, desktop, hmStateVersion, system, image, ... }: {
imports = [ imports = [
# Common configs # Common configs
./common/software/cli ./common/software/cli
@ -16,6 +16,7 @@
++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages ++ 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) ./common/desktops/${desktop} # Machine-agnostic desktop configs
++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop} # Machine-specific 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"; news.display = "silent";

5
lib/default.nix
View file

@ -155,10 +155,11 @@
theme ? "default", theme ? "default",
repo ? "nixpkgs", repo ? "nixpkgs",
unfree ? false, unfree ? false,
image ? true,
format format
}: inputs.nixos-generators.nixosGenerate { }: inputs.nixos-generators.nixosGenerate {
specialArgs = { 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 # Choose whether to pull from stable or unstable
pkgs = import inputs.${repo} { pkgs = import inputs.${repo} {
inherit system; inherit system;
@ -182,7 +183,7 @@
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.home-manager.nixosModules.home-manager { 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; home-manager.users."${username}" = import ../home-manager;
} }
]; ];

1
nixos/common/modules/networking.nix
View file

@ -4,6 +4,7 @@
networkmanager = { networkmanager = {
enable = true; enable = true;
logLevel = "INFO"; logLevel = "INFO";
dns = "dnsmasq";
}; };
useDHCP = lib.mkDefault true; useDHCP = lib.mkDefault true;