commit 44fbdc1d4033378de72ec8423fb485d1eb5c409f
author Skyler Grey <sky@a.starrysky.fyi> Tue Sep 17 21:07:18 2024 +0000
committer Skyler Grey <minion@clicks.codes> Tue Sep 17 21:14:00 2024 +0000
tree 191579de2d1baeb7df1720fbb8d48584fe4088ab
parent 8b49c02f924dd0a436aba32cec7092e37237d8ec

chore: nix flake update

Change-Id: I3524d71be9046e872eba92b23f66fd75937b7a95
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/832
Reviewed-by: Samuel Shuert <coded@clicks.codes>
Tested-by: Skyler Grey <minion@clicks.codes>

modules/home/wayland/niri/default.nix

diff --git a/modules/home/wayland/niri/default.nix b/modules/home/wayland/niri/default.nix
index 571fe93..dc53d80 100644
--- a/modules/home/wayland/niri/default.nix
+++ b/modules/home/wayland/niri/default.nix
@@ -310,7 +310,7 @@
             command = [ "${pkgs.swaybg}/bin/swaybg" "-i" "${config.chimera.theme.wallpaper}" "-m" "fill" ];
           }
           {
-            command = [ "${pkgs.xwayland-satellite}/bin/xwayland-satellite" ];
+            command = [ "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" ]; # todo: use xwayland-satellite-nixpkgs in the future...
           }
         ] ++ config.chimera.niri.startupCommands;
       };

modules/nixos/wifi/default.nix

diff --git a/modules/nixos/wifi/default.nix b/modules/nixos/wifi/default.nix
index fa0d871..e39500d 100644
--- a/modules/nixos/wifi/default.nix
+++ b/modules/nixos/wifi/default.nix
@@ -7,32 +7,32 @@
     networks = {
       # Mini's house
       adelie24 = {
-        psk = "@newadelie24@";
+        pskRaw = "ext:newadelie24";
         priority = 25;
       };
       adelie50 = {
-        psk = "@newadelie50@";
+        pskRaw = "ext:newadelie50";
         priority = 50;
       };
 
       # Hills Road 6th Form College
-      "HRSFC Wi-Fi".psk = "@HRSFC_Wi_Fi@";
+      "HRSFC Wi-Fi".pskRaw = "ext:HRSFC_Wi_Fi";
 
       # Coded's house
-      Orange2.psk = "@Orange2@";
+      Orange2.pskRaw = "ext:Orange2";
       "Orange2_5G A" = {
-        psk = "@Orange2_5G_A@";
+        pskRaw = "ext:Orange2_5G_A";
         priority = 100;
       };
 
       # Pinea's house
-      "OurVM2.4".psk = "@OurVM2_4@";
+      "OurVM2.4".pskRaw = "ext:OurVM2_4";
 
       # Moller institute
       "Moller" = {};
     };
 
-    environmentFile = config.sops.secrets."modules/nixos/wifi/wifi-passwords.sops.chimera.env.bin".path;
+    secretsFile = config.sops.secrets."modules/nixos/wifi/wifi-passwords.sops.chimera.env.bin".path;
   };
 
   hardware.enableRedistributableFirmware = true;