Merge branch 'master' into arch-laptop

config/.Xresources

@@ -5,7 +5,8 @@ Xft.dpi: 192
 ! .alpha: 0.2
 
 font: monospace:12
-//*font: "Cascadia Code"
+Sxiv.font: "Cascadia Code"
+! Sxiv.font: "Olympe Mono Hacked"
 !! Dracula Xresources palette
 !/* *.foreground: #F8F8F2 */
 !/* *.background: #282A36 */

config/.config/bspwm/terminals

@@ -1 +1,2 @@
 St
+st

config/.config/nvim/after/plugin/colors.lua

@@ -1,6 +1,6 @@
 function colors(color, theme)
-	color = os.getenv("BASE16_THEME")
+    color = os.getenv("BASE16_THEME")
-    alt_color = 'rose-pine' or color
+    alt_color = 'everforest' or color
     -- Available values:   `'hard'`, `'medium'`, `'soft'`
     vim.g.gruvbox_material_background = 'medium'
     -- Available values:   `'material'`, `'mix'`, `'original'`
@@ -15,10 +15,13 @@ function colors(color, theme)
     elseif color == 'gruvbox-dark-soft' then
         color = 'gruvbox-material'
         vim.g.gruvbox_material_background = 'soft'
+    elseif color == 'everforest-dark-hard' then
+        vim.g.everforest_background = 'hard'
+        color = 'everforest'
     end
-    if theme then 
+    if theme then
         vim.cmd.colorscheme(alt_color)
-    elseif not pcall(vim.cmd.colorscheme, color) then
+    elseif not pcall(vim.cmd.colorscheme, color) or color == nil then
         vim.cmd.colorscheme(alt_color)
     end
 end

config/.config/nvim/after/plugin/lsp.lua

@@ -29,6 +29,8 @@ lsp_config.nim_langserver.setup{
 
 lsp_config.hls.setup{}
 
+lsp_config.clojure_lsp.setup{}
+
 local cmp = require("cmp")
 local cmp_select = {behavior = cmp.SelectBehavior.Select}
 local cmp_mappings = lsp.defaults.cmp_mappings({
@@ -40,7 +42,7 @@ local cmp_mappings = lsp.defaults.cmp_mappings({
 
 cmp.setup {
     sources = {
-        -- { name = 'conjure' },
+        { name = 'conjure' },
         { name = 'nvim_lsp_signature_help' },
         { name = 'nvim_lsp' },
         { name = 'luasnip' },
@@ -55,6 +57,12 @@ lsp.setup_nvim_cmp({
 	mapping = cmp_mappings
 })
 
+vim.api.nvim_create_autocmd('User', {
+    pattern = 'LspAttached',
+    once = true,
+    callback = vim.lsp.codelens.refresh,
+})
+
 lsp.on_attach(function(client, bufnr)
 	local opts = {buffer = bufnr, remap = false}
 
@@ -66,6 +74,14 @@ lsp.on_attach(function(client, bufnr)
         capabilities = capabilities
     end
 
+    vim.api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, {
+        buffer = bufnr,
+        callback = vim.lsp.codelens.refresh,
+    })
+    -- trigger codelens refresh
+    vim.api.nvim_exec_autocmds('User', { pattern = 'LspAttached' })
+
+
 	vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
 	vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
 	vim.keymap.set("n", "<leader>vws", vim.lsp.buf.workspace_symbol, opts)

config/.config/nvim/init.lua

@@ -1 +1 @@
-require("config")
+config = require("config")

config/.config/nvim/lua/config/packer.lua

@@ -33,6 +33,14 @@ return require('packer').startup(function(use)
 		--		end
 	})
 
+    use {
+        "mireq/large_file",
+        config = function()
+            require("large_file").setup()
+        end
+    }
+
+
 	use 'tanvirtin/monokai.nvim'
 
     use 'arzg/vim-colors-xcode'
@@ -77,7 +85,7 @@ return require('packer').startup(function(use)
 
     use "lewpoly/sherbet.nvim"
 
-    use 'xiyaowong/transparent.nvim'
+    -- use 'xiyaowong/transparent.nvim'
 
 	use {
 		'nvim-treesitter/nvim-treesitter',

config/.config/nvim/lua/config/set.lua

@@ -40,6 +40,8 @@ vim.opt.splitbelow = true
 vim.g.mapleader = " "
 
 vim.g.neovide_scale_factor = 1.0
+vim.g.neovide_theme = 'auto'
+vim.g.neovide_transparency = 1.0
 function ChangeScaleFactor(delta)
     vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta
 end
@@ -51,6 +53,7 @@ vim.keymap.set("n", "<C-->", function()
     ChangeScaleFactor(1 / 1.25)
 end)
 
-vim.opt.guifont = { "Cascadia Code", ":h12" }
+vim.opt.guifont = { "Olympe Mono Hacked", ":h12" }
+vim.opt.termguicolors = true
 
 vim.g.netrw_keepdir = 0

config/.config/picom/picom.conf

@@ -162,8 +162,8 @@ focus-exclude = [ "class_g = 'Cairo-clock'" ];
 
 
 # Parameters for background blurring, see the *BLUR* section for more information.
-# blur-method = "dual_kawase"
+blur-method = "dual_kawase"
-blur-method = "none"
+# blur-method = "none"
 blur-size = 10;
 blur-strength = 12;
 #

config/.config/sxhkd/sxhkdrc

@@ -31,7 +31,7 @@ super + p
     dmenu_run
 # Terminal
 super + Return
-    st
+    neovide +term
 # Screenshot
 super + shift + s
     scrot -s -e 'xclip -selection clipboard -t image/png -i $f' ~/Pictures/screenshots/%Y-%m-%d-%T-screenshot.png

config/.doom.d/packages.el

@@ -54,3 +54,4 @@
            :pre-build ("make" "install")))
 (package! dylan)
 (package! dime)
+(package! vlf)