diff options
author | Griffin Smith <grfn@gws.fyi> | 2022-02-01T16·08-0500 |
---|---|---|
committer | grfn <grfn@gws.fyi> | 2022-02-01T16·57+0000 |
commit | a0ce1f6a9ac5f663f44532612eaf0d1beb16ab8f (patch) | |
tree | 93f25de68c46c3dfd29c565f718a6fcec4da2208 /users/grfn | |
parent | 6e3432383fe97e38ec14b096cc3fc2e73fcd598a (diff) |
chore(grfn/home): Rename deprecated options r/3738
Change-Id: Ic209f46858d9834298d151d7c6b884f6d6f23dbe Reviewed-on: https://cl.tvl.fyi/c/depot/+/5158 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/grfn')
-rw-r--r-- | users/grfn/system/home/modules/emacs.nix | 2 | ||||
-rw-r--r-- | 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; |