This commit is contained in:
foglar 2025-03-14 09:43:19 +01:00
parent ca5ac20ac9
commit d6f045059a
5 changed files with 17 additions and 11 deletions

View File

@ -13,7 +13,6 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
]; ];
nix.settings.experimental-features = ["nix-command" "flakes"];
# Home manager # Home manager
home-manager = { home-manager = {

View File

@ -15,7 +15,6 @@
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]; ];
nix.settings.experimental-features = ["nix-command" "flakes"];
# Home manager # Home manager
home-manager = { home-manager = {
extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;}; extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;};

View File

@ -2,6 +2,7 @@
lib, lib,
config, config,
pkgs, pkgs,
userSettings,
... ...
}: let }: let
shellAliases = { shellAliases = {
@ -36,10 +37,12 @@ in {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
shellAliases = shellAliases; inherit shellAliases;
bashrcExtra = '' bashrcExtra =
${pkgs.pfetch}/bin/pfetch''; if userSettings.hostname != "ginoza"
then ''${pkgs.pfetch}/bin/pfetch''
else '''';
}; };
home.sessionVariables = { home.sessionVariables = {

View File

@ -43,14 +43,14 @@
group = "users"; group = "users";
}; };
"${userSettings.hostname}/syncthing" = { #"${userSettings.hostname}/syncthing" = {
owner = userSettings.username; # owner = userSettings.username;
group = "users"; # group = "users";
}; #};
}; };
templates = { templates = {
"syncthing-password".content = ''${config.sops.placeholder."${userSettings.hostname}/syncthing"}''; #"syncthing-password".content = ''${config.sops.placeholder."${userSettings.hostname}/syncthing"}'';
"yubikey-id".content = ''${config.sops.placeholder.longinus_spear}''; "yubikey-id".content = ''${config.sops.placeholder.longinus_spear}'';
"yubikey-id2".content = ''${config.sops.placeholder.cassius_spear}''; "yubikey-id2".content = ''${config.sops.placeholder.cassius_spear}'';
}; };

View File

@ -22,6 +22,11 @@
./settings/user.nix ./settings/user.nix
]; ];
nix.settings = {
experimental-features = ["nix-command" "flakes"];
trusted-users = ["root" "${userSettings.username}" "@wheel"];
};
sys = { sys = {
audio.enable = lib.mkDefault true; audio.enable = lib.mkDefault true;
bootloader.plymouth.enable = lib.mkDefault true; bootloader.plymouth.enable = lib.mkDefault true;