Update to address nixpkgs depreations

flake.lock

@@ -1063,11 +1063,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1722141560,
+        "lastModified": 1722415718,
-        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
+        "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
+        "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce",
         "type": "github"
       },
       "original": {

home/modules/linux/graphical/default.nix

@@ -71,8 +71,10 @@ in
       mpv # for anki
       anki-bin
 
+      # Chat stuff
       tdesktop
       whatsapp-for-linux
+      slack
 
       librewolf
 
@@ -81,11 +83,7 @@ in
       # sct # Display color temperature
       xdg-utils # Open stuff
       wifi-indicator
-    ] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
+    ]);
-      gnome.cheese # Webcam check, expensive
-      # Chat stuff
-      slack
-    ]));
 
     nki.programs.discord.enable = pkgs.stdenv.isx86_64;
     nki.programs.discord.package = pkgs.vesktop;

kagami-air-m1/configuration.nix

@@ -70,7 +70,7 @@
   services.printing.drivers = with pkgs; [ epfl-cups-drivers ];
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
   # Keyboard
   services.input-remapper.enable = true;
   services.input-remapper.serviceWantedBy = [ "multi-user.target" ];

modules/common/linux/default.nix

@@ -27,6 +27,17 @@ let
       };
     };
 
+    graphics = { config, ... }: {
+      hardware =
+        if config.system.nixos.release == "24.05" then {
+          opengl.enable = true;
+          opengl.driSupport32Bit = true;
+        } else {
+          graphics.enable = true;
+          graphics.enable32Bit = true;
+        };
+    };
+
     accounts = { pkgs, ... }: mkIf (config.common.linux.enable && !pkgs.stdenv.isAarch64) {
       environment.systemPackages = with pkgs.gnome; [ pkgs.glib gnome-control-center ];
       services.accounts-daemon.enable = true;
@@ -104,7 +115,7 @@ let
   };
 in
 {
-  imports = with modules; [ adb ios wlr logitech kwallet virtualisation accounts rt-audio ];
+  imports = with modules; [ adb ios graphics wlr logitech kwallet virtualisation accounts rt-audio ];
 
   options.common.linux = {
     enable = mkOption {
@@ -256,14 +267,18 @@ in
     i18n.defaultLocale = "ja_JP.UTF-8";
     # Input methods (only fcitx5 works reliably on Wayland)
     i18n.inputMethod = {
-      enabled = "fcitx5";
       fcitx5.waylandFrontend = true;
       fcitx5.addons = with pkgs; [
         fcitx5-mozc
         fcitx5-unikey
         fcitx5-gtk
       ];
-    };
+    } // (if config.system.nixos.release == "24.05" then {
+      enabled = "fcitx5";
+    } else {
+      enable = true;
+      type = "fcitx5";
+    });
 
     # Default packages
     environment.systemPackages = with pkgs; [
@@ -293,8 +308,6 @@ in
     programs.dconf.enable = true;
     # Gaming! (not for ARM64)
     programs.steam.enable = !pkgs.stdenv.isAarch64;
-    hardware.opengl.enable = true;
-    hardware.opengl.driSupport32Bit = !pkgs.stdenv.isAarch64; # For 32 bit applications
 
     ## Services
     # OpenSSH so you can SSH to me

modules/personal/fonts/mounting.nix

@@ -12,7 +12,7 @@ lib.mkIf pkgs.stdenv.isLinux {
         name = "system-icons";
         paths = with pkgs; [
           #libsForQt5.breeze-qt5  # for plasma
-          gnome.gnome-themes-extra
+          (pkgs.gnome-themes-extra or gnome.gnome-themes-extra) # Until 24.11
         ];
         pathsToLink = [ "/share/icons" ];
       };

nki-framework/configuration.nix

@@ -20,7 +20,7 @@
   # services.xserver.enable = true;
   # services.xserver.displayManager.sddm.enable = true;
   # services.xserver.displayManager.sddm.wayland.enable = true;
-  services.xserver.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # Power Management
   services.upower = {
@@ -40,7 +40,7 @@
   services.printing.drivers = with pkgs; [ epfl-cups-drivers ];
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
   # Keyboard
   services.input-remapper.enable = true;
   services.input-remapper.serviceWantedBy = [ "multi-user.target" ];

nki-yoga-g8/configuration.nix

@@ -27,7 +27,7 @@
     ed25519PrivateKey = config.sops.secrets."tinc-private-key".path;
   };
 
-  services.xserver.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # Power Management
   services.upower = {