From c577c214d03cc1b99265681243ed8d0013b40605 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Sun, 3 Dec 2023 14:34:11 +0100
Subject: Add odin lsp

---
 config/fish/config.fish     | 3 +++
 config/nvim/lua/plugins.lua | 6 +++++-
 config/x11/xinitrc          | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/fish/config.fish b/config/fish/config.fish
index f99b3ad..ac67f57 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -14,6 +14,9 @@ set -gx PATH "$PATH:$HOME/.local/share/go/bin"
 set -gx PATH "$PATH:$HOME/.local/share/cargo/bin"
 set -gx PATH "$PATH:$HOME/.local/share/npm/bin"
 set -gx PATH "$PATH:$HOME/.local/bin"
+# odin specific, remove later (http://odin-lang.org/docs/install/#for-linux-and-other-nix)
+set -gx PATH "$PATH:$HOME/git/odin"
+set -gx PATH "$PATH:$HOME/git/ols"
 
 # applications
 set -gx EDITOR 'nvim'
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index b4cb0ee..e53a411 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -68,7 +68,7 @@ return require("packer").startup(function()
     -- nvim lsp configuration
     use {
         "neovim/nvim-lspconfig",
-        ft = {"rust", "python", "c", "cpp", "lua", "go", "haskell", "ocaml", "zig", "yaml"},
+        ft = {"rust", "python", "c", "cpp", "lua", "go", "haskell", "ocaml", "zig", "yaml", "odin"},
         config = function()
             vim.diagnostic.config {
                 signs = false,
@@ -185,6 +185,7 @@ return require("packer").startup(function()
                     }
                 }
             }
+            lspconfig.ols.setup{ on_attach = on_attach }
         end,
     }
 
@@ -388,14 +389,17 @@ return require("packer").startup(function()
                     "haskell",
                     "json",
                     "lua",
+                    "make",
                     "markdown",
                     "meson",
+                    "odin",
                     "python",
                     "query",
                     "rust",
                     "vim",
                     "vimdoc",
                     "yaml",
+                    "zig",
                 },
                 highlight = {
                     enable = true
diff --git a/config/x11/xinitrc b/config/x11/xinitrc
index 7242d46..136fe0f 100755
--- a/config/x11/xinitrc
+++ b/config/x11/xinitrc
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# keynav daemonize               # moving the cursor around without the mouse
+keynav daemonize               # moving the cursor around without the mouse
 redshift &                     # filter blue light
 dunst &                        # notification daemon
 unclutter --timeout 10 --fork  # hide mouse after 10s
-- 
cgit