From 1c9be455d880995063685864f46506c8ef209f87 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Sat, 18 Jan 2025 01:18:56 -0600
Subject: [PATCH] removed pkgs5 input and pinned packages that can now compile

---
 flake.lock              | 17 -----------------
 flake.nix               |  4 +---
 modules/shell/tools.nix |  1 -
 overlay.nix             | 12 +-----------
 4 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3b5596a..faff6a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -734,22 +734,6 @@
         "type": "github"
       }
     },
-    "nixpkgs5": {
-      "locked": {
-        "lastModified": 1735563628,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1737062831,
@@ -820,7 +804,6 @@
         "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs11": "nixpkgs11",
-        "nixpkgs5": "nixpkgs5",
         "nur": "nur",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
diff --git a/flake.nix b/flake.nix
index fdb637e..4318ad2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
   description = "JawZ NixOS flake setup";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgs5.url = "github:nixos/nixpkgs?ref=nixos-24.05";
     nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
     ucodenix.url = "github:e-tho/ucodenix";
     doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened";
@@ -48,7 +47,6 @@
           config.allowUnfree = true;
         };
       pkgs = mkpkgs inputs.nixpkgs;
-      pkgs5 = mkpkgs inputs.nixpkgs5;
       pkgs11 = mkpkgs inputs.nixpkgs11;
       lib = inputs.nixpkgs.lib // inputs.home-manager.lib;
       createConfig =
@@ -61,7 +59,7 @@
           modules = [
             {
               nixpkgs.overlays = [
-                (import ./overlay.nix { inherit pkgs pkgs5 pkgs11; })
+                (import ./overlay.nix { inherit pkgs pkgs11; })
                 inputs.doom-emacs.overlays.default
               ];
             }
diff --git a/modules/shell/tools.nix b/modules/shell/tools.nix
index 0f300bc..e9b8560 100644
--- a/modules/shell/tools.nix
+++ b/modules/shell/tools.nix
@@ -80,7 +80,6 @@
       inherit (inputs.jawz-scripts.packages.x86_64-linux)
         rmlint # amazing dupe finder that integrates well with BTRFS
         ;
-
     };
     environment.variables = {
       HISTFILE = "\${XDG_STATE_HOME}/bash/history";
diff --git a/overlay.nix b/overlay.nix
index 77e90ba..89e7d3a 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  pkgs5,
   pkgs11,
 }:
 _final: prev: {
@@ -33,17 +32,8 @@ _final: prev: {
   discord-ptb = prev.discord.override { withVencord = true; };
   ripgrep = prev.ripgrep.override { withPCRE2 = true; };
   papirus-icon-theme = prev.papirus-icon-theme.override { color = "green"; };
-  blender = pkgs11.blender.override { cudaSupport = true; };
-  inherit (pkgs5)
-    mypaint
-    mypaint-brushes
-    mypaint-brushes1
-    ;
+  blender = prev.blender.override { cudaSupport = true; };
   inherit (pkgs11)
     torrenttools
-    gimp
-    shipwright
-    libreoffice
-    lime3ds
     ;
 }