v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

Merge remote-tracking branch 'refs/remotes/origin/main'

Browse source
This commit is contained in:
Vivian 2023-11-16 20:33:48 +01:00
commit 3ae1ab6d4e
16 changed files with 53 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/common/default.nix
View file

@ -41,7 +41,7 @@
package = pkgs.nixUnstable;
settings = {
auto-optimise-store = true;
trusted-users = [ "root" "victor" ];
trusted-users = [ "root" "vivian" ];
substituters = [
"https://nix-community.cachix.org"
"https://nixpkgs-review-bot.cachix.org"

6
nixos/common/desktop/default.nix
View file

@ -18,7 +18,7 @@
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.victor = import ./home.nix;
users.vivian = import ./home.nix;
extraSpecialArgs = { inherit inputs; };
};
services = {
@ -60,7 +60,7 @@
};
# Global Packages
environment = { systemPackages = with pkgs; [ wireguard-tools sbctl ]; };
environment.systemPackages = with pkgs; [ wireguard-tools sbctl podman-compose ];
# programs.virt-manager = {
# enable = true;
@ -93,7 +93,6 @@
programs = {
steam = {
enable = true;
# Open ports in the firewall for Steam Remote Play
remotePlay.openFirewall = true;
@ -102,7 +101,6 @@
};
};
gamemode.enable = true;
adb.enable = true;

2
nixos/common/hm-modules/git.nix
View file

@ -8,7 +8,7 @@ in {
enable = true;
package = pkgs.gitAndTools.gitFull;
userName = "0x76";
userEmail = "victor@xirion.net";
userEmail = "v@0x76.dev";
lfs.enable = true;
extraConfig = {
push.autoSetupRemote = true;

4
nixos/common/users/default.nix
View file

@ -1,5 +1,5 @@
{ config, pkgs, lib, ... }: {
imports = [ ./laura.nix ./victor.nix ./jonathan.nix ];
imports = [ ./laura.nix ./vivian.nix ./jonathan.nix ];
# Setup ZSH to use grml config
programs.zsh = {
@ -34,7 +34,7 @@
users.extraUsers.root = {
# Allow my SSH keys for logging in as root.
openssh.authorizedKeys.keys =
config.users.extraUsers.victor.openssh.authorizedKeys.keys;
config.users.extraUsers.vivian.openssh.authorizedKeys.keys;
# Also use zsh for root
shell = pkgs.zsh;
};

20
nixos/common/users/victor.nix → nixos/common/users/vivian.nix
View file

@ -1,6 +1,7 @@
{ pkgs, ... }: {
# The block that specifies my user account.
users.extraUsers.victor = {
users.extraUsers.vivian = {
uid = 1000;
# This account is intended for a non-system user.
isNormalUser = true;
@ -9,12 +10,12 @@
# My SSH keys.
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBhJAp7NWlHgwDYd2z6VNROy5RkeZHRINFLsFvwT4b3 victor@bastion"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMbdjysLnmwJD5Fs/SjBPstdIQNUxy8zFHP0GlhHMJB victor@bastion"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfooZjMWXvXZu1ReOEACDZ0TMb2WJRBSOLlWE8y6fUh victor@aoife"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBMTCUjDbDjAiEKbKmLPavuYM0wJIBdjgytLsg1uWuGc victor@nord"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBhJAp7NWlHgwDYd2z6VNROy5RkeZHRINFLsFvwT4b3 vivian@bastion"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMbdjysLnmwJD5Fs/SjBPstdIQNUxy8zFHP0GlhHMJB vivian@bastion"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfooZjMWXvXZu1ReOEACDZ0TMb2WJRBSOLlWE8y6fUh vivian@aoife"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBMTCUjDbDjAiEKbKmLPavuYM0wJIBdjgytLsg1uWuGc vivian@nord"
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIM3TqXaApX2JZsgfZd7PKVFMecDgqTHKibpSzgdXNpYAAAAABHNzaDo= solov2-le"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID+HbsgJTQS6pvnMEI5NPKjIf78z+9A7CTIt3abi+PS6 victor@eevee"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID+HbsgJTQS6pvnMEI5NPKjIf78z+9A7CTIt3abi+PS6 vivian@eevee"
];
# Make me admin
@ -22,7 +23,7 @@
[ "systemd-journal" "wheel" "networkmanager" "libvirtd" "dialout" ];
};
home-manager.users.victor = {
home-manager.users.vivian = {
programs = {
home-manager.enable = true;
@ -38,9 +39,8 @@
bat.enable = true;
};
home = {
username = "victor";
homeDirectory = "/home/victor";
username = "vivian";
homeDirectory = "/home/vivian";
stateVersion = "23.05";
};

2
nixos/hosts/hades/lucy/configuration.nix
View file

@ -71,5 +71,5 @@ in
};
users.extraUsers.laura.extraGroups = [ "wheel" "docker" ];
users.extraUsers.victor.extraGroups = [ "docker" ];
users.extraUsers.vivian.extraGroups = [ "docker" ];
}

2
nixos/hosts/hades/nginx/configuration.nix
View file

@ -26,7 +26,7 @@ in
networking.firewall.allowedTCPPorts = [ 80 443 ];
security.acme = {
defaults.email = "victorheld12@gmail.com";
defaults.email = "vivian@0x76.dev";
acceptTerms = true;
preliminarySelfsigned = true;
};

2
nixos/hosts/olympus/bastion/configuration.nix
View file

@ -70,5 +70,5 @@ in
pinentryFlavor = "curses";
};
home-manager.users.victor = import ./home.nix;
home-manager.users.vivian = import ./home.nix;
}

2
nixos/hosts/olympus/eevee/configuration.nix
View file

@ -41,7 +41,7 @@
environment.sessionVariables.NIXOS_OZONE_WL = "1";
home-manager = {
users.victor = import ./home;
users.vivian = import ./home;
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

2
nixos/hosts/olympus/mosquitto/configuration.nix
View file

@ -25,7 +25,7 @@ in {
settings.allow_anonymous = true;
acl = [ "topic readwrite #" ];
users = {
victor = { acl = [ "readwrite #" ]; };
vivian = { acl = [ "readwrite #" ]; };
zigbee2mqtt = { acl = [ "readwrite #" ]; };
};
}];

2
nixos/hosts/olympus/nginx/configuration.nix
View file

@ -142,7 +142,7 @@ in
security = {
acme = {
defaults.email = "victorheld12@gmail.com";
defaults.email = "vivian@0x76.dev";
acceptTerms = true;
preliminarySelfsigned = true;
};

2
nixos/hosts/thalassa/aoife/configuration.nix
View file

@ -27,7 +27,7 @@
};
};
home-manager.users.victor = import ./home;
home-manager.users.vivian = import ./home;
# Enable Ozone rendering for Chromium and Electron apps.
environment.sessionVariables.NIXOS_OZONE_WL = "1";

2
nixos/hosts/thalassa/aoife/hardware.nix
View file

@ -51,5 +51,5 @@
tctiEnvironment.enable = true;
};
}; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
users.users.victor.extraGroups = [ "tss" ]; # tss group has access to TPM devices
users.users.vivian.extraGroups = [ "tss" ]; # tss group has access to TPM devices
}

2
nixos/hosts/thalassa/null/configuration.nix
View file

@ -43,7 +43,7 @@ in
# home-manager
useGlobalPkgs = true;
useUserPackages = true;
users.victor = import ./home;
users.vivian = import ./home;
extraSpecialArgs = { inherit inputs; };
};
security = {

8
nixos/hosts/thalassa/null/home/default.nix
View file

@ -23,8 +23,8 @@ in
git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
userName = "Victor";
userEmail = "victor@xirion.net";
userName = "0x76";
userEmail = "v@0x76";
lfs.enable = true;
# delta.enable = true;
extraConfig = {
@ -108,8 +108,8 @@ in
};
};
home = {
username = "victor";
homeDirectory = "/home/victor";
username = "vivian";
homeDirectory = "/home/vivian";
stateVersion = "22.05";
packages = with pkgs; [