formatting

2024-02-28 21:49:51 -06:00
parent bdfd5e92b7
commit 347d30094b
40 changed files with 459 additions and 503 deletions
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -5,31 +5,29 @@
 { config, lib, pkgs, ... }:
 let
  user = "matt";
-  password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
+  password =
+    "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
  hostname = "matt-nixos";
  # discover-wrapper is needed as of 1/24/24 since PackageKit does not work correctly so this removes error messages.
-  discover-wrapped = pkgs.symlinkJoin
-    {
-      name = "discover-flatpak-backend";
-      paths = [ pkgs.libsForQt5.discover ];
-      buildInputs = [ pkgs.makeWrapper ];
-      postBuild = ''
-        wrapProgram $out/bin/plasma-discover --add-flags "--backends flatpak"
-      '';
-    };
-in
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      # ../../cachix/cachix.nix
-      ../default.nix
-    ];
+  discover-wrapped = pkgs.symlinkJoin {
+    name = "discover-flatpak-backend";
+    paths = [ pkgs.libsForQt5.discover ];
+    buildInputs = [ pkgs.makeWrapper ];
+    postBuild = ''
+      wrapProgram $out/bin/plasma-discover --add-flags "--backends flatpak"
+    '';
+  };
+in {
+  imports = [ # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    # ../../cachix/cachix.nix
+    ../default.nix
+  ];

  share.hardware.amd = {
    enable = true;
    corectrl.enable = true;
-    corectrl.enablePolkit = true; 
+    corectrl.enablePolkit = true;
  };

  # Configure bootloader with lanzaboot and secureboot
@@ -55,13 +53,11 @@ in
      };
      configurationLimit = 2;
    };
-    
+
    # Override kernel to latest
    kernelPackages = pkgs.linuxPackages_latest;

-    kernelParams = [
-      "quiet"
-    ];
+    kernelParams = [ "quiet" ];

    consoleLogLevel = 3;
    bootspec.enable = true;
@@ -77,7 +73,7 @@ in

    # Steam udev rules for remote play
    steam-hardware.enable = true;
-    
+
    # opengl.enable = true;
    # # Enables support for 32bit libs that steam uses
    # opengl.driSupport32Bit = true; 
@@ -88,7 +84,7 @@ in
    # Enable the X11 windowing system.
    xserver = {
      enable = true;
-    
+
      # Enable the Plasma 6 Desktop Environment.
      displayManager = {
        sddm.enable = true;
@@ -147,10 +143,8 @@ in
  };

  # Time config
-  time = {
-    hardwareClockInLocalTime = true;
-  };
-  
+  time = { hardwareClockInLocalTime = true; };
+
  # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];

@@ -218,8 +212,10 @@ in
    # Steam
    steam = {
      enable = true;
-      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-      dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+      remotePlay.openFirewall =
+        true; # Open ports in the firewall for Steam Remote Play
+      dedicatedServer.openFirewall =
+        true; # Open ports in the firewall for Source Dedicated Server
    };
  };

@@ -236,18 +232,19 @@ in

      packageOverrides = pkgs: {
        steam = pkgs.steam.override {
-          extraPkgs = pkgs: with pkgs; [
-            xorg.libXcursor
-            xorg.libXi
-            xorg.libXinerama
-            xorg.libXScrnSaver
-            libpng
-            libpulseaudio
-            libvorbis
-            stdenv.cc.cc.lib
-            libkrb5
-            keyutils
-          ];
+          extraPkgs = pkgs:
+            with pkgs; [
+              xorg.libXcursor
+              xorg.libXi
+              xorg.libXinerama
+              xorg.libXScrnSaver
+              libpng
+              libpulseaudio
+              libvorbis
+              stdenv.cc.cc.lib
+              libkrb5
+              keyutils
+            ];
        };
      };
    };
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -4,67 +4,65 @@
 { config, lib, pkgs, modulesPath, ... }:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "nvme" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-amd" ];
  boot.extraModulePackages = [ ];

-  fileSystems."/" =
-    { device = "none";
-      fsType = "tmpfs";
-    };
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+  };

-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
-      fsType = "btrfs";
-      options = [ "subvol=nix" "compress=zstd" "noatime" ];
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
+    fsType = "btrfs";
+    options = [ "subvol=nix" "compress=zstd" "noatime" ];
+  };

-  fileSystems."/etc" =
-    { device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
-      fsType = "btrfs";
-      options = [ "subvol=etc" "compress=zstd" "noatime" ];
-    };
+  fileSystems."/etc" = {
+    device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
+    fsType = "btrfs";
+    options = [ "subvol=etc" "compress=zstd" "noatime" ];
+  };

-  fileSystems."/root" =
-    { device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
-      fsType = "btrfs";
-      options = [ "subvol=root" "compress=zstd" "noatime" ];
-    };
+  fileSystems."/root" = {
+    device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
+    fsType = "btrfs";
+    options = [ "subvol=root" "compress=zstd" "noatime" ];
+  };

-  fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
-      fsType = "btrfs";
-      options = [ "subvol=log" "compress=zstd" "noatime" ];
-    };
+  fileSystems."/var/log" = {
+    device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
+    fsType = "btrfs";
+    options = [ "subvol=log" "compress=zstd" "noatime" ];
+  };

-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
-      fsType = "btrfs";
-      options = [ "subvol=home" "compress=zstd" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d";
+    fsType = "btrfs";
+    options = [ "subvol=home" "compress=zstd" ];
+  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1058-F967";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/1058-F967";
+    fsType = "vfat";
+  };

  swapDevices =
-    [ { device = "/dev/disk/by-uuid/1db92c49-aa8d-4ca2-b453-83bfcd1d36dd"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/1db92c49-aa8d-4ca2-b453-83bfcd1d36dd"; }];

-  fileSystems."/home/matt/Games" =
-    { device = "/dev/disk/by-uuid/1adb3161-ef9e-45d9-be5f-dd718186f1b3";
-      fsType = "ext4";
-    };
-  fileSystems."/home/matt/1TB" =
-    { device = "/dev/disk/by-uuid/7f9c2d1e-64ee-d901-2084-2d1e64eed901";
-      fsType = "ext4";
-    };
+  fileSystems."/home/matt/Games" = {
+    device = "/dev/disk/by-uuid/1adb3161-ef9e-45d9-be5f-dd718186f1b3";
+    fsType = "ext4";
+  };
+  fileSystems."/home/matt/1TB" = {
+    device = "/dev/disk/by-uuid/7f9c2d1e-64ee-d901-2084-2d1e64eed901";
+    fsType = "ext4";
+  };

  # 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
@@ -75,5 +73,6 @@
  # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,8 +1,14 @@
-{ pkgs, ... }: 
+{ pkgs, ... }:
 let
-  vulkan-hdr-layer = import ./vulkan-hdr-layer.nix { inherit (pkgs) lib stdenv fetchFromGitHub meson pkg-config vulkan-loader ninja writeText vulkan-headers vulkan-utility-libraries jq wayland; libX11 = pkgs.xorg.libX11; libXrandr = pkgs.xorg.libXrandr; libxcb = pkgs.xorg.libxcb; };
-in 
-{
+  vulkan-hdr-layer = import ./vulkan-hdr-layer.nix {
+    inherit (pkgs)
+      lib stdenv fetchFromGitHub meson pkg-config vulkan-loader ninja writeText
+      vulkan-headers vulkan-utility-libraries jq wayland;
+    libX11 = pkgs.xorg.libX11;
+    libXrandr = pkgs.xorg.libXrandr;
+    libxcb = pkgs.xorg.libxcb;
+  };
+in {

  home.username = "matt";
  home.homeDirectory = "/home/matt";
@@ -30,7 +36,7 @@ in

  programs.command-not-found.enable = true;

-  home.packages = with pkgs;  [
+  home.packages = with pkgs; [
    firefox
    tree
    lm_sensors
@@ -46,6 +52,8 @@ in
    python3
    virt-manager
    orca-slicer
+    nixfmt
+    deadnix
    # Other packages
    vulkan-hdr-layer
  ];
--- a/hosts/desktop/vulkan-hdr-layer.nix
+++ b/hosts/desktop/vulkan-hdr-layer.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja, writeText, vulkan-headers, vulkan-utility-libraries,  jq, libX11, libXrandr, libxcb, wayland }:
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja
+, writeText, vulkan-headers, vulkan-utility-libraries, jq, libX11, libXrandr
+, libxcb, wayland }:

 stdenv.mkDerivation rec {
  pname = "vulkan-hdr-layer";
@@ -18,7 +20,15 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ vulkan-headers meson ninja pkg-config jq ];

-  buildInputs = [ vulkan-headers vulkan-loader vulkan-utility-libraries libX11 libXrandr libxcb wayland ];
+  buildInputs = [
+    vulkan-headers
+    vulkan-loader
+    vulkan-utility-libraries
+    libX11
+    libXrandr
+    libxcb
+    wayland
+  ];

  # Help vulkan-loader find the validation layers
  setupHook = writeText "setup-hook" ''
@@ -31,4 +41,4 @@ stdenv.mkDerivation rec {
    platforms = platforms.linux;
    license = licenses.mit;
  };
-}
+}