From b14753a625914d45ebfc26428f676cf622cfa4a8 Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Wed, 28 Feb 2024 07:16:21 +0100
Subject: [PATCH] Fix typst setup, and install leechblock

---
 home/features/desktop/firefox/default.nix          |  1 +
 .../neovim/config/lua/my/plugins/lspconfig.lua     | 14 ++++----------
 home/features/neovim/default.nix                   |  2 +-
 hosts/nixos/tethys/default.nix                     |  4 ++--
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/home/features/desktop/firefox/default.nix b/home/features/desktop/firefox/default.nix
index e15e2f6..7d468c8 100644
--- a/home/features/desktop/firefox/default.nix
+++ b/home/features/desktop/firefox/default.nix
@@ -73,6 +73,7 @@ in
             bitwarden # Password manager
             blocktube # Lets you block youtube channels
             dearrow # Crowdsourced clickbait remover 💀
+            leechblock-ng # website blocker
             lovely-forks # displays forks on github
             octolinker # github import to link thingy
             octotree # github file tree
diff --git a/home/features/neovim/config/lua/my/plugins/lspconfig.lua b/home/features/neovim/config/lua/my/plugins/lspconfig.lua
index 335db53..0e25357 100644
--- a/home/features/neovim/config/lua/my/plugins/lspconfig.lua
+++ b/home/features/neovim/config/lua/my/plugins/lspconfig.lua
@@ -16,6 +16,7 @@ local M = {
 -- {{{ Capabilities
 M.capabilities = function()
   local c = require("cmp_nvim_lsp").default_capabilities()
+
   -- Add folding capabilities
   c.textDocument.foldingRange = {
     dynamicRegistration = false,
@@ -115,21 +116,14 @@ function M.config()
     ---@diagnostic disable-next-line: missing-fields
     jsonls = {},
     dhall_lsp_server = {},
-    typst_lsp = {},
+    typst_lsp = {
+      exportPdf = "onType",
+    },
     ---@diagnostic disable-next-line: missing-fields
     elmls = {},
-    -- {{{ Inactive
-    -- pylsp = {},
-    -- pyright = {},
-    -- }}}
   }
   -- }}}
 
-  vim.lsp.handlers["textDocument/hover"] =
-    vim.lsp.with(vim.lsp.handlers.hover, { border = "single" })
-  vim.lsp.handlers["textDocument/signatureHelp"] =
-    vim.lsp.with(vim.lsp.handlers.signature_help, { border = "single" })
-
   local capabilities = M.capabilities()
   for lsp, details in pairs(servers) do
     details.capabilities = capabilities
diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix
index 26c96ac..5c5ee55 100644
--- a/home/features/neovim/default.nix
+++ b/home/features/neovim/default.nix
@@ -1236,7 +1236,7 @@ let
         # {{{ typst support
         typst = {
           package = "kaarmu/typst.vim";
-          dependencies.nix = [ pkgs.typst-lsp pkgs.typst-fmt ];
+          dependencies.nix = [ pkgs.typst pkgs.typst-lsp pkgs.typstfmt ];
 
           cond = blacklist "vscode";
           ft = "typst";
diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix
index 619f532..20e525d 100644
--- a/hosts/nixos/tethys/default.nix
+++ b/hosts/nixos/tethys/default.nix
@@ -40,8 +40,8 @@
   programs.kdeconnect.enable = true;
   programs.firejail.enable = true;
   programs.extra-container.enable = true;
-  virtualisation.docker.enable = true;
-  virtualisation.spiceUSBRedirection.enable = true;
+  # virtualisation.docker.enable = true;
+  # virtualisation.spiceUSBRedirection.enable = true; # This was required for the vm usb passthrough tomfoolery
   # }}}
   # {{{ Ad-hoc stylix targets
   # TODO: include this on all gui hosts