From 7bd8d5b244507a69bd46f0dfca4b2beb6844f523 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Sat, 21 Oct 2023 00:39:51 -0400 Subject: [PATCH] added hardware configurations for JWST --- .gitattributes | 1 + hosts/JWST/configuration.nix | 113 ++++++++++++++++++++++++++ hosts/JWST/hardware-configuration.nix | 45 ++++++++++ hosts/JWST/river.nix | 3 + 4 files changed, 162 insertions(+) create mode 100644 hosts/JWST/configuration.nix create mode 100644 hosts/JWST/hardware-configuration.nix create mode 100644 hosts/JWST/river.nix diff --git a/.gitattributes b/.gitattributes index deddd4f..fa5b42b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ # secretfile filter=git-crypt diff=git-crypt # *.key filter=git-crypt diff=git-crypt +hosts/JWST/secrets/** filter=git-crypt diff=git-crypt secrets/** filter=git-crypt diff=git-crypt diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix new file mode 100644 index 0000000..5fc8f34 --- /dev/null +++ b/hosts/JWST/configuration.nix @@ -0,0 +1,113 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). +{ + # config, + # lib, + pkgs, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ./river.nix + # ./secrets + ]; + + boot.loader = { + efi.canTouchEfiVariables = true; + efi.efiSysMountPoint = "/boot/efi"; + grub = { + efiSupport = true; + device = "nodev"; + extraEntriesBeforeNixOS = true; # still primarily using void + extraEntries = '' + menuentry "Void" { + search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f + configfile "($void)/boot/grub/grub.cfg" + } + ''; + }; + }; + + nix.settings.experimental-features = ["nix-command" "flakes"]; + + networking.hostName = "JWST"; + networking.networkmanager.enable = true; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminus16"; + keyMap = "us"; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound. + sound.enable = true; + services.pipewire.enable = true; + + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-wlr + # xdg-desktop-portal-gtk + ]; + }; + + hardware.opengl = { + enable = true; + extraPackages = with pkgs; [ + intel-compute-runtime + ]; + }; + + hardware.opentabletdriver.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.tacocat = { + isNormalUser = true; + extraGroups = ["wheel" "networkmanager" "audio" "video" "bluetooth" "kvm"]; + home = "/home/tacocat"; + description = "Aria Nolan"; + packages = with pkgs; [ + kitty + ]; + }; + + environment = { + systemPackages = with pkgs; [ + vim + wget + ]; + defaultPackages = with pkgs; [ + perl + rsync + strace + ]; + }; + + # 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; + # }; + + # 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 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/hosts/JWST/hardware-configuration.nix b/hosts/JWST/hardware-configuration.nix new file mode 100644 index 0000000..f29d999 --- /dev/null +++ b/hosts/JWST/hardware-configuration.nix @@ -0,0 +1,45 @@ +# 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" "thunderbolt" "nvme" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/488c7ef3-5ea1-4a16-a5f9-e241901c24ce"; + fsType = "ext4"; + }; + + fileSystems."/mnt/void" = + { device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f"; + fsType = "ext4"; + }; + + fileSystems."/mnt/secondary" = + { device = "/dev/disk/by-uuid/3b424592-6b20-42e0-9d28-8bf562c15913"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; } + ]; + + # 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.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/JWST/river.nix b/hosts/JWST/river.nix new file mode 100644 index 0000000..572a9e7 --- /dev/null +++ b/hosts/JWST/river.nix @@ -0,0 +1,3 @@ +{ + programs.river.enable = true; +}