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 19:09:15 +09:00
parent cfd307d0cc
commit 21b7ba63aa
Signed by: albert
GPG key ID: 3895DD267CA11BA9
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home-manager/default.nix
View file

@ -16,7 +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 ++ lib.optional (builtins.isString image ) ./common/image-specific.nix # Image specific items
; ;
news.display = "silent"; news.display = "silent";

5
lib/default.nix
View file

@ -23,10 +23,11 @@
desktop ? null, desktop ? null,
system ? "x86_64-linux", system ? "x86_64-linux",
theme ? "default", theme ? "default",
type ? "default" type ? "default",
image ? null
}: inputs.home-manager.lib.homeManagerConfiguration { }: inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme; }; extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme image; };
modules = [ ../home-manager/${type}.nix ]; modules = [ ../home-manager/${type}.nix ];
}; };

2
nixos/common/modules/installer.nix
View file

@ -1,7 +1,7 @@
{ config, desktop, lib, pkgs, username, ... }: { config, desktop, lib, pkgs, username, ... }:
let let
ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
install-system = pkgs.writeScriptBin "install-system" ${builtins.readFile ../../../docs/install.sh}"; install-system = pkgs.writeScriptBin "install-system" "${builtins.readFile ../../../docs/install.sh}";
in in
{ {
config.environment.systemPackages = [ install-system ]; config.environment.systemPackages = [ install-system ];