Lock file maintenance

flake.lock

@@ -79,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726742753,
+        "lastModified": 1727003835,
-        "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
+        "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
+        "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
         "type": "github"
       },
       "original": {
@@ -137,11 +137,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1726724509,
+        "lastModified": 1727040444,
-        "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
+        "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
+        "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726863345,
+        "lastModified": 1727111745,
-        "narHash": "sha256-fjbKe1/UJpLT6tQLAKJ/djJFdnmAh2kkdsgmylyFrQA=",
+        "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "dfe4d334b172071e7189d971ddecd3a7f811b48d",
+        "rev": "21c021862fa696c8199934e2153214ab57150cb6",
         "type": "github"
       },
       "original": {
@@ -251,11 +251,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1726875437,
+        "lastModified": 1727135369,
-        "narHash": "sha256-1naC0j8l8/3CnagmSYJJInF+mKsFuCe8vUhN73xhLYE=",
+        "narHash": "sha256-//NqvBEEKKKHHSEBmN8tn7ZHFFNLDdjEamNFev2h6L8=",
         "ref": "refs/heads/main",
-        "rev": "9232bc2c00a57b99ac876b43fdfedfa25c2de774",
+        "rev": "d279d7c4c6fe27c1944d8e9b51c4730612c8a9ae",
-        "revCount": 5245,
+        "revCount": 5251,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -391,13 +391,29 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nixMaster": {
       "locked": {
-        "lastModified": 1726755586,
+        "lastModified": 1727135852,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "narHash": "sha256-MddIcGJ9qbAFjj1WV5yQ2t7JsSE+c/nXmPJ5JgrwSSo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "ee35dc7c19dd00e4a122e36b24603687f6d04359",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1726937504,
+        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
         "type": "github"
       },
       "original": {
@@ -424,11 +440,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1726867452,
+        "lastModified": 1727128777,
-        "narHash": "sha256-KOYfmRwrVIZalP0rUCD2dGZyujOagimlERk2Uj4wq/A=",
+        "narHash": "sha256-K2Auk4ZPRasHvMmFDHhGtt6L/JShaeS5+hqYU1O2Uq8=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "bd9f04ac4cfc12e9582668a01499c0ea80dd6fd5",
+        "rev": "e868e9fd6c65c5e8ed4a5a5da4caed283b8f2219",
         "type": "github"
       },
       "original": {
@@ -445,6 +461,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-colors": "nix-colors",
+        "nixMaster": "nixMaster",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
         "sops-nix": "sops-nix",
@@ -497,11 +514,11 @@
       },
       "locked": {
         "dir": "packaging/nix",
-        "lastModified": 1726768365,
+        "lastModified": 1727047270,
-        "narHash": "sha256-5yQJ3krsZioC+Nim4/oaOjKp3CXFWolTFMpXnUBcYtE=",
+        "narHash": "sha256-7g+h/FZUWPpZ+UsTtb6aqbTY7znCqwxOk98Ilo9N6ZU=",
         "ref": "refs/heads/main",
-        "rev": "e42043a26639cfb69d14c6945ecdebe2bb3c42fc",
+        "rev": "3e71418d937f054e04ff9173f18e57756c1fd9d6",
-        "revCount": 727,
+        "revCount": 728,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
@@ -538,11 +555,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726851729,
+        "lastModified": 1727109343,
-        "narHash": "sha256-1z0esr5lBeUMlrPZ9gZmqZT8oTQekxJi53HAW4cH0Ms=",
+        "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "73b8c4f1150040644cf678aa8bbf2cec48a433cf",
+        "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea",
         "type": "github"
       },
       "original": {

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";

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

modules/home/gui/base/default.nix

@@ -10,6 +10,7 @@
       xfce.tumbler
 
       telegram-desktop
+      discord
       pavucontrol
       keepassxc
       nextcloud-client

modules/home/gui/games/default.nix

@@ -15,10 +15,9 @@
       prismlauncher
       openttd-jgrpp
       bottles
+      lutris
       inputs.umu.packages.${pkgs.system}.umu
-
+      wine
-      wineWow64Packages.waylandFull
-      proton-ge-bin
     ];
   };
 

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 = ''

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;
+    };
   })
 ]

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 {