From 12b80a63512a61ecfebf57e318bb062cd9d7365f Mon Sep 17 00:00:00 2001
From: ElKowar <5300871+elkowar@users.noreply.github.com>
Date: Fri, 18 Mar 2022 12:56:27 +0100
Subject: [PATCH] merge

---
 nvim/.config/nvim/fnl/dots/plugins/lsp.fnl | 3 +++
 nvim/.config/nvim/fnl/dots/utils.fnl       | 6 ++++--
 sway/.config/sway/config                   | 1 +
 zsh/.config/zsh/.zshrc                     | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
index 7055a87..ea9b3d5 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -78,6 +78,9 @@
                                    ;:disabledRules        {:de-DE [":~/.config/ltex-ls/disabledRules.txt"]}
                                    ;:hiddenFalsePositives {:de-DE [":~/.config/ltex-ls/hiddenFalsePositives.txt"]}
                                    ;:additionalRules {:motherTongue "de-DE"}}}})
+(init-lsp :vls)
+;(init-lsp :clangd)
+;(init-lsp :ccls)
 
 
 (init-lsp :powershell_es {:bundle_path "/home/leon/powershell"})
diff --git a/nvim/.config/nvim/fnl/dots/utils.fnl b/nvim/.config/nvim/fnl/dots/utils.fnl
index 83dca1c..27699fb 100644
--- a/nvim/.config/nvim/fnl/dots/utils.fnl
+++ b/nvim/.config/nvim/fnl/dots/utils.fnl
@@ -49,8 +49,10 @@
 
 (defn map-values [f t]
   "Map over the values of a table, keeping the keys intact"
-  (collect [k v (pairs t)]
-    k (f v)))
+  (let [tbl {}]
+    (each [k v (pairs t)] (tset tbl k (f v)))
+    tbl))
+
 
 
 (defn without-keys [keys t]
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index ef0900a..457e0ac 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -253,6 +253,7 @@ bar {
     #font "Terminus (TTF)"
     height 20
 
+
     colors {
         statusline #ebdbb2
         background #1d202100
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 9ea124f..fd9a2c4 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -2,7 +2,7 @@
 # history config
 HISTSIZE=50000
 SAVEHIST=50000
-HISTFILE="$XDG_CACHE_HOME"/zsh/history
+HISTFILE="/home/leon/.cache/zsh/history"
 setopt HIST_SAVE_NO_DUPS
 setopt HIST_IGNORE_ALL_DUPS
 #setopt INC_APPEND_HISTORY