From 7f8623c866f0621ca1958b9f6f75511c63ddb816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Fri, 31 May 2024 09:31:54 +0300
Subject: [PATCH] remove nixpkgs-unstable

---
 flake.lock                           | 23 +++--------------------
 flake.nix                            |  6 ------
 modules/profiles/desktop/default.nix |  2 +-
 shared/home/default.nix              |  6 +++---
 shared/work/default.nix              | 28 ++++++++++++----------------
 5 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/flake.lock b/flake.lock
index a87dd64..a02403e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -246,29 +246,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1716948383,
-        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "locked": {
-        "lastModified": 1717128264,
-        "narHash": "sha256-G1v5wsi6TAyKWUZcfU8yvbhRrXXL2jVsX3OP3o3PIfQ=",
+        "lastModified": 1717137004,
+        "narHash": "sha256-bTPVuz7H9Rpa5hyUvFqL8VBZTnh9u6FEd/ZSrJNHqcM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5087d4ff41071cbc7d2f376df89d81bde2e00745",
+        "rev": "83d68f7515cf4915933e6c9a431baf81110433f9",
         "type": "github"
       },
       "original": {
@@ -319,7 +303,6 @@
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "pre-commit-hooks": "pre-commit-hooks"
       }
diff --git a/flake.nix b/flake.nix
index c42b32d..d7f9447 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     flake-compat.url = "github:nix-community/flake-compat";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -76,7 +75,6 @@
   outputs = {
     self,
     nixpkgs,
-    nixpkgs-unstable,
     agenix,
     deploy-rs,
     flake-utils,
@@ -115,10 +113,6 @@
         # TODO: copied from 24.05
         turbo = super.callPackage ./pkgs/turbo.nix {};
 
-        pkgs-unstable = import nixpkgs-unstable {
-          inherit (super) system;
-        };
-
         crossArm64 = import nixpkgs {
           system = "x86_64-linux";
           hostPlatform.config = "aarch64-linux";
diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix
index 7c948d3..a648a6b 100644
--- a/modules/profiles/desktop/default.nix
+++ b/modules/profiles/desktop/default.nix
@@ -248,7 +248,7 @@ in {
           winetricks
           wineWowPackages.full
         ])
-        [pkgs.pkgs-unstable.undocker]
+        [pkgs.undocker]
       ];
 
     # https://discourse.nixos.org/t/nixos-rebuild-switch-upgrade-networkmanager-wait-online-service-failure/30746
diff --git a/shared/home/default.nix b/shared/home/default.nix
index 5750ebf..d805e28 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -70,9 +70,9 @@ in {
       [extract_url]
 
       (lib.mkIf devTools [
-        pkgs-unstable.go_1_22
-        pkgs-unstable.go-tools
-        pkgs-unstable.zig_0_12
+        go_1_22
+        go-tools
+        zig_0_12
       ])
 
       (lib.mkIf hmOnly [
diff --git a/shared/work/default.nix b/shared/work/default.nix
index 3efeac8..502bdaa 100644
--- a/shared/work/default.nix
+++ b/shared/work/default.nix
@@ -6,22 +6,18 @@
   mj.base.users.email = null;
   mj.base.users.user.extraGroups = ["docker"];
 
-  environment.systemPackages =
-    (with pkgs; [
-      #swc
-      #nodejs
-      #typescript
-      #concurrently
-      bats
-      mysql80
-      kubectl
-      kubectl-node-shell
-      kubectx
-      google-cloud-sdk
-    ])
-    ++ (with pkgs.pkgs-unstable; [
-      #turbo
-    ]);
+  environment.systemPackages = with pkgs; [
+    #swc
+    #nodejs
+    #typescript
+    #concurrently
+    bats
+    mysql80
+    kubectl
+    kubectl-node-shell
+    kubectx
+    google-cloud-sdk
+  ];
 
   services.clamav = {
     updater.enable = true;