From f682198e2255a2dfe2d14c030b638f9fa04a9d18 Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Mon, 23 Sep 2024 19:03:47 +0200
Subject: [PATCH] Discord & Wine

---
 flake.lock                           | 17 +++++++++++++++++
 flake.nix                            |  1 +
 generator.nix                        |  1 +
 modules/home/gui/base/default.nix    |  1 +
 modules/home/gui/games/default.nix   |  5 +----
 modules/nixos/system/nix/default.nix |  4 ++--
 overlays/default.nix                 |  7 ++++++-
 shells/default.nix                   |  2 +-
 8 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 05a0c2b..5c41056 100644
--- a/flake.lock
+++ b/flake.lock
@@ -391,6 +391,22 @@
         "type": "github"
       }
     },
+    "nixMaster": {
+      "locked": {
+        "lastModified": 1727112981,
+        "narHash": "sha256-F1yOcoe+OvWMG44yCcgHP8mqsI95SMS2i0s7h+NlVC8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "848b7926cd8d85cd4c308eb158bf506071f976f6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1726755586,
@@ -445,6 +461,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-colors": "nix-colors",
+        "nixMaster": "nixMaster",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
         "sops-nix": "sops-nix",
diff --git a/flake.nix b/flake.nix
index 4ad6261..b47c9e9 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
   description = "SoraFlake";
   inputs = {
 # Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
+    nixMaster.url = "github:nixos/nixpkgs/master";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
     nur.url = "github:nix-community/nur";
diff --git a/generator.nix b/generator.nix
index 8be5edc..17f7a93 100755
--- a/generator.nix
+++ b/generator.nix
@@ -6,6 +6,7 @@
     in ({
       "nixos" = inputs.nixpkgs.lib.nixosSystem {
         system = syscfg.syscfg.system;
+        specialArgs = { inherit inputs; };
         modules = [
           ./modules/shared/syscfg
           ./modules/shared/sops
diff --git a/modules/home/gui/base/default.nix b/modules/home/gui/base/default.nix
index ccdffce..f5069f7 100644
--- a/modules/home/gui/base/default.nix
+++ b/modules/home/gui/base/default.nix
@@ -10,6 +10,7 @@
       xfce.tumbler
 
       telegram-desktop
+      discord
       pavucontrol
       keepassxc
       nextcloud-client
diff --git a/modules/home/gui/games/default.nix b/modules/home/gui/games/default.nix
index 6a2caee..5e570cd 100644
--- a/modules/home/gui/games/default.nix
+++ b/modules/home/gui/games/default.nix
@@ -17,10 +17,7 @@
       bottles
       lutris
       inputs.umu.packages.${pkgs.system}.umu
-
-      #wineWow64Packages.unstableFull
-      wineWow64Packages.full
-      # wine64
+      wine
     ];
   };
 
diff --git a/modules/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix
index ba0eb59..4b7d719 100644
--- a/modules/nixos/system/nix/default.nix
+++ b/modules/nixos/system/nix/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ inputs, pkgs, ... }: {
   nixpkgs.config = {
     permittedInsecurePackages = [ ];
     allowUnfree = true;
@@ -8,7 +8,7 @@
     };
 
   };
-  nixpkgs.overlays = import ../../../../overlays { inherit pkgs; };
+  nixpkgs.overlays = import ../../../../overlays { inherit inputs pkgs; };
   nix = {
     package = pkgs.nixFlakes;
     extraOptions = ''
diff --git a/overlays/default.nix b/overlays/default.nix
index 833d91b..34a6f1e 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,8 +1,13 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 [
   (final: prev: {
     openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
     yarn-berry = import ./yarn-berry { inherit final prev; };
     eww = import ./eww { inherit final prev; };
+    wine = final.unstable.wineWow64Packages.unstableFull;
+    unstable = import inputs.nixMaster {
+      system = final.system;
+      config.allowUnfree = true;
+    };
   })
 ]
diff --git a/shells/default.nix b/shells/default.nix
index e601034..e373de4 100644
--- a/shells/default.nix
+++ b/shells/default.nix
@@ -4,7 +4,7 @@ let
     inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
 in forEachSystem (system:
   let
-    overlays = import ../overlays { inherit pkgs; };
+    overlays = import ../overlays { inherit inputs pkgs; };
     overrides = { custom = import ../pkgs { inherit pkgs; }; };
     pkgs = import inputs.nixpkgs { inherit system overlays; } // overrides;
   in {