change name
This commit is contained in:
parent
3767b37bbf
commit
1542f840dc
16 changed files with 53 additions and 55 deletions
48
flake.lock
48
flake.lock
|
@ -687,11 +687,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699783872,
|
"lastModified": 1700087144,
|
||||||
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
|
"narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "280721186ab75a76537713ec310306f0eba3e407",
|
"rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -713,11 +713,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699626196,
|
"lastModified": 1699973284,
|
||||||
"narHash": "sha256-/arAIgFkEOTss4BsppCJn1DIBxvx1ESgWOj9CJqx4lQ=",
|
"narHash": "sha256-eqic6t1+yd3JXqByexLdZiuyLBzy9KSAOvDBet6yr5Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lanzaboote",
|
"repo": "lanzaboote",
|
||||||
"rev": "81975f3bc4a7f3f4c689c43645110c2e1aac56b2",
|
"rev": "2123d3a0e1ae16d0a9d1858464edfd34db653653",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -898,11 +898,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699701045,
|
"lastModified": 1699997707,
|
||||||
"narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
|
"narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
|
"rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1089,11 +1089,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699686971,
|
"lastModified": 1700083842,
|
||||||
"narHash": "sha256-fttf55Uo88Ei57sxTuDOwKXg8izdR365lFjI13+XfwE=",
|
"narHash": "sha256-uC5v4VyUPgC5L3zv7e9q6+TRCm+eiA+Ow5vcH67ef/I=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d638da8b6a17041483d90ba9af6c3b5e30b4fbcc",
|
"rev": "9008bc4eb62c878d0812105ea1b34255d651df88",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1104,11 +1104,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699099776,
|
"lastModified": 1699781429,
|
||||||
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
|
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
|
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1184,11 +1184,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_stable": {
|
"nixpkgs_stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699291058,
|
"lastModified": 1699994397,
|
||||||
"narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
|
"narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
|
"rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1205,11 +1205,11 @@
|
||||||
"pre-commit-hooks": "pre-commit-hooks"
|
"pre-commit-hooks": "pre-commit-hooks"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699721903,
|
"lastModified": 1700090888,
|
||||||
"narHash": "sha256-ghsMr6EqRNCRJtzNokmqeyA3soMjl7bc+/TN7LX/Izc=",
|
"narHash": "sha256-s4PAYgu2xoIvapwVYCnQi8B/2d8Fb6kzfG7cwXFmKvQ=",
|
||||||
"owner": "pta2002",
|
"owner": "pta2002",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "1286a0f41e37b2bb94f2eb87a7f4efde727f8e87",
|
"rev": "356e0e855b5896590554ed8df660d042ca12d07d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1220,11 +1220,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699789173,
|
"lastModified": 1700142333,
|
||||||
"narHash": "sha256-8ImqQHlD/RV/DqUkLX6OMOLC0L3rOnpz18/L8kt+9QQ=",
|
"narHash": "sha256-Mu0TH+JqVLCeEu2RFFnkTHluHmPc9FY7+vl4bW+EO6Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "cafc94f2fafd3bc7ef0a2f35a3484dd2df64f111",
|
"rev": "11299b3ab33b7a5128031263b8a70e94ae47b671",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
package = pkgs.nixUnstable;
|
package = pkgs.nixUnstable;
|
||||||
settings = {
|
settings = {
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
trusted-users = [ "root" "victor" ];
|
trusted-users = [ "root" "vivian" ];
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://nixpkgs-review-bot.cachix.org"
|
"https://nixpkgs-review-bot.cachix.org"
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
users.victor = import ./home.nix;
|
users.vivian = import ./home.nix;
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = { inherit inputs; };
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Global Packages
|
# Global Packages
|
||||||
environment = { systemPackages = with pkgs; [ wireguard-tools sbctl ]; };
|
environment.systemPackages = with pkgs; [ wireguard-tools sbctl podman-compose ];
|
||||||
|
|
||||||
# programs.virt-manager = {
|
# programs.virt-manager = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
|
@ -93,7 +93,6 @@
|
||||||
programs = {
|
programs = {
|
||||||
steam = {
|
steam = {
|
||||||
|
|
||||||
|
|
||||||
enable = true;
|
enable = true;
|
||||||
# Open ports in the firewall for Steam Remote Play
|
# Open ports in the firewall for Steam Remote Play
|
||||||
remotePlay.openFirewall = true;
|
remotePlay.openFirewall = true;
|
||||||
|
@ -102,7 +101,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
|
|
||||||
adb.enable = true;
|
adb.enable = true;
|
||||||
|
|
|
@ -8,7 +8,7 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.gitAndTools.gitFull;
|
package = pkgs.gitAndTools.gitFull;
|
||||||
userName = "0x76";
|
userName = "0x76";
|
||||||
userEmail = "victor@xirion.net";
|
userEmail = "v@0x76.dev";
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ config, pkgs, lib, ... }: {
|
{ config, pkgs, lib, ... }: {
|
||||||
imports = [ ./laura.nix ./victor.nix ./jonathan.nix ];
|
imports = [ ./laura.nix ./vivian.nix ./jonathan.nix ];
|
||||||
|
|
||||||
# Setup ZSH to use grml config
|
# Setup ZSH to use grml config
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
users.extraUsers.root = {
|
users.extraUsers.root = {
|
||||||
# Allow my SSH keys for logging in as root.
|
# Allow my SSH keys for logging in as root.
|
||||||
openssh.authorizedKeys.keys =
|
openssh.authorizedKeys.keys =
|
||||||
config.users.extraUsers.victor.openssh.authorizedKeys.keys;
|
config.users.extraUsers.vivian.openssh.authorizedKeys.keys;
|
||||||
# Also use zsh for root
|
# Also use zsh for root
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
# The block that specifies my user account.
|
# The block that specifies my user account.
|
||||||
users.extraUsers.victor = {
|
users.extraUsers.vivian = {
|
||||||
|
uid = 1000;
|
||||||
# This account is intended for a non-system user.
|
# This account is intended for a non-system user.
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
|
|
||||||
|
@ -9,12 +10,12 @@
|
||||||
|
|
||||||
# My SSH keys.
|
# My SSH keys.
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBhJAp7NWlHgwDYd2z6VNROy5RkeZHRINFLsFvwT4b3 victor@bastion"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBhJAp7NWlHgwDYd2z6VNROy5RkeZHRINFLsFvwT4b3 vivian@bastion"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMbdjysLnmwJD5Fs/SjBPstdIQNUxy8zFHP0GlhHMJB victor@bastion"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMbdjysLnmwJD5Fs/SjBPstdIQNUxy8zFHP0GlhHMJB vivian@bastion"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfooZjMWXvXZu1ReOEACDZ0TMb2WJRBSOLlWE8y6fUh victor@aoife"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfooZjMWXvXZu1ReOEACDZ0TMb2WJRBSOLlWE8y6fUh vivian@aoife"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBMTCUjDbDjAiEKbKmLPavuYM0wJIBdjgytLsg1uWuGc victor@nord"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBMTCUjDbDjAiEKbKmLPavuYM0wJIBdjgytLsg1uWuGc vivian@nord"
|
||||||
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIM3TqXaApX2JZsgfZd7PKVFMecDgqTHKibpSzgdXNpYAAAAABHNzaDo= solov2-le"
|
"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
|
# Make me admin
|
||||||
|
@ -22,7 +23,7 @@
|
||||||
[ "systemd-journal" "wheel" "networkmanager" "libvirtd" "dialout" ];
|
[ "systemd-journal" "wheel" "networkmanager" "libvirtd" "dialout" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.victor = {
|
home-manager.users.vivian = {
|
||||||
programs = {
|
programs = {
|
||||||
home-manager.enable = true;
|
home-manager.enable = true;
|
||||||
|
|
||||||
|
@ -38,9 +39,8 @@
|
||||||
bat.enable = true;
|
bat.enable = true;
|
||||||
};
|
};
|
||||||
home = {
|
home = {
|
||||||
|
username = "vivian";
|
||||||
username = "victor";
|
homeDirectory = "/home/vivian";
|
||||||
homeDirectory = "/home/victor";
|
|
||||||
stateVersion = "23.05";
|
stateVersion = "23.05";
|
||||||
};
|
};
|
||||||
|
|
|
@ -71,5 +71,5 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
users.extraUsers.laura.extraGroups = [ "wheel" "docker" ];
|
users.extraUsers.laura.extraGroups = [ "wheel" "docker" ];
|
||||||
users.extraUsers.victor.extraGroups = [ "docker" ];
|
users.extraUsers.vivian.extraGroups = [ "docker" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ in
|
||||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||||
security.acme = {
|
security.acme = {
|
||||||
|
|
||||||
defaults.email = "victorheld12@gmail.com";
|
defaults.email = "vivian@0x76.dev";
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
preliminarySelfsigned = true;
|
preliminarySelfsigned = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -70,5 +70,5 @@ in
|
||||||
pinentryFlavor = "curses";
|
pinentryFlavor = "curses";
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.victor = import ./home.nix;
|
home-manager.users.vivian = import ./home.nix;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
users.victor = import ./home;
|
users.vivian = import ./home;
|
||||||
};
|
};
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
|
|
|
@ -25,7 +25,7 @@ in {
|
||||||
settings.allow_anonymous = true;
|
settings.allow_anonymous = true;
|
||||||
acl = [ "topic readwrite #" ];
|
acl = [ "topic readwrite #" ];
|
||||||
users = {
|
users = {
|
||||||
victor = { acl = [ "readwrite #" ]; };
|
vivian = { acl = [ "readwrite #" ]; };
|
||||||
zigbee2mqtt = { acl = [ "readwrite #" ]; };
|
zigbee2mqtt = { acl = [ "readwrite #" ]; };
|
||||||
};
|
};
|
||||||
}];
|
}];
|
||||||
|
|
|
@ -142,7 +142,7 @@ in
|
||||||
security = {
|
security = {
|
||||||
acme = {
|
acme = {
|
||||||
|
|
||||||
defaults.email = "victorheld12@gmail.com";
|
defaults.email = "vivian@0x76.dev";
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
preliminarySelfsigned = true;
|
preliminarySelfsigned = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.victor = import ./home;
|
home-manager.users.vivian = import ./home;
|
||||||
|
|
||||||
# Enable Ozone rendering for Chromium and Electron apps.
|
# Enable Ozone rendering for Chromium and Electron apps.
|
||||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
|
|
@ -51,5 +51,5 @@
|
||||||
tctiEnvironment.enable = true;
|
tctiEnvironment.enable = true;
|
||||||
};
|
};
|
||||||
}; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
|
}; # 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
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ in
|
||||||
# home-manager
|
# home-manager
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
users.victor = import ./home;
|
users.vivian = import ./home;
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = { inherit inputs; };
|
||||||
};
|
};
|
||||||
security = {
|
security = {
|
||||||
|
|
|
@ -23,8 +23,8 @@ in
|
||||||
git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.gitAndTools.gitFull;
|
package = pkgs.gitAndTools.gitFull;
|
||||||
userName = "Victor";
|
userName = "0x76";
|
||||||
userEmail = "victor@xirion.net";
|
userEmail = "v@0x76";
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
# delta.enable = true;
|
# delta.enable = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
|
@ -108,8 +108,8 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
home = {
|
home = {
|
||||||
username = "victor";
|
username = "vivian";
|
||||||
homeDirectory = "/home/victor";
|
homeDirectory = "/home/vivian";
|
||||||
stateVersion = "22.05";
|
stateVersion = "22.05";
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
|
Loading…
Reference in a new issue