From a57c748ca21fe5983752d4f9e66cad5c616fca78 Mon Sep 17 00:00:00 2001 From: macronova Date: Wed, 27 Mar 2024 20:55:00 -0700 Subject: [PATCH] Update wine --- flake.lock | 48 ++++++++++++++++++++--------------------- linux/blitzar/gui.nix | 44 ++++++++++++++++++------------------- linux/protostar/gui.nix | 10 ++++----- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 4e29ead..527c5c8 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1711006105, - "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", + "lastModified": 1711588700, + "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=", "owner": "nix-community", "repo": "disko", - "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", + "rev": "502241afa3de2a24865ddcbe4c122f4546e32092", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "hardware": { "locked": { - "lastModified": 1710783728, - "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", + "lastModified": 1711352745, + "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", + "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1711554349, + "narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "179f6acaf7c068c7870542cdae72afec9427a5b0", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710889954, - "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710628718, - "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", + "lastModified": 1711233294, + "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", + "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1710534455, - "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", + "lastModified": 1711200738, + "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", + "rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", "type": "github" }, "original": { @@ -366,11 +366,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710644594, - "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", + "lastModified": 1711249319, + "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", + "rev": "405987a66cce9a4a82f321f11b205982a7127c88", "type": "github" }, "original": { diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index c24b58d..9282eae 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -26,7 +26,7 @@ let usr = config.constants.userName; in { thunderbird wallpaper-engine-plasma6-plugin winetricks - wineWowPackages.waylandFull + wineWowPackages.unstableFull yorha-sound-theme # yuzu ] ++ (with kdePackages;[ @@ -54,37 +54,38 @@ let usr = config.constants.userName; in { zathura = { enable = true; options = { - notification-error-bg = "#1d2021"; - notification-error-fg = "#fb4934"; - notification-warning-bg = "#1d2021"; - notification-warning-fg = "#fabd2f"; - notification-bg = "#1d2021"; - notification-fg = "#b8bb26"; completion-bg = "#504945"; completion-fg = "#ebdbb2"; completion-group-bg = "#3c3836"; completion-group-fg = "#928374"; completion-highlight-bg = "#83a598"; completion-highlight-fg = "#504945"; - index-bg = "#504945"; - index-fg = "#ebdbb2"; - index-active-bg = "#83a598"; - index-active-fg = "#504945"; - inputbar-bg = "#1d2021"; - inputbar-fg = "#ebdbb2"; - statusbar-bg = "#504945"; - statusbar-fg = "#ebdbb2"; - highlight-color = "#fabd2f"; - highlight-active-color = "#fe8019"; default-bg = "#1d2021"; default-fg = "#ebdbb2"; + highlight-active-color = "#fe8019"; + highlight-color = "#fabd2f"; + index-active-bg = "#83a598"; + index-active-fg = "#504945"; + index-bg = "#504945"; + index-fg = "#ebdbb2"; + inputbar-bg = "#1d2021"; + inputbar-fg = "#ebdbb2"; + notification-bg = "#1d2021"; + notification-error-bg = "#1d2021"; + notification-error-fg = "#fb4934"; + notification-fg = "#b8bb26"; + notification-warning-bg = "#1d2021"; + notification-warning-fg = "#fabd2f"; + recolor = "true"; + recolor-darkcolor = "#ebdbb2"; + recolor-keephue = "true"; + recolor-lightcolor = "#1d2021"; render-loading = "true"; render-loading-bg = "#1d2021"; render-loading-fg = "#ebdbb2"; - recolor = "true"; - recolor-darkcolor = "#ebdbb2"; - recolor-lightcolor = "#1d2021"; - recolor-keephue = "true"; + selection-clipboard = "clipboard"; + statusbar-bg = "#504945"; + statusbar-fg = "#ebdbb2"; }; }; }; @@ -111,7 +112,6 @@ let usr = config.constants.userName; in { autoLogin.user = usr; sddm = { enable = true; - settings.General.GreeterEnvironment = "QT_SCREEN_SCALE_FACTORS=2,QT_FONT_DPI=192"; wayland.enable = true; }; }; diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix index c6598db..9f320db 100644 --- a/linux/protostar/gui.nix +++ b/linux/protostar/gui.nix @@ -14,14 +14,14 @@ in ]; }) winetricks - wineWowPackages.waylandFull + wineWowPackages.unstableFull # 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" + "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 = {