From 55d6697bed7f86ee3e9e90430e751372dce92579 Mon Sep 17 00:00:00 2001
From: Jakub Trzeciak <jptrzy@gmail.com>
Date: Sun, 22 Oct 2023 16:50:46 +0200
Subject: Heroic Launcher

---
 flake.lock              | 35 +++++++++--------------------------
 flake.nix               |  6 +++---
 nixos/configuration.nix |  6 +++---
 overlays/default.nix    | 12 ++++++------
 4 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/flake.lock b/flake.lock
index 34c2441..2df8e49 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,16 +23,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1695108154,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+        "lastModified": 1697838989,
+        "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
+        "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -58,16 +58,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697655685,
-        "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=",
+        "lastModified": 1697723726,
+        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c",
+        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -87,28 +87,11 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1697456312,
-        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nix-colors": "nix-colors",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 6930228..18babe5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,11 +3,11 @@
 
   inputs = {
     # Nixpkgs
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     # Nix Colors
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 50d679b..2f75bdb 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -226,7 +226,7 @@
   nixpkgs.overlays = [
     outputs.overlays.additions
     outputs.overlays.modifications
-    outputs.overlays.unstable-packages
+    #outputs.overlays.unstable-packages
   ];
 
 # List packages installed in system profile. To search, run:
@@ -302,12 +302,12 @@
     #openttd
     dolphin-emu
     prismlauncher
-  ] ++ (with pkgs.unstable; [
+
     winetricks
     gamemode
     heroic
     gogdl
-  ]) ++ [
+  ] ++ [
     (pkgs.nnn.override { withNerdIcons = true; })
     #(pkgs.unstable.callPackage ../pkgs/heroic-launcher {
     #  electron = pkgs.unstable.electron_24;
diff --git a/overlays/default.nix b/overlays/default.nix
index cd7a878..2bdd11f 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,12 +12,12 @@ in {
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'
-  unstable-packages = final: _prev: {
-    unstable = import inputs.nixpkgs-unstable {
-      system = final.system;
-      config.allowUnfree = true;
-    };
-  };
+  #unstable-packages = final: _prev: {
+  #  unstable = import inputs.nixpkgs-unstable {
+  #    system = final.system;
+  #    config.allowUnfree = true;
+  #  };
+  #};
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
-- 
cgit v1.2.3