From cebeb2be1c9942f2cfbf1162626a41fb26b9874e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Thu, 3 Oct 2024 11:18:34 +0200
Subject: [PATCH] Remove nixpkgs-master input

---
 flake.lock | 17 -----------------
 flake.nix  | 19 +++++++++----------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 19599fb..e12066b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -217,22 +217,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1727912358,
-        "narHash": "sha256-ba06/LDxDIZexS2mCdwRdBluBKwRJ91cAsnnOPmVdfA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "78389c563cbe52a1b5742cd760ef52291b429fc2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1720535198,
@@ -361,7 +345,6 @@
         "huecli": "huecli",
         "nix-packages": "nix-packages",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixprstatus": "nixprstatus",
         "sops-nix": "sops-nix"
diff --git a/flake.nix b/flake.nix
index c590932..648b0a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,8 @@
   description = "Torjus nixos config flake";
 
   inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
-    nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
+    #nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -33,7 +32,7 @@
     {
       self,
       nixpkgs,
-      nixpkgs-master,
+      # nixpkgs-master,
       nixpkgs-stable,
       nixprstatus,
       sops-nix,
@@ -51,12 +50,12 @@
           config.allowUnfree = true;
         };
       };
-      overlay-master = final: prev: {
-        master = import nixpkgs-master {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      };
+      # overlay-master = final: prev: {
+      #   master = import nixpkgs-master {
+      #     inherit system;
+      #     config.allowUnfree = true;
+      #   };
+      # };
       allSystems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -67,7 +66,7 @@
         f: nixpkgs.lib.genAttrs allSystems (system: f { pkgs = import nixpkgs { inherit system; }; });
       commonOverlays = [
         overlay-stable
-        overlay-master
+        # overlay-master
         ghettoptt.overlays.default
         huecli.overlays.default
         nix-packages.overlays.default