From afff1e3f445fb9f1a2e48b39b9120fa0658507bb Mon Sep 17 00:00:00 2001
From: Greg Burd <greg@burd.me>
Date: Sun, 24 Sep 2023 16:01:30 -0400
Subject: [PATCH] fixes

---
 home/gburd/features/cli/fish.nix                      |  4 ++--
 .../features/desktop/common/gnome-wm/default.nix      |  2 +-
 home/gburd/features/desktop/common/gtk.nix            |  1 -
 home/gburd/features/desktop/gnome/default.nix         |  2 +-
 hosts/common/optional/gnome.nix                       | 11 ++++++++++-
 hosts/common/secrets.yaml                             |  6 +++---
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/home/gburd/features/cli/fish.nix b/home/gburd/features/cli/fish.nix
index 90d421d..6329012 100644
--- a/home/gburd/features/cli/fish.nix
+++ b/home/gburd/features/cli/fish.nix
@@ -85,7 +85,7 @@ in
       # Use Emacs bindings and cursors
       # https://gist.githubusercontent.com/zuigon/8852793/raw/770d705897112a870adc2b27d056a61892aa3a9a/keybindings.fish
       ''
-        function fish_enable_emacs_key_bindings -d "Default (Emacs-like) key bindings for fish"
+        function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fish"
 
         	# Clear earlier bindings, if any
         	bind --erase --all
@@ -214,7 +214,7 @@ in
         			bind \eOd backward-word
         	end
         end
-        fish_enable_emacs_key_bindings
+        fish_default_key_bindings
       '' +
       # Use vim bindings and cursors
       ''
diff --git a/home/gburd/features/desktop/common/gnome-wm/default.nix b/home/gburd/features/desktop/common/gnome-wm/default.nix
index b016572..dabc9e7 100644
--- a/home/gburd/features/desktop/common/gnome-wm/default.nix
+++ b/home/gburd/features/desktop/common/gnome-wm/default.nix
@@ -33,7 +33,7 @@
   # ]
   # };
 #  dbus.packages = [ pkgs.gnome.dconf ];
-#  udev.packages = [ pkgs.gnome.gnome-settings-daemon ];
+#  udev.packages = [ pkgs.gnome.gnome-settings-
 
   home.sessionVariables = {
     MOZ_ENABLE_WAYLAND = 1;
diff --git a/home/gburd/features/desktop/common/gtk.nix b/home/gburd/features/desktop/common/gtk.nix
index b1df2c3..397a78d 100644
--- a/home/gburd/features/desktop/common/gtk.nix
+++ b/home/gburd/features/desktop/common/gtk.nix
@@ -19,7 +19,6 @@ rec {
       package = pkgs.papirus-icon-theme;
     };
   };
-
   services.xsettingsd = {
     enable = true;
     settings = {
diff --git a/home/gburd/features/desktop/gnome/default.nix b/home/gburd/features/desktop/gnome/default.nix
index b6bfb2d..7041143 100644
--- a/home/gburd/features/desktop/gnome/default.nix
+++ b/home/gburd/features/desktop/gnome/default.nix
@@ -7,11 +7,11 @@
   ];
 
   home.packages = with pkgs; [
-    firefox
     emacs
     ungoogled-chromium
     gnupg
     pinentry
+    alacritty
   ];
   # dconf
   # settings reset org.gnome.desktop.input-sources xkb-options
diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix
index ade2ed5..3581c88 100644
--- a/hosts/common/optional/gnome.nix
+++ b/hosts/common/optional/gnome.nix
@@ -1,7 +1,9 @@
+{ pkgs, ...}:
 {
   services = {
     xserver = {
       enable = true;
+      dpi = 180;
       displayManager.gdm = {
         enable = true;
         wayland = true;
@@ -10,14 +12,21 @@
       desktopManager.gnome = {
         enable = true;
       };
+      excludePackages = [ pkgs.xterm ];
     };
-    excludePackages = [ pkgs.xterm ];
     geoclue2.enable = true;
     gnome.games.enable = true;
   };
   networking.networkmanager.enable = true;
   services.avahi.enable = true;
 
+#  console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
+  environment.variables = {
+    GDK_SCALE = "2";
+    GDK_DPI_SCALE = "0.5";
+    _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2";
+  };
+
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.avahi.nssmdns = true;
diff --git a/hosts/common/secrets.yaml b/hosts/common/secrets.yaml
index 19dd54c..2b150ec 100644
--- a/hosts/common/secrets.yaml
+++ b/hosts/common/secrets.yaml
@@ -1,4 +1,4 @@
-gburd-password: ENC[AES256_GCM,data:HeqIOCoi/qlK,iv:sMBEoJGEW+y9YkWZ47yu3nHu3A2BWOhpK4420kO7JDI=,tag:WRF7ymBrQdXUI2uLajMROg==,type:str]
+gburd-password: ENC[AES256_GCM,data:HFgg11lJrsrdHYBGOCWYDkFkE8aRPW++Q8Yhw6QeqbFmmFqx9NVo5WFQCa2dVT9uLDhCLN3uDbMgOrcwtRBxP58byOSQtCo895PqV4ICa/+s00ZrWXpD3oeMNNlqfIGtbw5Iq8CUkFBMDA==,iv:U/+fOgtpynPhyJN8F1pVljzzp/EcTlQVcdSaPeAp6Oc=,tag:8OeZ2C+UB1cF63Zx76RBMQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -14,8 +14,8 @@ sops:
             SXIzUTBLQklXemM4anBNdnhhMGc5V2sKmIExI6uv2EgL2WTuBITlc98uAN4SQBDL
             kj6f8gQtJCXTyWFyZxcR1Z1f8q53R1ZmsKJv9a3oD4bx9riTjauC7w==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-09-22T14:23:05Z"
-    mac: ENC[AES256_GCM,data:nnyE4mkLzoA9zytDBu56osVMFhLe5YzTaeDgN4z4dTfbnN+o8Mw1D++pny8NbtmXPkX/lo360zV/j0RfvI5kWUI0RswudkCnnPE59jm+uz4F0nZlYErMBGJ7B16VCwictD0vIDGt01Vc/ubPHU/NTjgJ1MZYWaNFg4EGB+RHDOw=,iv:2u1GSBfRzCy1BU69M51drIfpcFLigCFhpb5JS1s/zao=,tag:jpgUyelKC1C1SUggA0rf6Q==,type:str]
+    lastmodified: "2023-09-24T19:58:35Z"
+    mac: ENC[AES256_GCM,data:oarapuONmPho6htg2U5wh1SR7PjpYKVkSfI0pJRvsSqNiPYY+euRTSm7aZYC4rxwgWSvMkwsqZtoHnZox0Aw1BrEEoZZrne1nI94wquc0ubGLZg1R117iUFZUwSe3JoA9vZIgP/mGZ2yyJcmqIwFog3BUSfW2gN0S11sF6Gzozs=,iv:AikPqPuVHTdrYkReXHO4qv+ByrPfwz0PKXWkxa/cFZ8=,tag:l82987HvZjxXDbm7kjeVmQ==,type:str]
     pgp:
         - created_at: "2023-09-22T14:23:05Z"
           enc: |-