From 2a2d0eb2be4ea6d570ef700d644e79b910166195 Mon Sep 17 00:00:00 2001 From: catvayor Date: Fri, 15 Mar 2024 10:46:02 +0100 Subject: [PATCH] added kat-r86s (not applyied) --- hive.nix | 10 ++ machines/kat-r86s/configuration.nix | 113 +++++++++++++++++++ machines/kat-r86s/hardware-configuration.nix | 40 +++++++ machines/kat-r86s/router.nix | 66 +++++++++++ 4 files changed, 229 insertions(+) create mode 100644 machines/kat-r86s/configuration.nix create mode 100644 machines/kat-r86s/hardware-configuration.nix create mode 100644 machines/kat-r86s/router.nix diff --git a/hive.nix b/hive.nix index e3c05be..105787d 100644 --- a/hive.nix +++ b/hive.nix @@ -21,4 +21,14 @@ in { deployment.allowLocalDeployment = true; networking.hostName = name; }; + kat-r86s = { name, nodes, ... }: { + imports = [ + ./machines/kat-r86s/configuration.nix + users.root + ]; + networking.hostName = name; + users.users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA16foz+XzwKwyIR4wFgNIAE3Y7AfXyEsUZFVVz8Rie catvayor@katvayor" + ]; + }; } diff --git a/machines/kat-r86s/configuration.nix b/machines/kat-r86s/configuration.nix new file mode 100644 index 0000000..2811361 --- /dev/null +++ b/machines/kat-r86s/configuration.nix @@ -0,0 +1,113 @@ +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix +# ./router.nix + ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.supportedFilesystems = [ "bcachefs" ]; + boot.kernelPackages = pkgs.linuxPackages_latest; + + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + time.timeZone = "Europe/Paris"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminus16"; + keyMap = "fr"; + }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + # security.polkit.enable = true; + # programs.light.enable = true; + services.dbus.packages = with pkgs; [ dconf ]; + + nixpkgs.config.allowUnfree = true; + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + programs.zsh.enable = true; + users.users.guest = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + packages = with pkgs; [ + ]; + }; + + environment.systemPackages = with pkgs; [ + wget + brightnessctl + nix-search-cli + git + btop + ranger + dnsmasq + screen + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "23.11"; # Did you read the comment? + +} + diff --git a/machines/kat-r86s/hardware-configuration.nix b/machines/kat-r86s/hardware-configuration.nix new file mode 100644 index 0000000..9b6970a --- /dev/null +++ b/machines/kat-r86s/hardware-configuration.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "UUID=2d6f7d3a-936d-457c-86c7-f49d816ff5b7"; + fsType = "bcachefs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/DD9A-3823"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/machines/kat-r86s/router.nix b/machines/kat-r86s/router.nix new file mode 100644 index 0000000..09aedbe --- /dev/null +++ b/machines/kat-r86s/router.nix @@ -0,0 +1,66 @@ +{config, lib, pkgs, ...}: { + boot.kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = true; + "net.ipv6.conf.all.forwarding" = true; + }; + networking = { + interfaces = { + # wan wifi + wlo1.useDHCP = true; + + # cri + enp1s0.useDHCP = true; + + # HPE + enp2s0 = { + useDHCP = false; + ipv4.addresses = [{ + address = "129.199.156.112"; + prefixLength = 32; + }]; + mtu = 9000; + }; + + # thurne + enp3s0 = { + useDHCP = false; + ipv4.addresses = [{ + address = "192.168.42.1"; + prefixLength = 24; + }]; + mtu = 9000; + }; + }; + + nat = { + enable = true; + extraCommands = '' + iptables -t nat -A POSTROUTING -o wlo1 -j MASQUERADE + iptables -t nat -A POSTROUTING -o enp1s0 -j MASQUERADE + ''; + }; + firewall = { + enable = true; + extraCommands = '' + iptables -A FORWARD -i enp3s0 -o wlo1 -j ACCEPT + iptables -A FORWARD -i wlo1 -o enp3s0 -m state --state RELATED,ESTABLISHED -j ACCEPT + + iptables -A FORWARD -i enp3s0 -o enp1s0 -j ACCEPT + iptables -A FORWARD -i enp1s0 -o enp3s0 -m state --state RELATED,ESTABLISHED -j ACCEPT + + iptables -A FORWARD -i enp2s0 -o enp1s0 -j ACCEPT + iptables -A FORWARD -i enp1s0 -o enp2s0 -j ACCEPT + ''; + }; + }; + services.dnsmasq = { + enable = true; + settings = { + interface = [ "enp2s0" "enp3s0" ]; + bind-dynamic = true; + dhcp-option = "3,0.0.0.0"; + dhcp-range = "192.168.42.2,192.168.42.254,255.255.255.0,12h"; + # dhcp-host = "a8:b1:3b:75:6f:92,129.199.224.96"; + }; + }; +}