From 0c7bf6e5465d6b58dfdbdf00867cac99e40ed968 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Sat, 23 Sep 2023 14:07:05 -0400
Subject: Update

---
 machines/dex.nix | 69 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 24 deletions(-)

(limited to 'machines')

diff --git a/machines/dex.nix b/machines/dex.nix
index b06d450..db2928c 100644
--- a/machines/dex.nix
+++ b/machines/dex.nix
@@ -19,6 +19,35 @@ with lib;
     HandlePowerKey=suspend
   '';
 
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  services.xserver.displayManager.sddm.enable = lib.mkForce false;  # Cannot use with jovian
+
+  # Steam setup
+  jovian.steam.autoStart = true;
+  jovian.steam.desktopSession = "river";
+  jovian.steam.enable = true;
+  jovian.steam.user = "orbekk";
+  jovian.devices.steamdeck.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
   nix.gc.persistent = false;
   networking.networkmanager.enable = true;
   networking.hostName = "dex";
@@ -29,49 +58,41 @@ with lib;
 
   security.pam.enableFscrypt = true;
 
-  system.activationScripts.fix = ''
-    chown root /
-  '';
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = false;
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sdhci" "sdhci_pci" "cqhci" "mmc_block" ];
-  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
-  boot.kernelPackages = pkgs.unstable.linuxPackages_latest;
-  boot.kernelParams = [
-    "amd_iommu=off"
-    "amdgpu.gttsize=8128"
-    "spi_amd.speed_dev=1"
-    "audit=0"
-  ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/52d3077e-d1be-4976-a2ca-f2d879a808c1";
-      fsType = "ext4";
-    };
+  system.stateVersion = "23.05";
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-label/home";
+  # hardware-configuration
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/41d480f8-52e9-40d5-bd12-a3aa48ccf1b5";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/D381-BD0D";
+    { device = "/dev/disk/by-uuid/7DFD-854D";
       fsType = "vfat";
     };
 
-  swapDevices = [ ];
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/10757668-8f17-4677-b405-f1d1095a81ac"; }
+    ];
 
+  # 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.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  system.stateVersion = "23.05"; # Did you read the comment?
 }
 
-- 
cgit v1.2.3