From 25a74357249139f96ca33470066c32954cbd341e Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Sun, 18 May 2025 11:41:39 -0600
Subject: [PATCH] update to channel 25.05

---
 flake.lock                          | 40 +++++++++--------------------
 flake.nix                           |  7 +++--
 hosts/workstation/configuration.nix |  1 -
 modules/apps/gaming.nix             |  2 +-
 overlay.nix                         | 11 --------
 5 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index e56c193..d93b286 100644
--- a/flake.lock
+++ b/flake.lock
@@ -491,15 +491,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747565775,
-        "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
+        "lastModified": 1747556831,
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -923,48 +924,32 @@
     },
     "nixpkgs-small": {
       "locked": {
-        "lastModified": 1747554148,
-        "narHash": "sha256-aeAOz1/fSKEjEJG6eVjLC4RmxzTe2RkUERPD9yUQIGc=",
+        "lastModified": 1747428706,
+        "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0afebfe3e464cf20f0952275f8220a9502af465",
+        "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs11": {
-      "locked": {
-        "lastModified": 1747335874,
-        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05-small",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1747327360,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "lastModified": 1747428706,
+        "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1071,7 +1056,6 @@
         "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-small": "nixpkgs-small",
-        "nixpkgs11": "nixpkgs11",
         "nixtendo-switch": "nixtendo-switch",
         "nur": "nur",
         "sops-nix": "sops-nix",
diff --git a/flake.nix b/flake.nix
index 93daae5..ef34771 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,8 @@
 {
   description = "JawZ NixOS flake setup";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
-    nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
+    nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-25.05-small";
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
     ucodenix.url = "github:e-tho/ucodenix";
     doom-emacs = {
@@ -27,7 +26,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager?ref=release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix = {
diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index 7b17f00..a819c4e 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -86,7 +86,6 @@
         inherit (pkgs)
           distrobox # install packages from other os
           gocryptfs # encrypted filesystem! shhh!!!
-          torrenttools # create torrent files from the terminal!
           vcsi # video thumbnails for torrents, can I replace it with ^?
           ;
       };
diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix
index e7f796d..59a1d34 100644
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -52,7 +52,7 @@
         dolphin-emu # wii
         snes9x-gtk # snes
         ryubing # switch
-        lime3ds # 3Ds
+        azahar # 3Ds
         prismlauncher # minecraft launcher with jdk overlays
         ;
       inherit (inputs.jawz-scripts.packages.x86_64-linux)
diff --git a/overlay.nix b/overlay.nix
index 925a8c2..543ddc6 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -5,7 +5,6 @@
 }:
 let
   pkgs = mkpkgs inputs.nixpkgs;
-  pkgs11 = mkpkgs inputs.nixpkgs11;
 in
 _final: prev: {
   nautilus = prev.nautilus.overrideAttrs (old: {
@@ -48,18 +47,8 @@ _final: prev: {
   handbrake = prev.handbrake.override { useGtk = true; };
   ripgrep = prev.ripgrep.override { withPCRE2 = true; };
   papirus-icon-theme = prev.papirus-icon-theme.override { color = "orange"; };
-  blender = pkgs11.blender.override { cudaSupport = true; };
   discord = prev.discord.override {
     withVencord = true;
     withOpenASAR = true;
   };
-  inherit (pkgs11)
-    torrenttools
-    cemu
-    open-webui
-    lime3ds
-    shipwreck
-    rpcs3
-    resilio-sync
-    ;
 }