clean
This commit is contained in:
parent
ca5ac20ac9
commit
d6f045059a
@ -12,8 +12,7 @@
|
||||
../nixos/system/system.nix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
|
||||
# Home manager
|
||||
home-manager = {
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
];
|
||||
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
# Home manager
|
||||
home-manager = {
|
||||
extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;};
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
userSettings,
|
||||
...
|
||||
}: let
|
||||
shellAliases = {
|
||||
@ -36,10 +37,12 @@ in {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
|
||||
shellAliases = shellAliases;
|
||||
inherit shellAliases;
|
||||
|
||||
bashrcExtra = ''
|
||||
${pkgs.pfetch}/bin/pfetch'';
|
||||
bashrcExtra =
|
||||
if userSettings.hostname != "ginoza"
|
||||
then ''${pkgs.pfetch}/bin/pfetch''
|
||||
else '''';
|
||||
};
|
||||
|
||||
home.sessionVariables = {
|
||||
|
||||
@ -43,14 +43,14 @@
|
||||
group = "users";
|
||||
};
|
||||
|
||||
"${userSettings.hostname}/syncthing" = {
|
||||
owner = userSettings.username;
|
||||
group = "users";
|
||||
};
|
||||
#"${userSettings.hostname}/syncthing" = {
|
||||
# owner = userSettings.username;
|
||||
# group = "users";
|
||||
#};
|
||||
};
|
||||
|
||||
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-id2".content = ''${config.sops.placeholder.cassius_spear}'';
|
||||
};
|
||||
|
||||
@ -22,6 +22,11 @@
|
||||
./settings/user.nix
|
||||
];
|
||||
|
||||
nix.settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
trusted-users = ["root" "${userSettings.username}" "@wheel"];
|
||||
};
|
||||
|
||||
sys = {
|
||||
audio.enable = lib.mkDefault true;
|
||||
bootloader.plymouth.enable = lib.mkDefault true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user