From 1542f840dcd8660f719ed5c91d040b38699d96fa Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 16 Nov 2023 20:14:11 +0100 Subject: [PATCH] change name --- flake.lock | 48 +++++++++---------- nixos/common/default.nix | 2 +- nixos/common/desktop/default.nix | 6 +-- nixos/common/hm-modules/git.nix | 2 +- nixos/common/users/default.nix | 4 +- nixos/common/users/{victor.nix => vivian.nix} | 20 ++++---- nixos/hosts/hades/lucy/configuration.nix | 2 +- nixos/hosts/hades/nginx/configuration.nix | 2 +- nixos/hosts/olympus/bastion/configuration.nix | 2 +- nixos/hosts/olympus/eevee/configuration.nix | 2 +- .../hosts/olympus/mosquitto/configuration.nix | 2 +- nixos/hosts/olympus/nginx/configuration.nix | 2 +- nixos/hosts/thalassa/aoife/configuration.nix | 2 +- nixos/hosts/thalassa/aoife/hardware.nix | 2 +- nixos/hosts/thalassa/null/configuration.nix | 2 +- nixos/hosts/thalassa/null/home/default.nix | 8 ++-- 16 files changed, 53 insertions(+), 55 deletions(-) rename nixos/common/users/{victor.nix => vivian.nix} (77%) diff --git a/flake.lock b/flake.lock index 3c598c1..0a550ee 100644 --- a/flake.lock +++ b/flake.lock @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700087144, + "narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506", "type": "github" }, "original": { @@ -713,11 +713,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1699626196, - "narHash": "sha256-/arAIgFkEOTss4BsppCJn1DIBxvx1ESgWOj9CJqx4lQ=", + "lastModified": 1699973284, + "narHash": "sha256-eqic6t1+yd3JXqByexLdZiuyLBzy9KSAOvDBet6yr5Q=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "81975f3bc4a7f3f4c689c43645110c2e1aac56b2", + "rev": "2123d3a0e1ae16d0a9d1858464edfd34db653653", "type": "github" }, "original": { @@ -898,11 +898,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1699701045, - "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=", + "lastModified": 1699997707, + "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad", + "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9", "type": "github" }, "original": { @@ -1089,11 +1089,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1699686971, - "narHash": "sha256-fttf55Uo88Ei57sxTuDOwKXg8izdR365lFjI13+XfwE=", + "lastModified": 1700083842, + "narHash": "sha256-uC5v4VyUPgC5L3zv7e9q6+TRCm+eiA+Ow5vcH67ef/I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d638da8b6a17041483d90ba9af6c3b5e30b4fbcc", + "rev": "9008bc4eb62c878d0812105ea1b34255d651df88", "type": "github" }, "original": { @@ -1104,11 +1104,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1699781429, + "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "type": "github" }, "original": { @@ -1184,11 +1184,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1699291058, - "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", + "lastModified": 1699994397, + "narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", + "rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1699721903, - "narHash": "sha256-ghsMr6EqRNCRJtzNokmqeyA3soMjl7bc+/TN7LX/Izc=", + "lastModified": 1700090888, + "narHash": "sha256-s4PAYgu2xoIvapwVYCnQi8B/2d8Fb6kzfG7cwXFmKvQ=", "owner": "pta2002", "repo": "nixvim", - "rev": "1286a0f41e37b2bb94f2eb87a7f4efde727f8e87", + "rev": "356e0e855b5896590554ed8df660d042ca12d07d", "type": "github" }, "original": { @@ -1220,11 +1220,11 @@ }, "nur": { "locked": { - "lastModified": 1699789173, - "narHash": "sha256-8ImqQHlD/RV/DqUkLX6OMOLC0L3rOnpz18/L8kt+9QQ=", + "lastModified": 1700142333, + "narHash": "sha256-Mu0TH+JqVLCeEu2RFFnkTHluHmPc9FY7+vl4bW+EO6Y=", "owner": "nix-community", "repo": "NUR", - "rev": "cafc94f2fafd3bc7ef0a2f35a3484dd2df64f111", + "rev": "11299b3ab33b7a5128031263b8a70e94ae47b671", "type": "github" }, "original": { diff --git a/nixos/common/default.nix b/nixos/common/default.nix index 4ba2c85..03d5d45 100644 --- a/nixos/common/default.nix +++ b/nixos/common/default.nix @@ -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" diff --git a/nixos/common/desktop/default.nix b/nixos/common/desktop/default.nix index 5c2b2c8..c7201b1 100644 --- a/nixos/common/desktop/default.nix +++ b/nixos/common/desktop/default.nix @@ -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; diff --git a/nixos/common/hm-modules/git.nix b/nixos/common/hm-modules/git.nix index beb4150..af8d83c 100644 --- a/nixos/common/hm-modules/git.nix +++ b/nixos/common/hm-modules/git.nix @@ -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; diff --git a/nixos/common/users/default.nix b/nixos/common/users/default.nix index 73af8c4..d1f0b82 100644 --- a/nixos/common/users/default.nix +++ b/nixos/common/users/default.nix @@ -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; }; diff --git a/nixos/common/users/victor.nix b/nixos/common/users/vivian.nix similarity index 77% rename from nixos/common/users/victor.nix rename to nixos/common/users/vivian.nix index 9fa87ac..35138b2 100644 --- a/nixos/common/users/victor.nix +++ b/nixos/common/users/vivian.nix @@ -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"; }; diff --git a/nixos/hosts/hades/lucy/configuration.nix b/nixos/hosts/hades/lucy/configuration.nix index 3568268..f73a5df 100644 --- a/nixos/hosts/hades/lucy/configuration.nix +++ b/nixos/hosts/hades/lucy/configuration.nix @@ -71,5 +71,5 @@ in }; users.extraUsers.laura.extraGroups = [ "wheel" "docker" ]; - users.extraUsers.victor.extraGroups = [ "docker" ]; + users.extraUsers.vivian.extraGroups = [ "docker" ]; } diff --git a/nixos/hosts/hades/nginx/configuration.nix b/nixos/hosts/hades/nginx/configuration.nix index c2a2d7d..a7331d3 100644 --- a/nixos/hosts/hades/nginx/configuration.nix +++ b/nixos/hosts/hades/nginx/configuration.nix @@ -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; }; diff --git a/nixos/hosts/olympus/bastion/configuration.nix b/nixos/hosts/olympus/bastion/configuration.nix index e306326..40d78ea 100644 --- a/nixos/hosts/olympus/bastion/configuration.nix +++ b/nixos/hosts/olympus/bastion/configuration.nix @@ -70,5 +70,5 @@ in pinentryFlavor = "curses"; }; - home-manager.users.victor = import ./home.nix; + home-manager.users.vivian = import ./home.nix; } diff --git a/nixos/hosts/olympus/eevee/configuration.nix b/nixos/hosts/olympus/eevee/configuration.nix index 26a0bfd..6e4e171 100644 --- a/nixos/hosts/olympus/eevee/configuration.nix +++ b/nixos/hosts/olympus/eevee/configuration.nix @@ -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 diff --git a/nixos/hosts/olympus/mosquitto/configuration.nix b/nixos/hosts/olympus/mosquitto/configuration.nix index d193e63..56cb9b6 100644 --- a/nixos/hosts/olympus/mosquitto/configuration.nix +++ b/nixos/hosts/olympus/mosquitto/configuration.nix @@ -25,7 +25,7 @@ in { settings.allow_anonymous = true; acl = [ "topic readwrite #" ]; users = { - victor = { acl = [ "readwrite #" ]; }; + vivian = { acl = [ "readwrite #" ]; }; zigbee2mqtt = { acl = [ "readwrite #" ]; }; }; }]; diff --git a/nixos/hosts/olympus/nginx/configuration.nix b/nixos/hosts/olympus/nginx/configuration.nix index fed28fe..de9123c 100644 --- a/nixos/hosts/olympus/nginx/configuration.nix +++ b/nixos/hosts/olympus/nginx/configuration.nix @@ -142,7 +142,7 @@ in security = { acme = { - defaults.email = "victorheld12@gmail.com"; + defaults.email = "vivian@0x76.dev"; acceptTerms = true; preliminarySelfsigned = true; }; diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix index d6a93a7..ddeb1fe 100644 --- a/nixos/hosts/thalassa/aoife/configuration.nix +++ b/nixos/hosts/thalassa/aoife/configuration.nix @@ -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"; diff --git a/nixos/hosts/thalassa/aoife/hardware.nix b/nixos/hosts/thalassa/aoife/hardware.nix index df0ee6d..3c5becd 100644 --- a/nixos/hosts/thalassa/aoife/hardware.nix +++ b/nixos/hosts/thalassa/aoife/hardware.nix @@ -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 } diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index e8d0b16..143f5bf 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -43,7 +43,7 @@ in # home-manager useGlobalPkgs = true; useUserPackages = true; - users.victor = import ./home; + users.vivian = import ./home; extraSpecialArgs = { inherit inputs; }; }; security = { diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 9fe33bc..b245deb 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -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; [