Update to 24.11

7 files changed, 36 insertions, 140 deletions

diff --git a/flake.lock b/flake.lock
index 265d5c3..feafed8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,11 +73,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731142757,
-        "narHash": "sha256-Ve//ZdhxtvoQOhHGe1URgFG6rSTB4IWIOZ47e2kCx+8=",
+        "lastModified": 1734196468,
+        "narHash": "sha256-k7jjLR1yRIuWG3+FyETAyYGPea9S6uQUNLJF4clhTeM=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "071670e5bfad91f90647c0961bdc38deee2219fb",
+        "rev": "e621b2624bed4ada7b997845de10537152ba522b",
         "type": "github"
       },
       "original": {
@@ -162,11 +162,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1730962714,
-        "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=",
+        "lastModified": 1734162608,
+        "narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "93b525229c99fec0016db72a174f43b9d6237714",
+        "rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730919458,
-        "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
+        "lastModified": 1733861262,
+        "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
+        "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1733940404,
+        "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
         "type": "github"
       },
       "original": {
@@ -255,27 +255,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1730883749,
-        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
+        "lastModified": 1733808091,
+        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
+        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1733940404,
+        "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1729665710,
-        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
+        "lastModified": 1733392399,
+        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
+        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
         "type": "github"
       },
       "original": {
@@ -319,16 +319,16 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1730963269,
-        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
+        "lastModified": 1733808091,
+        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
+        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 4b5b63e..d77c1dc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
     extra-trusted-public-keys = "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
   };
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
   inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   inputs.emacs-overlay.url = "github:nix-community/emacs-overlay";
diff --git a/machines/dex.nix b/machines/dex.nix
deleted file mode 100644
index db2928c..0000000
--- a/machines/dex.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-with lib;
-
-{
-  orbekk.simple-firewall.enable = lib.mkForce false;
-  networking.firewall.enable = true;
-  orbekk.gaming.enable = true;
-  orbekk.desktop.enable = true;
-  orbekk.development.enable = true;
-  services.printing.enable = true;
-  services.printing.drivers = with pkgs; [ gutenprint brlaser ];
-  services.openssh.enable = true;
-
-  networking.firewall.allowedTCPPorts = [3979];
-  networking.firewall.allowedUDPPorts = [3979];
-
-  services.logind.extraConfig = ''
-    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";
-  programs.xwayland.enable = true;
-  programs.dconf.enable = true;
-  environment.systemPackages = with pkgs; [ river ];
-  system.autoUpgrade.enable = mkForce false;
-
-  security.pam.enableFscrypt = true;
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = false;
-
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  system.stateVersion = "23.05";
-
-  # hardware-configuration
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/41d480f8-52e9-40d5-bd12-a3aa48ccf1b5";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7DFD-854D";
-      fsType = "vfat";
-    };
-
-  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";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
-
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