diff --git a/ginoza/configuration.nix b/ginoza/configuration.nix index bca8367..6b4b1d9 100644 --- a/ginoza/configuration.nix +++ b/ginoza/configuration.nix @@ -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 = { diff --git a/kogami/configuration.nix b/kogami/configuration.nix index b13e2e9..060c390 100644 --- a/kogami/configuration.nix +++ b/kogami/configuration.nix @@ -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;}; diff --git a/nixos/home/packages/tools/shell.nix b/nixos/home/packages/tools/shell.nix index 02aacd4..e502fd7 100644 --- a/nixos/home/packages/tools/shell.nix +++ b/nixos/home/packages/tools/shell.nix @@ -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 = { diff --git a/nixos/system/packages/sops/sops.nix b/nixos/system/packages/sops/sops.nix index 64f32e7..b06f232 100644 --- a/nixos/system/packages/sops/sops.nix +++ b/nixos/system/packages/sops/sops.nix @@ -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}''; }; diff --git a/nixos/system/system.nix b/nixos/system/system.nix index a7b717c..9135e11 100644 --- a/nixos/system/system.nix +++ b/nixos/system/system.nix @@ -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;