feat!: Update to 26.05

5 files changed, 28 insertions, 28 deletions

diff --git a/flake.lock b/flake.lock
index c9ce854..c155cd2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,11 +21,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1777394001,
-        "narHash": "sha256-FNHydw2We/qvxBJ2cMNc/eGcxSZkvOXZn2WYGiH6WfE=",
+        "lastModified": 1780351245,
+        "narHash": "sha256-PB4VjmqzQWgNWffTtNuodhw5O9Gjp3QQyVann73Y6js=",
         "owner": "JPyke3",
         "repo": "hytale-launcher-nix",
-        "rev": "822e54c97348a6fbc28dfac563e5bbe9fe1783b8",
+        "rev": "ba0f3a621f0649e4b2e8e5b3b481bf379d425394",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1777692910,
-        "narHash": "sha256-rPszOFTm7gP9n/JGiFH4SeuEALC8FBJtXu5owvHVjaQ=",
+        "lastModified": 1780375694,
+        "narHash": "sha256-TznzgYVONg28KiSFB2rVdf/eLVIMtEQOxKt13Kzyrp8=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "0707737282f65e25ed8e6e73f8767872659b7fb8",
+        "rev": "e6f8bec35104ca5955efe73742da58d2823684f7",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777268161,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1777578337,
-        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {
@@ -136,16 +136,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1777673416,
-        "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=",
+        "lastModified": 1780453794,
+        "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671",
+        "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 05e0c41..1b38445 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "System setup";
 
   inputs = {
-    nixpkgs.url      = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url      = "github:nixos/nixpkgs/nixos-26.05";
     nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
diff --git a/machines/juno/configuration.nix b/machines/juno/configuration.nix
index 3799892..85d00d3 100644
--- a/machines/juno/configuration.nix
+++ b/machines/juno/configuration.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    thinkfan xorg.xf86inputsynaptics
+    thinkfan xf86-input-synaptics
   ];
 
   # External third-party battery is no longer able to hold 100% charge without getting "stuck"
diff --git a/modules/personal/de-openbox-syndamia.nix b/modules/personal/de-openbox-syndamia.nix
index 6d61ed0..28f5177 100644
--- a/modules/personal/de-openbox-syndamia.nix
+++ b/modules/personal/de-openbox-syndamia.nix
@@ -40,9 +40,9 @@
     pnmixer  # audio control
 
     #== File viewers/editors ==#
-    mate.atril  # PDF/PostScript/DJVU/...
-    mate.eom  # PNG/JPEG/...
-    mate.engrampa  # archives
+    atril  # PDF/PostScript/DJVU/...
+    eom  # PNG/JPEG/...
+    engrampa  # archives
     nemo-with-extensions  # file manager
     seahorse  # GnomeKeyring manager
 
@@ -55,7 +55,7 @@
   ] ++
   (if config.hardware.bluetooth.enable then
   [
-    blueberry  # bluetooth configuration
+    blueman  # bluetooth configuration
   ]
   else []) ++
   (if config.networking.networkmanager.enable then
diff --git a/modules/personal/desktop-x11.nix b/modules/personal/desktop-x11.nix
index 594e822..9fb2874 100644
--- a/modules/personal/desktop-x11.nix
+++ b/modules/personal/desktop-x11.nix
@@ -10,17 +10,17 @@
     glava  # video visualiser
 
     #== X11 tools ==#
-    xorg.xev  # print events in terminal
-    xorg.xhost  # manage host/user names, allowed xserver access
+    xev  # print events in terminal
+    xhost  # manage host/user names, allowed xserver access
     xclip  # access X11 clipboard from command-line
     clipnotify  # notify on text selection events
     xdotool  # simulate keyboard & mouse activity
-    xorg.xmodmap  # modify keymaps
-    xorg.setxkbmap  # configure keymaps
+    xmodmap  # modify keymaps
+    setxkbmap  # configure keymaps
     xcape  # configure modifier keys
     xfontsel  # browse and preview fonts
-    xorg.xprop  # display and set window and font properties
-    xorg.xwininfo  # print information about a window
+    xprop  # display and set window and font properties
+    xwininfo  # print information about a window
     wmctrl  # manage windows
 
     #== Terminal emulators ==#