From 1c033b2a25e9c5433f08b7369bc0e43d469dae00 Mon Sep 17 00:00:00 2001
From: Patrick Neff <odie86@gmail.com>
Date: Sun, 28 Jul 2024 21:07:14 +0200
Subject: [PATCH] fixes

---
 modules/home-manager/shell/zsh/default.nix  |  1 +
 modules/nixvim/options.nix                  |  2 +-
 modules/nixvim/plugins/lsp/cmp.nix          |  1 +
 modules/nixvim/plugins/lsp/languages/go.nix |  1 +
 profiles/home-manager/odie@wsl-dev/home.nix | 10 +++++++---
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/home-manager/shell/zsh/default.nix b/modules/home-manager/shell/zsh/default.nix
index 023eaf1..efba528 100644
--- a/modules/home-manager/shell/zsh/default.nix
+++ b/modules/home-manager/shell/zsh/default.nix
@@ -34,6 +34,7 @@
         plugins = [
           { name = "zdharma-continuum/fast-syntax-highlighting"; }
           { name = "nix-community/nix-zsh-completions"; }
+          { name = "zsh-users/zsh-completions"; }
         ];
       };
       envExtra = ''
diff --git a/modules/nixvim/options.nix b/modules/nixvim/options.nix
index 91cf697..c006f6d 100644
--- a/modules/nixvim/options.nix
+++ b/modules/nixvim/options.nix
@@ -15,6 +15,7 @@ in {
     globals = {
       mapleader = " ";
       maplocalleader = ",";
+      inlay_hints_visible = true;
     };
     opts = {
       termguicolors = true;
@@ -75,7 +76,6 @@ in {
       xz
       icu74
       alejandra
-      nixpkgs-fmt
       vscode-extensions.ms-vscode.cpptools
     ];
     extraPlugins = with pkgs.vimPlugins; [
diff --git a/modules/nixvim/plugins/lsp/cmp.nix b/modules/nixvim/plugins/lsp/cmp.nix
index d733223..4a985c9 100644
--- a/modules/nixvim/plugins/lsp/cmp.nix
+++ b/modules/nixvim/plugins/lsp/cmp.nix
@@ -218,6 +218,7 @@
               ['<C-f>'] = cmp.mapping.scroll_docs(4),
               ['<C-Space>'] = cmp.mapping.complete(),
               ['<C-e>'] = cmp.mapping.abort(),
+              ['<CR>'] = cmp.mapping.confirm({ select = true }),
             })";
           };
           sources = [
diff --git a/modules/nixvim/plugins/lsp/languages/go.nix b/modules/nixvim/plugins/lsp/languages/go.nix
index 211f346..c0d9378 100644
--- a/modules/nixvim/plugins/lsp/languages/go.nix
+++ b/modules/nixvim/plugins/lsp/languages/go.nix
@@ -12,6 +12,7 @@
             gopls = {
               gofumpt = true;
               staticcheck = true;
+              local = "github.com/masterodie";
               directoryFilters = ["-.git" "-.vscode" "-.idea" "-.vscode-test" "-node_modules"];
               semanticTokens = true;
               completeUnimported = true;
diff --git a/profiles/home-manager/odie@wsl-dev/home.nix b/profiles/home-manager/odie@wsl-dev/home.nix
index 65df2a9..6539dfd 100644
--- a/profiles/home-manager/odie@wsl-dev/home.nix
+++ b/profiles/home-manager/odie@wsl-dev/home.nix
@@ -1,6 +1,6 @@
-{
-  outputs,
-  ...
+{ outputs
+, pkgs
+, ...
 }: {
   imports = [
     outputs.homeManagerModules.base
@@ -8,4 +8,8 @@
     outputs.homeManagerModules.shell
     outputs.homeManagerModules.development
   ];
+
+  home.packages = with pkgs; [
+    go
+  ];
 }