From 9d5266e6130a4f858b11e96b95b3f45ec95c38cd Mon Sep 17 00:00:00 2001
From: ElKowar <5300871+elkowar@users.noreply.github.com>
Date: Mon, 24 Jan 2022 19:44:43 +0100
Subject: [PATCH] Fix stuff (#6)

---
 nvim/.config/nvim/fnl/dots/plugins.fnl        |  1 +
 nvim/.config/nvim/fnl/dots/plugins/feline.fnl |  2 +
 nvim/.config/nvim/fnl/dots/plugins/lsp.fnl    |  4 --
 zsh/.config/zsh/.zshrc                        | 45 ++++++++++++++-----
 zsh/.zshenv                                   |  1 +
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl
index 78d9f27..d7b22e1 100644
--- a/nvim/.config/nvim/fnl/dots/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins.fnl
@@ -33,6 +33,7 @@
   ; sort me pls
 
   :github/copilot.vim {:opt true :cmd ["Copilot"]}
+  :lervag/vimtex {:opt false}
 
   :lervag/vimtex {:opt false 
                   :setup #(require :dots.plugins.vimtex)}
diff --git a/nvim/.config/nvim/fnl/dots/plugins/feline.fnl b/nvim/.config/nvim/fnl/dots/plugins/feline.fnl
index b07e403..728ac66 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/feline.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/feline.fnl
@@ -62,6 +62,8 @@
                        (.. msg.title " " msg.message)))]
      (or-empty (str.join " | " s))))
 
+
+
 (defn lsp-diagnostic-component [kind color]
   {:enabled #(~= 0 (length (vim.diagnostic.get 0 {:severity kind})))
    :provider #(spaces (length (vim.diagnostic.get 0 {:severity kind})))
diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
index cdabe87..54b699c 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -97,7 +97,6 @@
                           ;:settings {:ltex {:enabled ["latex" "tex"]
                                             ;:additionalRules {:motherTongue "de-DE"}}}})
 
-
                                               
 (init-lsp :cssls {:filestypes ["css" "scss" "less" "stylus"]
                   :root_dir (lsp.util.root_pattern ["package.json" ".git"])
@@ -135,8 +134,6 @@
                                             (vim.fn.expand "$VIMRUNTIME/lua/vim/lsp") true}}
                       :telemetry false}}}))
 
-
-
 (comment
   (when (not lsp.prolog_lsp)
     (tset lsp-configs :prolog_lsp
@@ -160,7 +157,6 @@
       (init-lsp :ewwls))))
 
 
-
 ; Idris2 ----------------------------------------------------------- <<<<<
 
 (def autostart-semantic-highlighting true)
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index d482e67..d0c717b 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -10,20 +10,45 @@ setopt EXTENDED_HISTORY
 setopt SHARE_HISTORY
 
 
-if [[ ! -f $HOME/.zinit/bin/zinit.zsh ]]; then
-    print -P "%F{33}▓▒░ %F{220}Installing %F{33}DHARMA%F{220} Initiative Plugin Manager (%F{33}zdharma/zinit%F{220})…%f"
-    command mkdir -p "$HOME/.zinit" && command chmod g-rwX "$HOME/.zinit"
-    command git clone https://github.com/zdharma/zinit "$HOME/.zinit/bin" && \
-        print -P "%F{33}▓▒░ %F{34}Installation successful.%f%b" || \
-        print -P "%F{160}▓▒░ The clone has failed.%f%b"
+
+### Added by Zinit's installer
+if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
+    print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
+    command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
+    command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
+        print -P "%F{33} %F{34}Installation successful.%f%b" || \
+        print -P "%F{160} The clone has failed.%f%b"
 fi
 
-source "$HOME/.zinit/bin/zinit.zsh"
+source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
 autoload -Uz _zinit
 (( ${+_comps} )) && _comps[zinit]=_zinit
 
-zinit snippet OMZP::git
-zinit wait lucid for "zsh-users/zsh-completions"
+# Load a few important annexes, without Turbo
+# (this is currently required for annexes)
+zinit light-mode for \
+    zdharma-continuum/zinit-annex-as-monitor \
+    zdharma-continuum/zinit-annex-bin-gem-node \
+    zdharma-continuum/zinit-annex-patch-dl \
+    zdharma-continuum/zinit-annex-rust
+
+### End of Zinit's installer chunk
+
+
+# if [[ ! -f $HOME/.zinit/bin/zinit.zsh ]]; then
+#     print -P "%F{33}▓▒░ %F{220}Installing %F{33}DHARMA%F{220} Initiative Plugin Manager (%F{33}zdharma/zinit%F{220})…%f"
+#     command mkdir -p "$HOME/.zinit" && command chmod g-rwX "$HOME/.zinit"
+#     command git clone https://github.com/zdharma/zinit "$HOME/.zinit/bin" && \
+#         print -P "%F{33}▓▒░ %F{34}Installation successful.%f%b" || \
+#         print -P "%F{160}▓▒░ The clone has failed.%f%b"
+# fi
+# 
+# source "$HOME/.zinit/bin/zinit.zsh"
+# autoload -Uz _zinit
+# (( ${+_comps} )) && _comps[zinit]=_zinit
+# 
+# zinit snippet OMZP::git
+# zinit wait lucid for "zsh-users/zsh-completions"
 
 # compinit must be ran before fzf-tab, but fzf-tab must be before syntax highlighting etc
 autoload -Uz compinit
@@ -33,7 +58,7 @@ zinit light "Aloxaf/fzf-tab"
 
 zinit wait lucid for \
     "zsh-users/zsh-history-substring-search" \
-    "zdharma/fast-syntax-highlighting" \
+    "zdharma-continuum/fast-syntax-highlighting" \
     "zsh-users/zsh-autosuggestions" \
     "olets/zsh-abbr" \
     "sudosubin/zsh-github-cli" \
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 558223f..631a27a 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1 +1,2 @@
 ZDOTDIR=$HOME/.config/zsh
+. "$HOME/.cargo/env"