From e76bfacc62c9bb2937b960a3a982cf7f1ae7b764 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Fri, 27 Sep 2024 11:28:47 -0400 Subject: [PATCH] sudo-rs, enable mtr, ipv6 --- common/default.nix | 6 ++- common/motd.nix | 5 +- common/users.nix | 114 --------------------------------------------- hosts/stella.nix | 10 +++- 4 files changed, 17 insertions(+), 118 deletions(-) delete mode 100644 common/users.nix diff --git a/common/default.nix b/common/default.nix index 0266fc1..5046b43 100644 --- a/common/default.nix +++ b/common/default.nix @@ -19,8 +19,12 @@ git podman-tui ]; + programs.mtr.enable = true; programs.zsh.enable = true; - security.sudo.wheelNeedsPassword = false; + security.sudo-rs = { + enable = true; + wheelNeedsPassword = false; + }; networking.firewall.enable = false; services.openssh.enable = true; virtualisation.containers.enable = true; diff --git a/common/motd.nix b/common/motd.nix index 3893a35..f91e09d 100644 --- a/common/motd.nix +++ b/common/motd.nix @@ -3,7 +3,8 @@ Welcome to wolfgirl.systems! Join our Matrix chat: #wolfgirlsgen:envs.net Latest news -* Flakes now enabled -* Web hosting now available, contact an admin to enable +* Stella: Flakes now enabled +* Stella: Web hosting now available, contact an admin to enable +* Stella: ipv6 enabled ''; } diff --git a/common/users.nix b/common/users.nix deleted file mode 100644 index 7dfa7c2..0000000 --- a/common/users.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ pkgs, ... }: - -{ - nix.settings.trusted-users = [ "@wheel" ]; - nix.settings.allowed-users = [ "@users" ]; - users.users.ezri = { - uid = 2000; - isNormalUser = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHp8yRnahmUS7l8STsx0pH25O4xTWGYQyQEWeKWxeM7gbkTNPGpiUswmsHgN8Ng0+FwjIw0FHkjQeLSMH9OTSB4= ipad0esp" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJdN4a3yJUlKIaVezOe4hE8fRK9DkGSzwoZ9vfpsBsHh ide0" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICY1V1im0gnXKWdR/H0Q0tajQFQqnDXoNVG3X8/RseI3 lap0" - ]; - }; - users.users.haylin = { - uid = 2001; - isNormalUser = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHavg+rhFmR2p9wuWiO4VxKaIXpq1gOm17jCoZ9jMxvL" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDWQEngBdDZCuRK5DDSah140NECUd+pC/TH9/VgOFnaX" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEfRYvwhwGSd5c3tgvbMhhFT1nFeX4AGDMmOZJ4Humu1" - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMz23eokh1s5CdddEXezfN2O4cFw0IDdKlVVDmC+W6rMelp8cAhVhOFIIK4HvtVUxdwnYOGWwKFbjaD9blBsZgA=" - ]; - }; - users.users.void = { - uid = 2002; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLS+zE1eW9LARG9iIliGGHbJmuY1ulGVOp9dvEfTKyb void@catboy-hackermaid" - ]; - }; - users.users.azriel = { - uid = 2003; - isNormalUser = true; - shell = pkgs.zsh; - homeMode = "755"; - openssh.authorizedKeys.keys = [ - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHp8yRnahmUS7l8STsx0pH25O4xTWGYQyQEWeKWxeM7gbkTNPGpiUswmsHgN8Ng0+FwjIw0FHkjQeLSMH9OTSB4= ipad0esp" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJdN4a3yJUlKIaVezOe4hE8fRK9DkGSzwoZ9vfpsBsHh ide0" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICY1V1im0gnXKWdR/H0Q0tajQFQqnDXoNVG3X8/RseI3 lap0" - ]; - }; - users.users.melody = { - uid = 2004; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIYKXNjND84lbfPp5a27ldHNM3egH2tpcQhI3ie12ZJS melody@tilde.town" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAx1i+1WumVoGP1cjAhjDV6FJYNiwpwyAKM29Dc8ibm9 semibreve-ezricloud" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2uPI6ubwHEBldvB8hRxEMzs/CCK+VcmfLueDxARtoI minim-laptop" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID6evFrnl/d7IVqD941lLZ6zgSyMpjZsqH70Kc+w5bl/ crotchet-steamdeck" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCEZAUryY3xJwL/F7VorplZTcxf2aajGsLz1Bela6YI quaver-tablet" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDE6V1EgGF8pBR9qoYET7PQ3diy+RnlcVDjNVHXduFIE semiquaver-mobile" - ]; - }; - users.users.gabe = { - uid = 2005; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILHEs4BLfJ9vniDJhrqcndDijv6ZIdUreZf2e+vQxGGa gbox" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG8Aa9Q+Wf1YFi0XqG/5OK0RruJL7ItRQKLQtMVUsIIn gtop" - ]; - }; - users.users.james = { - uid = 2006; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH9UrLap0mk8rqCBVBvWFOzgrCSU1xPS3sqfCMtq0f/9" - ]; - }; - users.users.marisa = { - uid = 2007; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANqbfWfsTyTA8/5vHLqsyCSBtzXMl1gNakNsmYp6hJt" - ]; - }; - users.users.spotlight = { - uid = 2008; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQQO+c8ygVzRt55Z9qekqItSjYiw381cFPOqX+vGAGT" - ]; - }; - users.users.mmerlin = { - uid = 2009; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAizK+YrRJ3ynDq682FRQ7gvOxVkqY3hvGMOSgiRqe6p mmerlin@stevens.edu" - ]; - }; - users.users.emi = { - uid = 2010; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMT4AvwSptCu8SJcklx/6F8BgixB2C8Mlx1KXN23fe48" - ]; - }; - users.users.kumi = { - uid = 2011; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJqdPDDRAxZG2YSlvJ98uYQli/Bpus4I2T2JOl9zcI23" - ]; - }; - users.users.kitsu = { - uid = 2012; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBii/5J858CvRPBYjgCB96WKH3E/1z1NA77VOZbIm6YA kitsu_@kitsu-laptop" - ]; - }; -} diff --git a/hosts/stella.nix b/hosts/stella.nix index aa1ed3f..96e2fbc 100644 --- a/hosts/stella.nix +++ b/hosts/stella.nix @@ -27,18 +27,26 @@ networking = { hostName = "stella"; search = ["wolfgirl.systems"]; - nameservers = [ "9.9.9.10" "149.112.112.10" ]; + nameservers = [ "9.9.9.10" "149.112.112.10" "2620:fe::10" "2620:fe::fe:10"]; dhcpcd.enable = false; interfaces = { enp1s0.ipv4.addresses = [{ address = "198.8.59.4"; prefixLength = 27; }]; + enp1s0.ipv6.addresses = [{ + address = "2a0f:85c1:31:e11a::"; + prefixLength = 48; + }]; }; defaultGateway = { address = "198.8.59.1"; interface = "enp1s0"; }; + defaultGateway6 = { + address = "2a0f:85c1:31::"; + interface = "enp1s0"; + }; }; time.timeZone = "America/New_York";