From 77e3d687d4d4db1b5df94b5f6595855682e71bee Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 23 Oct 2024 12:10:25 -0500
Subject: [PATCH] added nix language server removed ollama

---
 enviroments/client/default.nix | 13 ++++++++++++-
 users/leyla/default.nix        |  8 ++++----
 users/leyla/packages.nix       |  2 --
 users/leyla/vscode.nix         | 14 +++++++++++---
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/enviroments/client/default.nix b/enviroments/client/default.nix
index 9dfa06b..0e07090 100644
--- a/enviroments/client/default.nix
+++ b/enviroments/client/default.nix
@@ -1,8 +1,16 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [
     ../common
   ];
 
+  nix = {
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+  };
+
   services = {
     # Enable CUPS to print documents.
     printing.enable = true;
@@ -51,6 +59,9 @@
     # helvetica font
     aileron
 
+    # nix langauge server
+    nixd
+
     cachefilesd
 
     gnomeExtensions.dash-to-dock
diff --git a/users/leyla/default.nix b/users/leyla/default.nix
index 48e3c98..2698b8e 100644
--- a/users/leyla/default.nix
+++ b/users/leyla/default.nix
@@ -46,10 +46,10 @@ in {
     );
 
     services = {
-      ollama = {
-        enable = cfg.hasGPU;
-        acceleration = "cuda";
-      };
+      # ollama = {
+      #   enable = cfg.hasGPU;
+      #   acceleration = "cuda";
+      # };
 
       # TODO: this should reference the home directory from the user config
       openssh.hostKeys = [
diff --git a/users/leyla/packages.nix b/users/leyla/packages.nix
index c8c5058..1406f6d 100644
--- a/users/leyla/packages.nix
+++ b/users/leyla/packages.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  config,
   osConfig,
   pkgs,
-  inputs,
   ...
 }: let
   cfg = osConfig.nixos.users.leyla;
diff --git a/users/leyla/vscode.nix b/users/leyla/vscode.nix
index a0dd27c..2da1844 100644
--- a/users/leyla/vscode.nix
+++ b/users/leyla/vscode.nix
@@ -36,10 +36,18 @@ in {
         "cSpell.userWords" = [
           "webdav"
         ];
+        "nix.serverPath" = "nixd";
+        "nix.enableLanguageServer" = true;
+        "nixpkgs" = {
+          "expr" = "import <nixpkgs> {}";
+        };
+        # "fomratting": {
+        #   "command": [ "alejandra" ];
+        # };
       };
 
       extensions = (
-        with extensions.open-vsx;
+        with open-vsx;
           [
             # vs code feel extensions
             ms-vscode.atom-keybindings
@@ -68,10 +76,10 @@ in {
             # misc extensions
             bungcip.better-toml
 
-            open-vsx."10nates".ollama-autocoder
+            # lib.mkIf open-vsx."10nates".ollama-autocoder
           ]
           ++ (
-            with extensions.vscode-marketplace; [
+            with vscode-marketplace; [
               # js extensions
               karyfoundation.nearley
             ]