From 03377050f618ee6937e8cbf9cce0071e34227157 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 15 May 2024 22:36:15 -0400 Subject: [PATCH] feat(machines): add terra --- flake.nix | 26 ++++++++ machines/terra/configuration.nix | 74 +++++++++++++++++++++++ machines/terra/hardware-configuration.nix | 50 +++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 machines/terra/configuration.nix create mode 100644 machines/terra/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index fc77bf1..ee91c03 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,32 @@ specialArgs = {inherit inputs;}; }; + terra = nixpkgs.lib.nixosSystem { + system = utils.lib.system.x86_64-linux; + modules = + defaultModules + ++ [ + ./modules/common.nix + ./modules/hyprland.nix + ./modules/containers.nix + ./modules/applications/steam + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.michael = import ./user/environments/nixos/home.nix; + } + + ./machines/terra/configuration.nix + agenix.nixosModules.default + { + environment.systemPackages = [ + agenix.packages.x86_64-linux.default + ]; + } + ]; + specialArgs = {inherit inputs;}; + }; + oracle = nixpkgs.lib.nixosSystem { system = utils.lib.system.x86_64-linux; modules = diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix new file mode 100644 index 0000000..c4f853c --- /dev/null +++ b/machines/terra/configuration.nix @@ -0,0 +1,74 @@ +{ + config, + pkgs, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + networking.hostName = "terra"; # Define your hostname. + networking.nameservers = ["1.1.1.1" "8.8.8.8"]; + networking.firewall = { + enable = true; + }; + networking.networkmanager.enable=true; + + # Set your time zone. + time.timeZone = "America/New_York"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "no"; + PasswordAuthentication = false; + AllowUsers = ["michael"]; + }; + }; + + programs.zsh.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.michael = { + isNormalUser = true; + description = "Michael Thomas"; + extraGroups = ["wheel" "docker" "podman" "adbusers" "dialout"]; + shell = pkgs.zsh; + openssh.authorizedKeys.keys = [ + # Neptune + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDUYHiTel+RDzygCeNwV25cnBBNioM19EQWqxPC+xq7lNlNcAQ4wi9JIOONVGkshxPXzKZyR3F53Igs9JZr1E9088L52eUp35JhW1pthai82cw1jGkj9wxcKJnU6b7QNDKA+ejPTC/ciFFKytMyPgID0ICzBRQsnj15i4lGvGDgfTQ7qfI2J855H7S7qOpY7cbsGfeoz3f8Ye1FspJFDsNu9QhX05iunBcbni0uLoTtgS5cEBRr7H9RkKR7GCfd4Ae/sp+aeDkLU4aBkEi+A8VLfR74Juia1j/3mAAmkgJKGcBCKUv0ixBGd6XclZmkF8f2Hx0z8mDxJ7U8lsDUSKdvxK7fecsM4F/GTvjrUxV1nLD4SRQ06GtBmGQGDzIn3Nm1URd6gGT9W3486XJsqmGzjuHa5o4WhmBgh/Gs8xUcv7kWD5enrYacBr+HKVJWnnLFp+XfAYaMCT6j/4jc4D9/9hijRbhboICTDxWCWtFgz7QpsO6BQpi/wkR4Ql61vPc= michael@neptune" + # Oracle + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPc/HYsbpVsyoU2n0EiqQ4+3aSiFPtddjPCGK187W24f michael@oracle" + ]; + }; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.11"; # Did you read the comment? +} diff --git a/machines/terra/hardware-configuration.nix b/machines/terra/hardware-configuration.nix new file mode 100644 index 0000000..9563486 --- /dev/null +++ b/machines/terra/hardware-configuration.nix @@ -0,0 +1,50 @@ +# 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 = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = ["amdgpu"]; + boot.kernelModules = ["kvm-amd"]; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_8; + boot.extraModulePackages = []; + + hardware.opengl.driSupport = true; + hardware.opengl.driSupport32Bit = true; + services.xserver.videoDrivers = ["nvidia"]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/fa11ad2d-97d9-4e87-8fe9-f2cae0d9894e"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/2FCC-48ED"; + fsType = "vfat"; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/b378f2ec-0bbb-4896-92b5-ef08c707555d";} + ]; + + # 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.enp8s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp9s0u4u4.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}