From 480a809216069ec43e8270f33421b53c78fa9b22 Mon Sep 17 00:00:00 2001 From: Phoenix/HotaruBlaze Date: Sun, 31 May 2026 11:03:24 +0100 Subject: [PATCH] bump --- hosts/blade/default.nix | 30 ++---------------------------- hosts/blade/networking.nix | 7 +++++++ hosts/blade/users.nix | 19 +++++++++++++++++++ modules/common/networking.nix | 10 +++------- 4 files changed, 31 insertions(+), 35 deletions(-) create mode 100644 hosts/blade/networking.nix create mode 100644 hosts/blade/users.nix diff --git a/hosts/blade/default.nix b/hosts/blade/default.nix index 217699e..2b122ec 100644 --- a/hosts/blade/default.nix +++ b/hosts/blade/default.nix @@ -22,33 +22,7 @@ imports = [ ./hardware-configuration.nix ../../modules/common.nix + ./networking.nix + ./users.nix ]; - - networking.interfaces.eth0.useDHCP = true; - networking.hostName = "blade"; - - users.users.phoenix = { - extraGroups = [ "wheel" "networkmanager" ]; - home = "/home/phoenix"; - packages = with pkgs; [ - vim - tree - lego - ]; - openssh.authorizedKeys.keys = [ - "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBMPNyAyMrqlI3tUI39TqcgYBciIC+aY2UNAunFqylhhzTVA14rluMjFqHf9HKs9SHZ52nLEV58/BxlnMeMtRc+cAAAAEc3NoOg== phoenix@DESKTOP-1A9MAJO" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMoM3FANeYtWLJIiTL+nU0XzZft2psiSgbCmNfQZBXgy nixos@nixos" - ]; - }; - - users.users.deploy = { - extraGroups = [ "wheel" "networkmanager" ]; - home = "/home/deploy"; - openssh.authorizedKeys.keys = [ - "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBMPNyAyMrqlI3tUI39TqcgYBciIC+aY2UNAunFqylhhzTVA14rluMjFqHf9HKs9SHZ52nLEV58/BxlnMeMtRc+cAAAAEc3NoOg== phoenix@DESKTOP-1A9MAJO" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMoM3FANeYtWLJIiTL+nU0XzZft2psiSgbCmNfQZBXgy nixos@nixos" - ]; - }; - - networking.firewall.allowedTCPPorts = [ 22 80 443 ]; } diff --git a/hosts/blade/networking.nix b/hosts/blade/networking.nix new file mode 100644 index 0000000..3cc1d15 --- /dev/null +++ b/hosts/blade/networking.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + networking.interfaces.eth0.useDHCP = true; + networking.hostName = "blade"; + networking.firewall.allowedTCPPorts = [ 22 80 443 ]; +} diff --git a/hosts/blade/users.nix b/hosts/blade/users.nix new file mode 100644 index 0000000..26ecb8c --- /dev/null +++ b/hosts/blade/users.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +{ + users.users.phoenix.packages = with pkgs; [ + vim + tree + lego + ]; + + users.users.phoenix.openssh.authorizedKeys.keys = [ + "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBMPNyAyMrqlI3tUI39TqcgYBciIC+aY2UNAunFqylhhzTVA14rluMjFqHf9HKs9SHZ52nLEV58/BxlnMeMtRc+cAAAAEc3NoOg== phoenix@DESKTOP-1A9MAJO" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMoM3FANeYtWLJIiTL+nU0XzZft2psiSgbCmNfQZBXgy nixos@nixos" + ]; + + users.users.deploy.openssh.authorizedKeys.keys = [ + "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBMPNyAyMrqlI3tUI39TqcgYBciIC+aY2UNAunFqylhhzTVA14rluMjFqHf9HKs9SHZ52nLEV58/BxlnMeMtRc+cAAAAEc3NoOg== phoenix@DESKTOP-1A9MAJO" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMoM3FANeYtWLJIiTL+nU0XzZft2psiSgbCmNfQZBXgy nixos@nixos" + ]; +} diff --git a/modules/common/networking.nix b/modules/common/networking.nix index 18d166d..380403c 100644 --- a/modules/common/networking.nix +++ b/modules/common/networking.nix @@ -5,11 +5,7 @@ i18n.defaultLocale = "en_US.UTF-8"; console.keyMap = "uk"; - networking = { - firewall.enable = true; - firewall.allowedTCPPorts = [ 22 ]; # SSH - hostName = config.networking.hostName or "nixos"; - useDHCP = false; - usePredictableInterfaceNames = false; - }; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [ 22 ]; # SSH + networking.usePredictableInterfaceNames = false; }