From 877b34578ee7bb7f9507d6e525f6bb0fbc936feb Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Tue, 2 Nov 2021 23:59:40 -0400 Subject: [PATCH] add nat --- common/boot/bios.nix | 2 -- common/boot/efi.nix | 2 -- flake.lock | 12 ++++++------ flake.nix | 1 + machines/liza/configuration.nix | 1 + machines/mitty/configuration.nix | 1 + machines/nat/configuration.nix | 19 +++++++++++++++++++ machines/nat/hardware-configuration.nix | 25 +++++++++++++++++++++++++ machines/neet.dev/configuration.nix | 1 + machines/ray/configuration.nix | 1 + machines/reg/configuration.nix | 1 + 11 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 machines/nat/configuration.nix create mode 100644 machines/nat/hardware-configuration.nix diff --git a/common/boot/bios.nix b/common/boot/bios.nix index b929d73..2b3670a 100644 --- a/common/boot/bios.nix +++ b/common/boot/bios.nix @@ -12,8 +12,6 @@ in { }; config = mkIf cfg.enable { - # Enable microcode - firmware.x86_64.enable = true; # Use GRUB 2 for BIOS boot.loader = { timeout = 2; diff --git a/common/boot/efi.nix b/common/boot/efi.nix index bfcac09..60fd64b 100644 --- a/common/boot/efi.nix +++ b/common/boot/efi.nix @@ -9,8 +9,6 @@ in { }; config = mkIf cfg.enable { - # Enable microcode - firmware.x86_64.enable = true; # Use GRUB2 for EFI boot.loader = { efi.canTouchEfiVariables = true; diff --git a/flake.lock b/flake.lock index f9fa79e..302ae2c 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1631896269, - "narHash": "sha256-DAyCxJ8JacayOzGgGSfzrn7ghtsfL/EsCyk1NEUaAR8=", + "lastModified": 1634404028, + "narHash": "sha256-JyP2Y6JCCYvUcVz7CXX5pXUfTGTU4GX51Yza82BgMfk=", "owner": "ryantm", "repo": "agenix", - "rev": "daf1d773989ac5d949aeef03fce0fe27e583dbca", + "rev": "53aa91b4170da35a96fab1577c9a34bc0da44e27", "type": "github" }, "original": { @@ -114,11 +114,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1633083543, - "narHash": "sha256-thXKms0SvDirYb8/Hw0zqAE1TsuSFWd0y51mSzkPGLU=", + "lastModified": 1635806954, + "narHash": "sha256-yX/zjbIL/HdXh8a92hWJ+31gsLLv7byA1XRuPARaLro=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "92609f3d9bc3acffbdbe54fa1c591a885612aa73", + "rev": "372e59d2af704bffd133cbe029f1d5efe73ba6fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2949f09..1bc80a0 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,7 @@ { "reg" = mkSystem "x86_64-linux" nixpkgs ./machines/reg/configuration.nix; "ray" = mkSystem "x86_64-linux" nixpkgs ./machines/ray/configuration.nix; + "nat" = mkSystem "aarch64-linux" nixpkgs ./machines/nat/configuration.nix; "mitty" = mkSystem "x86_64-linux" nixpkgs ./machines/mitty/configuration.nix; "neetdev" = mkSystem "x86_64-linux" nixpkgs ./machines/neet.dev/configuration.nix; "liza" = mkSystem "x86_64-linux" nixpkgs-peertube ./machines/liza/configuration.nix; diff --git a/machines/liza/configuration.nix b/machines/liza/configuration.nix index 9214a38..fa5622b 100644 --- a/machines/liza/configuration.nix +++ b/machines/liza/configuration.nix @@ -20,6 +20,7 @@ in { nix.flakes.enable = true; + firmware.x86_64.enable = true; bios = { enable = true; device = "/dev/sda"; diff --git a/machines/mitty/configuration.nix b/machines/mitty/configuration.nix index ab947da..bade029 100644 --- a/machines/mitty/configuration.nix +++ b/machines/mitty/configuration.nix @@ -9,6 +9,7 @@ nix.flakes.enable = true; + firmware.x86_64.enable = true; bios = { enable = true; device = "/dev/vda"; diff --git a/machines/nat/configuration.nix b/machines/nat/configuration.nix new file mode 100644 index 0000000..5ef6006 --- /dev/null +++ b/machines/nat/configuration.nix @@ -0,0 +1,19 @@ +{ config, pkgs, fetchurl, lib, ... }: + +{ + imports = [ + ./hardware-configuration.nix + ]; + + nix.flakes.enable = true; + + efi.enable = true; + + networking.hostName = "nat"; + networking.interfaces.ens160.useDHCP = true; + + services.zerotierone.enable = true; + + de.enable = true; + de.touchpad.enable = true; +} diff --git a/machines/nat/hardware-configuration.nix b/machines/nat/hardware-configuration.nix new file mode 100644 index 0000000..827a083 --- /dev/null +++ b/machines/nat/hardware-configuration.nix @@ -0,0 +1,25 @@ +# 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 = [ ]; + + boot.initrd.availableKernelModules = [ "uhci_hcd" "ahci" "nvme" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/02a8c0c7-fd4e-4443-a83c-2d0b63848779"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0C95-1290"; + fsType = "vfat"; + }; + + swapDevices = [ ]; +} \ No newline at end of file diff --git a/machines/neet.dev/configuration.nix b/machines/neet.dev/configuration.nix index b4f38c3..854a3c5 100644 --- a/machines/neet.dev/configuration.nix +++ b/machines/neet.dev/configuration.nix @@ -9,6 +9,7 @@ nix.flakes.enable = true; + firmware.x86_64.enable = true; bios = { enable = true; device = "/dev/sda"; diff --git a/machines/ray/configuration.nix b/machines/ray/configuration.nix index 7c8a9bf..a5e4613 100644 --- a/machines/ray/configuration.nix +++ b/machines/ray/configuration.nix @@ -7,6 +7,7 @@ nix.flakes.enable = true; + firmware.x86_64.enable = true; efi.enable = true; boot.initrd.luks.devices."enc-pv" = { diff --git a/machines/reg/configuration.nix b/machines/reg/configuration.nix index 726255a..d8a4700 100644 --- a/machines/reg/configuration.nix +++ b/machines/reg/configuration.nix @@ -11,6 +11,7 @@ nix.flakes.enable = true; + firmware.x86_64.enable = true; efi.enable = true; luks = {