From 297da93a1e890d214878ecad0fe8b0cdbd3a1db7 Mon Sep 17 00:00:00 2001
From: Nikos Papadakis <nikos@papadakis.xyz>
Date: Fri, 6 Oct 2023 23:46:37 +0300
Subject: [PATCH] nix+nvim

---
 flake.lock                      | 22 ++++------------------
 flake.nix                       | 12 +++++++++---
 home.nix                        |  5 +++++
 nvim/after/plugin/lspconfig.lua | 17 +----------------
 packages.nix                    |  1 -
 5 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6e2e79f..018a563 100644
--- a/flake.lock
+++ b/flake.lock
@@ -82,7 +82,9 @@
     "nil": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -100,22 +102,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1690441914,
-        "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1695360818,
         "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
@@ -136,7 +122,7 @@
         "home-manager": "home-manager",
         "neovim": "neovim",
         "nil": "nil",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "rust-overlay": {
diff --git a/flake.nix b/flake.nix
index 68f69d5..812c10f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,21 +3,27 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     neovim = {
       url = "github:neovim/neovim?dir=contrib";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nil.url = "github:oxalica/nil";
+
+    nil = {
+      url = "github:oxalica/nil";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { nixpkgs, home-manager, neovim, ... }:
     let
-      system = "x86_64-linux";                # change your system type here
-      user = "nikos";                         # change your user here
+      system = "x86_64-linux"; # change your system type here
+      user = "nikos"; # change your user here
       dotfilesHome = "/home/nikos/.dotfiles"; # specify your dotfiles path
       pkgs = nixpkgs.legacyPackages.${system};
     in
diff --git a/home.nix b/home.nix
index 7537703..3484d26 100644
--- a/home.nix
+++ b/home.nix
@@ -59,6 +59,11 @@
     );
   };
 
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }
diff --git a/nvim/after/plugin/lspconfig.lua b/nvim/after/plugin/lspconfig.lua
index 450c289..522a27a 100644
--- a/nvim/after/plugin/lspconfig.lua
+++ b/nvim/after/plugin/lspconfig.lua
@@ -12,21 +12,7 @@ for dir in vim.fs.parents(vim.api.nvim_buf_get_name(0)) do
     end
 end
 
-local border = {
-    { "┌", "FloatBorder" },
-    { "─", "FloatBorder" },
-    { "┐", "FloatBorder" },
-    { "│", "FloatBorder" },
-    { "┘", "FloatBorder" },
-    { "─", "FloatBorder" },
-    { "└", "FloatBorder" },
-    { "│", "FloatBorder" },
-}
-
-local handlers = {
-    ["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }),
-    ["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }),
-}
+vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "single" })
 
 local capabilities = {}
 
@@ -195,6 +181,5 @@ for lsp, settings in pairs(servers) do
     lspconfig[lsp].setup(vim.tbl_extend("force", {
         on_attach = on_attach,
         capabilities = capabilities,
-        handlers = handlers,
     }, settings))
 end
diff --git a/packages.nix b/packages.nix
index 8f3d8f7..be00b19 100644
--- a/packages.nix
+++ b/packages.nix
@@ -6,6 +6,5 @@ pkgs: with pkgs; [
   zoxide # "z" command
   nil # Nix LSP
   nixpkgs-fmt # Nix formatter
-  direnv # Sources .envrc files
   (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) # nerdfonts jetbrains mono
 ]