From a48688c6458d1c47c339e115d788010224be54e7 Mon Sep 17 00:00:00 2001
From: Greg Burd <greg@burd.me>
Date: Tue, 19 Sep 2023 14:17:19 -0400
Subject: [PATCH] fixes

---
 home/gburd/features/cli/default.nix   |  2 +-
 home/gburd/features/cli/gpg.nix       |  3 ++-
 home/gburd/features/nvim/lsp.nix      |  5 -----
 home/gburd/features/nvim/syntaxes.nix |  6 ------
 hosts/common/optional/cups.nix        |  4 ----
 hosts/common/optional/gnome.nix       | 10 +++++++---
 hosts/loki/default.nix                |  1 +
 overlays/default.nix                  |  3 ++-
 8 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 hosts/common/optional/cups.nix

diff --git a/home/gburd/features/cli/default.nix b/home/gburd/features/cli/default.nix
index c871136..365fdce 100644
--- a/home/gburd/features/cli/default.nix
+++ b/home/gburd/features/cli/default.nix
@@ -41,6 +41,6 @@
 
     tly # Tally counter
 
-    inputs.nh.default # nixos-rebuild and home-manager CLI wrapper
+#    inputs.nh.default # nixos-rebuild and home-manager CLI wrapper
   ];
 }
diff --git a/home/gburd/features/cli/gpg.nix b/home/gburd/features/cli/gpg.nix
index a74ca35..8f932cb 100644
--- a/home/gburd/features/cli/gpg.nix
+++ b/home/gburd/features/cli/gpg.nix
@@ -10,7 +10,8 @@ let
     };
 in
 {
-  home.packages = pinentry.packages;
+#  home.packages = pinentry.packages;
+  home.packages = [ pkgs.pinentry-curses ];
 
   services.gpg-agent = { #TODO: gnupg vs gpg-agent ?
     enable = true;
diff --git a/home/gburd/features/nvim/lsp.nix b/home/gburd/features/nvim/lsp.nix
index 56a81e5..6b072ad 100644
--- a/home/gburd/features/nvim/lsp.nix
+++ b/home/gburd/features/nvim/lsp.nix
@@ -17,11 +17,6 @@
         add_lsp("clangd", lspconfig.clangd, {})
         add_lsp("nil", lspconfig.nil_ls, {})
         add_lsp("pylsp", lspconfig.pylsp, {})
-        add_lsp("dart", lspconfig.dartls, {})
-        add_lsp("haskell-language-server", lspconfig.hls, {
-          cmd_args = { "--lsp" }
-        })
-        add_lsp("kotlin-language-server", lspconfig.kotlin_language_server, {})
         add_lsp("solargraph", lspconfig.solargraph, {})
         add_lsp("phpactor", lspconfig.phpactor, {})
         add_lsp("terraform-ls", lspconfig.terraformls, {
diff --git a/home/gburd/features/nvim/syntaxes.nix b/home/gburd/features/nvim/syntaxes.nix
index fe180a4..ed63777 100644
--- a/home/gburd/features/nvim/syntaxes.nix
+++ b/home/gburd/features/nvim/syntaxes.nix
@@ -12,15 +12,9 @@
     '';
     plugins = with pkgs.vimPlugins; [
       rust-vim
-      dart-vim-plugin
-      plantuml-syntax
       vim-markdown
       vim-nix
       vim-toml
-      vim-syntax-shakespeare
-      gemini-vim-syntax
-      kotlin-vim
-      haskell-vim
       mermaid-vim
       pgsql-vim
       vim-terraform
diff --git a/hosts/common/optional/cups.nix b/hosts/common/optional/cups.nix
deleted file mode 100644
index 771c5d7..0000000
--- a/hosts/common/optional/cups.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-}
\ No newline at end of file
diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix
index 2347828..94a1cf3 100644
--- a/hosts/common/optional/gnome.nix
+++ b/hosts/common/optional/gnome.nix
@@ -14,7 +14,11 @@
     geoclue2.enable = true;
     gnome.games.enable = true;
   };
-  # Fix broken stuff
-  services.avahi.enable = false;
-  networking.networkmanager.enable = false;
+  services.avahi.enable = true;
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+  services.avahi.nssmdns = true;
+  # for a WiFi printer
+  services.avahi.openFirewall = true;
+  networking.networkmanager.enable = true;
 }
diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix
index c7710e3..8545589 100644
--- a/hosts/loki/default.nix
+++ b/hosts/loki/default.nix
@@ -9,6 +9,7 @@
     ../common/global
     ../common/users/gburd
 
+    ../common/optional/gnome.nix
     ../common/optional/cups.nix
     ../common/optional/x11-keymap.nix
     ../common/optional/gamemode.nix
diff --git a/overlays/default.nix b/overlays/default.nix
index 9f4fa7d..ae815c2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -42,7 +42,8 @@ in
     # https://github.com/NixOS/nix/issues/5567#issuecomment-1193259926
     # nix = addPatches prev.nix [ ./nix-make-installables-expr-context.patch ];
 
-    xdg-utils-spawn-terminal = addPatches prev.xdg-utils [ ./xdg-open-spawn-terminal.diff ];
+    # xdg-utils-spawn-terminal = addPatches prev.xdg-utils [ ./xdg-open-spawn-terminal.diff ];
+    xdg-utils-spawn-terminal = prev.xdg-utils;
 
     pfetch = prev.pfetch.overrideAttrs (oldAttrs: {
       version = "unstable-2021-12-10";