4 files changed, 9 insertions, 15 deletions
diff --git a/modules/common.nix b/modules/common.nix
index d6bd141..13ef076 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -130,7 +130,6 @@
     gc.automatic = lib.mkDefault true;
     daemonCPUSchedPolicy = "idle";
     daemonIOSchedPriority = 10;
-    package = pkgs.nixFlakes;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 9f0877f..9dfdadf 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -27,8 +27,6 @@ in {
     location.latitude = 40.0;
     location.longitude = -74.0;
 
-    sound.enable = true;
-
     nix.gc.automatic = true;
     nix.gc.options = "--delete-older-than 30d";
 
@@ -47,10 +45,8 @@ in {
     ];
 
     hardware = {
-      opengl = {
+      graphics = {
         enable = true;
-        driSupport32Bit = true;
-        driSupport = true;
         extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
       };
 
@@ -130,11 +126,11 @@ in {
       ledger
       networkmanagerapplet
       nix-index
-      nixfmt
+      nixfmt-rfc-style
       shfmt
       pavucontrol
       rofi
-      rxvt_unicode-with-plugins
+      rxvt-unicode
       signal-desktop
       sshfs-fuse
       trayer
@@ -153,7 +149,7 @@ in {
       xsel # used by urxvt clipboard
       xss-lock
       dunst
-      transmission-qt
+      transmission_4-qt
       qt5.qtwayland
       libsForQt5.bismuth
       mujmap # email sync -- get this from cargo instead
@@ -191,6 +187,9 @@ in {
       };
       avahi.openFirewall = true;
 
+      displayManager.sddm.enable = true;
+      displayManager.sessionPackages = with pkgs; [ river ];
+
       xserver = {
         enable = true;
         xkb.layout = "us";
@@ -203,9 +202,6 @@ in {
           enableContribAndExtras = true;
           extraPackages = hpkgs: [ hpkgs.xmobar hpkgs.split ];
         };
-
-        displayManager.sddm.enable = true;
-        displayManager.sessionPackages = with pkgs; [ river ];
       };
     };
   };
diff --git a/modules/gaming.nix b/modules/gaming.nix
index 4ec92f0..642978e 100644
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -28,8 +28,7 @@ in {
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
       dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     };
-    hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
-    hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
+    hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
     hardware.steam-hardware.enable = true;
 
     environment.systemPackages = with pkgs; [
diff --git a/modules/yubikey.nix b/modules/yubikey.nix
index bae980d..1ccdab5 100644
--- a/modules/yubikey.nix
+++ b/modules/yubikey.nix
@@ -5,7 +5,7 @@ let
   yubikey-pkgs = with pkgs; [
     ccid
     libu2f-host
-    libusb
+    libusb1
     rng-tools
     yubikey-manager
     yubikey-personalization