From 4966b26ec4f629cea71527e4f9f299d891edf3ed Mon Sep 17 00:00:00 2001
From: Jo <jo@thevoid.cafe>
Date: Tue, 3 Dec 2024 18:24:27 +0100
Subject: [PATCH] feat: update VSCodium configuration feat: add nil language
 server refactor: remove unnecessary ssh config content

---
 .../jo@puzzlevision/apps/vscodium.nix         |  6 +++-
 .../x86_64-linux/jo@puzzlevision/default.nix  |  1 +
 modules/home/common/ssh/default.nix           | 31 +------------------
 modules/nixos/common/nix/default.nix          |  5 +++
 4 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/homes/x86_64-linux/jo@puzzlevision/apps/vscodium.nix b/homes/x86_64-linux/jo@puzzlevision/apps/vscodium.nix
index df73f29..162d682 100644
--- a/homes/x86_64-linux/jo@puzzlevision/apps/vscodium.nix
+++ b/homes/x86_64-linux/jo@puzzlevision/apps/vscodium.nix
@@ -9,7 +9,7 @@
     enable = true;
     package = pkgs.vscodium;
     extensions = with pkgs.vscode-extensions; [
-      wakatime.vscode-wakatime # Wakatime for coding statistics
+      # wakatime.vscode-wakatime # Wakatime for coding statistics
       vue.volar # Vue support
       svelte.svelte-vscode # Svelte support
       pkief.material-icon-theme # Material icons
@@ -20,5 +20,9 @@
       catppuccin.catppuccin-vsc # Catppuccin theme
       jnoortheen.nix-ide # Nix language support
     ];
+    userSettings = {
+      "nix.enableLanguageServer" = true;
+      "nix.serverPath" = "nil";
+    };
   };
 }
\ No newline at end of file
diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix
index 22ba317..962af4d 100644
--- a/homes/x86_64-linux/jo@puzzlevision/default.nix
+++ b/homes/x86_64-linux/jo@puzzlevision/default.nix
@@ -57,6 +57,7 @@
     bun
     devenv
     python39
+    nil
 
     ### Rust development specific
     rustup
diff --git a/modules/home/common/ssh/default.nix b/modules/home/common/ssh/default.nix
index 153adc0..308e074 100644
--- a/modules/home/common/ssh/default.nix
+++ b/modules/home/common/ssh/default.nix
@@ -5,37 +5,8 @@
   namespace,
   config,
   ...
-}: let
-  sshDir = "${config.home.homeDirectory}/.ssh";
-in {
+}: {
   home.packages = with pkgs; [
     openssh
   ];
-
-  programs.ssh = {
-    enable = true;
-    extraConfig = ''
-      AddKeysToAgent yes
-    '';
-
-    matchBlocks = {
-      "github.com" = {
-        identityFile = "${sshDir}/id_ed25519";
-        identitiesOnly = true;
-        user = "git";
-      };
-
-      "gitlab.com" = {
-        identityFile = "${sshDir}/id_ed25519";
-        identitiesOnly = true;
-        user = "git";
-      };
-
-      "bitbucket.org" = {
-        identityFile = "${sshDir}/id_ed25519";
-        identitiesOnly = true;
-        user = "git";
-      };
-    };
-  };
 }
diff --git a/modules/nixos/common/nix/default.nix b/modules/nixos/common/nix/default.nix
index b35f5a1..af572d0 100644
--- a/modules/nixos/common/nix/default.nix
+++ b/modules/nixos/common/nix/default.nix
@@ -32,6 +32,11 @@ in {
         options = "--delete-older-than 3d";
       };
 
+      extraOptions = ''
+        extra-substituters = https://devenv.cachix.org
+        extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
+      '';
+
       package = mkIf cfg.use-lix pkgs.lix; # Enable LIX
     };
   };