feat: start migrating steveej-t14 and sj-vps-htz-0 to sops

nix/home-manager/programs/espanso.nix

@@ -2,10 +2,11 @@
   pkgs,
   config,
   ...
-}: let
-  passwords = import ../../variables/passwords.crypt.nix;
-in {
+}: {
   services.espanso = {
+    # package = pkgs.espanso.overrideAttrs(_: {
+    #   # src =
+    # })
     enable = true;
     settings = {
       matches = let

nix/home-manager/programs/firefox.nix

@@ -1,4 +1,5 @@
 {pkgs, ...}: {
+  programs.librewolf = {enable = true;};
   programs.firefox = {enable = true;};
 
   programs.browserpass = {

nix/home-manager/programs/radicale.nix

@@ -1,11 +1,10 @@
 {
   config,
-  pkgs,
   lib,
+  pkgs,
+  osConfig,
   ...
 }: let
-  passwords = import ../../variables/passwords.crypt.nix;
-
   libdecsync = pkgs.python3Packages.buildPythonPackage rec {
     pname = "libdecsync";
     version = "2.2.1";
@@ -16,9 +15,8 @@
     };
 
     propagatedBuildInputs = [
-      pkgs.libxcrypt-legacy
+      # pkgs.libxcrypt-legacy
     ];
-
   };
   radicale-storage-decsync = pkgs.python3Packages.buildPythonPackage rec {
     pname = "radicale_storage_decsync";
@@ -31,13 +29,13 @@
 
     buildInputs = [
       pkgs.radicale
-      pkgs.libxcrypt-legacy
-      pkgs.libxcrypt
+      # pkgs.libxcrypt-legacy
+      # pkgs.libxcrypt
     ];
 
     nativeCheckInputs = [
-      pkgs.libxcrypt-legacy
-      pkgs.libxcrypt
+      # pkgs.libxcrypt-legacy
+      # pkgs.libxcrypt
     ];
 
     propagatedBuildInputs = [libdecsync pkgs.python3Packages.setuptools];
@@ -48,18 +46,17 @@
       ++ [radicale-storage-decsync];
   });
 
-  mkRadicaleService = { suffix, port }: let
+  mkRadicaleService = {
+    suffix,
+    port,
+  }: let
     radicale-config = pkgs.writeText "radicale-config-${suffix}" ''
       [server]
-      hosts = localhost:${builtins.toString(port)}
+      hosts = localhost:${builtins.toString port}
 
       [auth]
       type = htpasswd
-      htpasswd_filename = ${
-        pkgs.writeText "radicale" ''
-          radicale:${passwords.users.radicale}
-        ''
-      }
+      htpasswd_filename = ${osConfig.sops.secrets.radicale_htpasswd.path}
       htpasswd_encryption = bcrypt
 
       [storage]
@@ -77,7 +74,14 @@
       Install.WantedBy = ["default.target"];
     };
   };
-in builtins.foldl' (sum: cur: lib.recursiveUpdate sum (mkRadicaleService cur)) {} [
-  {suffix = "personal"; port = 5232;}
-  {suffix = "family"; port = 5233;}
-]
+in
+  builtins.foldl' (sum: cur: lib.recursiveUpdate sum (mkRadicaleService cur)) {} [
+    {
+      suffix = "personal";
+      port = 5232;
+    }
+    {
+      suffix = "family";
+      port = 5233;
+    }
+  ]

nix/home-manager/programs/waybar.nix

@@ -1,6 +1,9 @@
-{ pkgs, config, repoFlake, ... }:
-
 {
+  pkgs,
+  config,
+  repoFlake,
+  ...
+}: {
   home.packages = [
     # required by any bar that has a tray plugin
     pkgs.libappindicator-gtk3
@@ -10,8 +13,9 @@
   programs.waybar = {
     enable = true;
     package = repoFlake.inputs.nixpkgs-wayland.outputs.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
-    style = pkgs.lib.readFile "${pkgs.waybar.src}/resources/style.css"
-          + pkgs.lib.readFile ./waybar.css;
+    style =
+      pkgs.lib.readFile "${pkgs.waybar.src}/resources/style.css"
+      + pkgs.lib.readFile ./waybar.css;
     systemd.enable = true;
     settings = {
       mainBar = {
@@ -35,12 +39,12 @@
           all-outputs = false;
         };
 
-        modules-center = [ 
+        modules-center = [
           "sway/window"
           # "custom/hello-from-waybar"
         ];
 
-        modules-right = [ 
+        modules-right = [
           "tray"
 
           "cpu"
@@ -55,22 +59,22 @@
 
         tray.spacing = 10;
 
-        cpu.format = "  {}%";
+        cpu.format = "  {usage}%";
         memory.format = "  {}%";
-        "temperature" =  {
+        "temperature" = {
           hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
           format = " {temperatureC} °C";
         };
 
         "custom/cputemp" = {
-            format = " {}";
-            exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gawk}/bin/awk '/CPU:/ {print $2}'";
-            interval = 2;
+          format = " {}";
+          exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gawk}/bin/awk '/CPU:/ {print $2}'";
+          interval = 2;
         };
         "custom/fan" = {
-            format = "   {} rpm  ";
-            exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gawk}/bin/awk '/fan1:/ {print $2}'";
-            interval = 2;
+          format = "   {} rpm  ";
+          exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gawk}/bin/awk '/fan1:/ {print $2}'";
+          interval = 2;
         };
         battery.format = "🔋 {}%";
         pulseaudio = {