Queen is broken but this might update bcachefs and fix those headaches

nixos/desktop/default.nix

@@ -6,6 +6,7 @@
   lib,
   config,
   pkgs,
+  pkgs-edge,
   ...
 }: {
   imports = [
@@ -17,15 +18,7 @@
     # You can add overlays here
     overlays = [
       (final: prev: {
-        bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs.overrideAttrs (oldAttrs: {
-          patches = [
-            (pkgs.fetchpatch {
-              # FIXME: remove when https://github.com/koverstreet/bcachefs-tools/pull/263 is merged
-              url = "https://github.com/koverstreet/bcachefs-tools/pull/263.patch";
-              hash = "sha256-M5FhW5ZWQdfXbLzb/Rr+rNtLLPRIdlOBnxQzDpnoyyw=";
-            })
-          ];
-        });
+        bcachefs-tools = pkgs-edge.bcachefs-tools;
       })
       # Add overlays your own flake exports (from overlays and pkgs dir):
       outputs.overlays.additions
@@ -42,58 +35,63 @@
   programs.nix-index.enable = true;
   programs.nix-index-database.comma.enable = true;
 
-  environment.systemPackages = with pkgs; [
-    # Custom tools
-    dvd
-    dvt
-    servo
-    restart
+  environment.systemPackages =
+    (with pkgs; [
+      # Custom tools
+      dvd
+      dvt
+      servo
+      restart
 
-    # System tools
-    aha
-    bcachefs-tools
-    clinfo
-    comma
-    direnv
-    git-filter-repo
-    gnupg
-    pciutils
-    podman
-    podman-compose
-    sbctl
-    tpm2-tools
-    tpm2-tss
-    virtualgl
-    vulkan-tools
-    waydroid
-    waypipe
-    wayland-utils
-    xwaylandvideobridge
-    yubikey-personalization
-    zsh
+      # System tools
+      aha
+      bcachefs-tools
+      clinfo
+      comma
+      direnv
+      git-filter-repo
+      gnupg
+      pciutils
+      podman
+      podman-compose
+      sbctl
+      tpm2-tools
+      tpm2-tss
+      virtualgl
+      vulkan-tools
+      waydroid
+      waypipe
+      wayland-utils
+      xwaylandvideobridge
+      yubikey-personalization
+      zsh
 
-    # KDE/QT
-    krunner-translator
-    kdePackages.discover
-    kdePackages.kcalc
-    kdePackages.kdepim-addons
-    kdePackages.kirigami
-    kdePackages.kdeconnect-kde
-    # kdePackages.krunner-ssh
-    # kdePackages.krunner-symbols
-    kdePackages.packagekit-qt
-    kdePackages.plasma-pa
-    kdePackages.sddm-kcm
-    kdePackages.dolphin-plugins
-    libportal-qt5
-    libportal
+      # KDE/QT
+      krunner-translator
+      kdePackages.discover
+      kdePackages.kcalc
+      kdePackages.kdepim-addons
+      kdePackages.kirigami
+      kdePackages.kdeconnect-kde
+      # kdePackages.krunner-ssh
+      # kdePackages.krunner-symbols
+      kdePackages.packagekit-qt
+      kdePackages.plasma-pa
+      kdePackages.sddm-kcm
+      kdePackages.dolphin-plugins
+      libportal-qt5
+      libportal
 
-    # User tools
-    noisetorch
-    qjackctl
-    wireplumber
-    rustdesk
-  ];
+      # User tools
+      noisetorch
+      qjackctl
+      wireplumber
+      rustdesk
+    ])
+    ++ (with pkgs-edge; [
+      # list of latest packages from nixpkgs master
+      # Can be used to install latest version of some packages
+    ]);
 
   programs.direnv = {
     enable = true;
@@ -108,7 +106,7 @@
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     extest.enable = true;
   };
-  hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
+  hardware.graphics.enable32Bit = true; # Enables support for 32bit libs that steam uses
 
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";

nixos/hosts/GLaDOS/configuration.nix

@@ -38,11 +38,11 @@
   services.xserver.videoDrivers = ["amdgpu"];
 
   # Add vulkan support to GPU
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.extraPackages = with pkgs; [
     amdvlk
   ];
   # For 32 bit applications
-  hardware.opengl.extraPackages32 = with pkgs; [
+  hardware.graphics.extraPackages32 = with pkgs; [
     driversi686Linux.amdvlk
   ];
 

nixos/hosts/queen/configuration.nix

@@ -75,8 +75,8 @@
     onlyoffice-documentserver
     phanpy
     postgresql_16
-    python3
-    python311Packages.nbconvert
+    python310
+    python310Packages.nbconvert
     jupyter
     rabbitmq-server
     roundcube

nixos/shared/default.nix

@@ -4,6 +4,7 @@
   lib,
   config,
   pkgs,
+  pkgs-edge,
   ...
 }: {
   imports = [

nixos/shared/packages/default.nix

@@ -4,6 +4,7 @@
   lib,
   config,
   pkgs,
+  pkgs-edge,
   ...
 }: {
   nixpkgs = {
@@ -15,34 +16,40 @@
     ];
   };
 
-  environment.systemPackages = with pkgs; [
-    # Custom tools
-    rebuild
-    rebuild-no-inhibit
-    install-nix
-    update
-    upgrade
-    simple-completion-language-server
+  environment.systemPackages =
+    (with pkgs; [
+      # Custom tools
+      rebuild
+      rebuild-no-inhibit
+      install-nix
+      update
+      upgrade
+      simple-completion-language-server
 
-    # System tools
-    age
-    alejandra
-    e2fsprogs
-    git
-    git-filter-repo
-    helix
-    home-manager
-    htop
-    killall
-    oh-my-zsh
-    rsync
-    tre-command
-    wget
-    zsh
-    tldr
+      # System tools
+      age
+      alejandra
+      e2fsprogs
+      git
+      git-filter-repo
+      helix
+      home-manager
+      htop
+      killall
+      oh-my-zsh
+      rsync
+      tre-command
+      wget
+      zsh
+      tldr
+
+      # System libraries
+    ])
+    ++ (with pkgs-edge; [
+      # list of latest packages from nixpkgs master
+      # Can be used to install latest version of some packages
+    ]);
 
-    # System libraries
-  ];
   fonts = {
     packages = with pkgs; [
       cantarell-fonts