From 84d4741d98ca59e2f1df901b4ab1fd6cc2652dd2 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Tue, 7 Oct 2025 18:24:21 +0100
Subject: [PATCH] various updates

---
 home/macs.nix            |  3 ++-
 home/packages.nix        |  4 +++-
 home/vim-dev/default.nix |  2 +-
 home/vim-dev/dev.lua     | 11 +++++++++++
 home/vscode.nix          |  2 ++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/home/macs.nix b/home/macs.nix
index eb756d1..fd035a0 100644
--- a/home/macs.nix
+++ b/home/macs.nix
@@ -16,5 +16,6 @@
     extraOptions."IdentityAgent" =
       "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
   };
-  programs.zsh.initContent = "eval $(/opt/homebrew/bin/brew shellenv)";
+  programs.zsh.sessionVariables.SSH_AUTH_SOCK = "$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
+  programs.zsh.initExtra = "eval $(/opt/homebrew/bin/brew shellenv)";
 }
diff --git a/home/packages.nix b/home/packages.nix
index 377b318..fbbec19 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -13,16 +13,17 @@ rec {
     unzip
     vim
     wget
+    helix
   ];
 
   # Networking shit
   net = [
     dig
     iperf3
+    mtr
     nmap
     socat
     tcpdump
-    whois
   ];
 
   # development tools
@@ -32,6 +33,7 @@ rec {
     gh
     glab
     hexyl
+    attic-client
   ];
 
   all = base ++ net ++ dev;
diff --git a/home/vim-dev/default.nix b/home/vim-dev/default.nix
index 7b0875c..ae410f1 100644
--- a/home/vim-dev/default.nix
+++ b/home/vim-dev/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  home.packages = with pkgs; [ nil ];
+  home.packages = with pkgs; [ nil nixd ];
   programs.neovim.plugins =
     with pkgs.vimPlugins;
     [
diff --git a/home/vim-dev/dev.lua b/home/vim-dev/dev.lua
index 311c78b..c2b543d 100644
--- a/home/vim-dev/dev.lua
+++ b/home/vim-dev/dev.lua
@@ -54,6 +54,10 @@ require'lspconfig'.nil_ls.setup{
   on_attach = on_attach,
   capabilities = capabilities,
 }
+require'lspconfig'.nixd.setup{
+  on_attach = on_attach,
+  capabilities = capabilities,
+}
 require'lspconfig'.rust_analyzer.setup{
   on_attach = on_attach,
   capabilities = capabilities,
@@ -71,6 +75,13 @@ require'lspconfig'.rust_analyzer.setup{
       description = 'Open documentation for the symbol under the cursor in default browser',
     },
   },
+  settings = {
+    ["rust-analyzer"] = {
+      procMacro = {
+        enable = false,
+      },
+    },
+  },
 }
 require'lspconfig'.dhall_lsp_server.setup{
   on_attach = on_attach,
diff --git a/home/vscode.nix b/home/vscode.nix
index 55ccef7..0987d43 100644
--- a/home/vscode.nix
+++ b/home/vscode.nix
@@ -14,7 +14,9 @@
       "update.mode" = "none";
       "window.autoDetectColorScheme" = true;
       "workbench.preferredDarkColorTheme" = "Gruvbox Dark Hard";
+      "workbench.preferredLightColorTheme" = "Gruvbox Light Hard";
       "files.trimTrailingWhitespace" = true;
+      "emmet.includeLanguages"."django-html" = "html";
       # Don't try to write to the nix-managed .ssh/config
       "remote.SSH.configFile" = "~/.ssh/config.local";
       "editor.rulers" = [ 90 ];