From a0ce1f6a9ac5f663f44532612eaf0d1beb16ab8f Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Tue, 1 Feb 2022 11:08:35 -0500
Subject: chore(grfn/home): Rename deprecated options

Change-Id: Ic209f46858d9834298d151d7c6b884f6d6f23dbe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5158
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
---
 users/grfn/system/home/modules/emacs.nix |  2 +-
 users/grfn/system/home/modules/i3.nix    | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/users/grfn/system/home/modules/emacs.nix b/users/grfn/system/home/modules/emacs.nix
index c65d88aacf6f..f3d08a49ce42 100644
--- a/users/grfn/system/home/modules/emacs.nix
+++ b/users/grfn/system/home/modules/emacs.nix
@@ -102,7 +102,7 @@ in
       # Notes
       services.syncthing = {
         enable = true;
-        tray = true;
+        tray.enable = true;
       };
     })
   ];
diff --git a/users/grfn/system/home/modules/i3.nix b/users/grfn/system/home/modules/i3.nix
index 7bd371e117d1..27a21496eafa 100644
--- a/users/grfn/system/home/modules/i3.nix
+++ b/users/grfn/system/home/modules/i3.nix
@@ -39,15 +39,23 @@ in
   };
 
   config =
-    let decorationFont = "MesloLGSDZ ${toString config.system.machine.i3FontSize}"; in
-    {
-      home.packages = with pkgs; [
-        rofi
-        rofi-pass
-        python38Packages.py3status
-        i3lock
-        i3status
-        dconf # for gtk
+    let
+      fontName = "MesloLGSDZ";
+      fontSize = config.system.machine.i3FontSize;
+      fonts = {
+        names = [ fontName ];
+        size = fontSize * 1.0;
+      };
+      decorationFont = "${fontName} ${toString fontSize}";
+    in
+      {
+        home.packages = with pkgs; [
+          rofi
+          rofi-pass
+          python38Packages.py3status
+          i3lock
+          i3status
+          dconf # for gtk
 
         # Screenshots
         maim
@@ -176,7 +184,7 @@ in
               ]
             );
 
-          fonts = [ decorationFont ];
+          inherit fonts;
 
           colors = with solarized; rec {
             focused = {
@@ -296,7 +304,7 @@ in
                 '';
               in
               "py3status -c ${i3status-conf}";
-            fonts = [ decorationFont ];
+            inherit fonts;
             position = "top";
             colors = with solarized; rec {
               background = base03;
-- 
cgit 1.4.1