Backup before server rebuild

hosts/nixos/calypso/hardware/default.nix

@@ -11,7 +11,7 @@
   # }}}
   # {{{ Misc
   hardware.enableAllFirmware = true;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   hardware.opentabletdriver.enable = true;
   hardware.keyboard.qmk.enable = true;
   # }}}

hosts/nixos/common/global/default.nix

@@ -2,8 +2,8 @@
 {
   inputs,
   lib,
-  config,
   outputs,
+  pkgs,
   ...
 }:
 let
@@ -52,15 +52,6 @@ in
   boot.initrd.systemd.enable = true;
   # }}}
 
-  nixpkgs = {
-    # Add all overlays defined in the overlays directory
-    overlays =
-      builtins.attrValues outputs.overlays
-      ++ lib.lists.optional config.satellite.toggles.neovim-nightly.enable inputs.neovim-nightly-overlay.overlay;
-
-    config.allowUnfree = true;
-  };
-
   # Root domain used throughout my config
   satellite.dns.domain = "moonythm.dev";
 }

hosts/nixos/common/optional/bluetooth.nix

@@ -2,4 +2,5 @@
 {
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
+  systemd.services.bluetooth.serviceConfig.ConfigurationDirectoryMode = "755";
 }

hosts/nixos/common/optional/pipewire.nix

@@ -12,14 +12,17 @@
   };
 
   # https://nixos.wiki/wiki/PipeWire
-  environment.etc = {
-    "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
-      bluez_monitor.properties = {
-        ["bluez5.enable-sbc-xq"] = true,
-        ["bluez5.enable-msbc"] = true,
-        ["bluez5.enable-hw-volume"] = true,
-        ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
-      }
-    '';
+  services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = {
+    "monitor.bluez.properties" = {
+      "bluez5.enable-sbc-xq" = true;
+      "bluez5.enable-msbc" = true;
+      "bluez5.enable-hw-volume" = true;
+      "bluez5.roles" = [
+        "hsp_hs"
+        "hsp_ag"
+        "hfp_hf"
+        "hfp_ag"
+      ];
+    };
   };
 }

hosts/nixos/common/optional/services/wpa_supplicant.nix

@@ -8,22 +8,22 @@
     fallbackToWPA2 = false;
 
     # Declarative
-    environmentFile = config.sops.secrets.wireless.path;
+    secretsFile = config.sops.secrets.wireless.path;
     networks = {
-      "Neptune".psk = "@ENCELADUS_HOTSPOT_PASS@";
+      "Neptune".pskRaw = "ext:ENCELADUS_HOTSPOT_PASS";
 
-      "Familia-Matei-PRO".psk = "@TG_HOTSPOT_HOME_PASS@";
-      "Familia-Matei".psk = "@TG_HOTSPOT_HOME_PASS@";
+      "Familia-Matei-PRO".pskRaw = "ext:TG_HOTSPOT_HOME_PASS";
+      "Familia-Matei".pskRaw = "ext:TG_HOTSPOT_HOME_PASS";
 
-      "R15-5365 5g".psk = "@TG_WIFI_HOME_PASS@";
-      "R15-5365".psk = "@TG_WIFI_HOME_PASS@";
+      "R15-5365 5g".pskRaw = "ext:TG_WIFI_HOME_PASS";
+      "R15-5365".pskRaw = "ext:TG_WIFI_HOME_PASS";
 
-      "Sailhorse".psk = "@NL_PLACE_0_PASS@";
-      "Ziggo1721699".psk = "@NL_PLACE_1_PASS@";
-      "Konijntjes".psk = "@NL_PLACE_1_PODS_PASS@";
-      "InfoEdu12".psk = "@INFOEDU_PASS@";
-      "CNU19".psk = "@INFOEDU_PASS@";
-      "ZTE_F7A321".psk = "@MADALINA_PASS@";
+      "Sailhorse".pskRaw = "ext:NL_PLACE_0_PASS";
+      "Ziggo1721699".pskRaw = "ext:NL_PLACE_1_PASS";
+      "Konijntjes".pskRaw = "ext:NL_PLACE_1_PODS_PASS";
+      "InfoEdu12".pskRaw = "ext:INFOEDU_PASS";
+      "CNU19".pskRaw = "ext:INFOEDU_PASS";
+      "ZTE_F7A321".pskRaw = "ext:MADALINA_PASS";
 
       # [Working solution](https://bbs.archlinux.org/viewtopic.php?id=271336)
       # [Other interesting link](https://help.itc.rwth-aachen.de/en/service/b3d9a2c8ae5345b8b8f5128143ef4e3c/article/eaf6d69389a74a5a839c1f383c508df7/)
@@ -33,7 +33,7 @@
         auth = ''
           eap=PEAP
           identity="s5260329@rug.nl"
-          password="@EDUROAM_PASS@"
+          password="ext:EDUROAM_PASS"
         '';
         extraConfig = ''
           phase2="auth=MSCHAPV2"

hosts/nixos/tethys/boot.nix

@@ -1,6 +1,10 @@
-{ inputs, ... }: {
+{ inputs, pkgs, ... }:
+{
   imports = [ inputs.darkmatter-grub-theme.nixosModule ];
 
+  # https://github.com/NixOS/nixpkgs/issues/314425
+  boot.kernelPackages = pkgs.linuxPackages_6_12;
+
   # See [the wiki page](https://nixos.wiki/wiki/Dual_Booting_NixOS_and_Windows)
   boot.loader = {
     efi = {

hosts/nixos/tethys/default.nix

@@ -62,4 +62,15 @@
   # {{{ SSH keys
   users.users.pilot.openssh.authorizedKeys.keyFiles = [ ../calypso/keys/id_ed25519.pub ];
   # }}}
+
+  i18n.inputMethod = {
+    type = "fcitx5";
+    enable = true;
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc # for japanese input
+      fcitx5-gtk
+    ];
+    fcitx5.waylandFrontend = true;
+  };
+
 }

hosts/nixos/tethys/hardware/default.nix

@@ -11,7 +11,7 @@
   # }}}
   # {{{ Misc
   hardware.enableAllFirmware = true;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   hardware.opentabletdriver.enable = true;
   hardware.keyboard.qmk.enable = true;
   # }}}