From 683af170a33d6e556e7bc9bada97f7fe90d6da9b Mon Sep 17 00:00:00 2001
From: macronova <trivial@invariantspace.com>
Date: Sat, 23 Mar 2024 19:27:31 -0700
Subject: [PATCH] Update flake

---
 flake.lock               | 40 ++++++++++++++++++++--------------------
 flake.nix                |  2 +-
 linux/blitzar/gui.nix    |  2 +-
 linux/blitzar/locale.nix |  1 -
 linux/protostar/gui.nix  |  8 ++++++++
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index bc95b5e..4e29ead 100644
--- a/flake.lock
+++ b/flake.lock
@@ -88,11 +88,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1711122977,
-        "narHash": "sha256-EnHux7wf7/7r+YMv8d/Ym1OTllp4sqqq0Bws1a4s2Zo=",
+        "lastModified": 1711133180,
+        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "19b87b9ae6ecfd81104a2a36ef8364f1de1b54b1",
+        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1710915975,
-        "narHash": "sha256-yOc0AD6ba7mbialNciZGzuSQLMo4CopoZGEfcUugA4I=",
+        "lastModified": 1711231487,
+        "narHash": "sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "179d73fbe14c5bdb835d10bcc1c783466112bfa6",
+        "rev": "1171169117f63f1de9ef2ea36efd8dcf377c6d5a",
         "type": "github"
       },
       "original": {
@@ -169,11 +169,11 @@
         "yorha-sound-theme": "yorha-sound-theme"
       },
       "locked": {
-        "lastModified": 1710628610,
-        "narHash": "sha256-Oo4hQfDwVhS1vga+tk03OUqfSffXVhw7zyx1Nhdz+po=",
+        "lastModified": 1711247107,
+        "narHash": "sha256-OlYhh7sHJGbyEH8imtyKqCHAxVVq27+hPvTzLmx7LSY=",
         "ref": "refs/heads/main",
-        "rev": "d5adba5b552d87b48a4ef3289cd00b1b82b05f14",
-        "revCount": 13,
+        "rev": "6e0d3eb6a053ef1d8069acc1a89a35a1bea2ab30",
+        "revCount": 14,
         "type": "git",
         "url": "https://forgejo.invariantspace.com/macronova/nix-custom"
       },
@@ -301,11 +301,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1710451336,
-        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
         "type": "github"
       },
       "original": {
@@ -317,11 +317,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1711001935,
-        "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
         "type": "github"
       },
       "original": {
@@ -430,11 +430,11 @@
     "wallpaper-engine-plasma5-plugin": {
       "flake": false,
       "locked": {
-        "lastModified": 1708352840,
-        "narHash": "sha256-FnEsiGbzaqdb6zTy0IA74DxhiPkyS1WudmCLTLwz+3o=",
+        "lastModified": 1710844534,
+        "narHash": "sha256-zVXvyUiigqIOKBKBv82SyjrEnoCNrc+o9Rkc8JXQt98=",
         "ref": "refs/heads/main",
-        "rev": "e803d26b050f8b85c03c69aa2544bbb3562451ae",
-        "revCount": 570,
+        "rev": "34f7f01acba3bc8f94d478032cf86aef06b02d26",
+        "revCount": 572,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/catsout/wallpaper-engine-kde-plugin"
diff --git a/flake.nix b/flake.nix
index 39b2ace..c5ef734 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,7 @@
                 };
                 nixpkgs = {
                   config.allowUnfree = true;
-                  overlays = [ nix-custom.overlay ];
+                  overlays = [ nix-custom.overlays.default ];
                 };
               })
             ];
diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix
index 290c9b2..c24b58d 100644
--- a/linux/blitzar/gui.nix
+++ b/linux/blitzar/gui.nix
@@ -25,8 +25,8 @@ let usr = config.constants.userName; in {
         telegram-desktop
         thunderbird
         wallpaper-engine-plasma6-plugin
-        wineWowPackages.waylandFull
         winetricks
+        wineWowPackages.waylandFull
         yorha-sound-theme
         # yuzu
       ] ++ (with kdePackages;[
diff --git a/linux/blitzar/locale.nix b/linux/blitzar/locale.nix
index bebcf11..d2fae48 100644
--- a/linux/blitzar/locale.nix
+++ b/linux/blitzar/locale.nix
@@ -3,7 +3,6 @@
 {
   # Configure input methods
   i18n = {
-    defaultLocale = "en_US.UTF-8";
     inputMethod = {
       enabled = "fcitx5";
       fcitx5.addons = with pkgs; [ fcitx5-nord fcitx5-rime ];
diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix
index ee9b230..c6598db 100644
--- a/linux/protostar/gui.nix
+++ b/linux/protostar/gui.nix
@@ -13,8 +13,16 @@ in
         ppsspp
       ];
     })
+    winetricks
+    wineWowPackages.waylandFull
     # yuzu
   ];
+  i18n.supportedLocales = [
+      "C.UTF-8/UTF-8"
+      "en_US.UTF-8/UTF-8"
+      "ja_JP.UTF-8/UTF-8"
+      "zh_CN.UTF-8/UTF-8"
+  ];
   jovian = {
     devices.steamdeck = {
       enable = true;