Actually fix lazy stuff

This commit is contained in:
elkowar 2023-01-15 22:15:21 +01:00
parent 8ea1a7e4ff
commit 133c46fe96
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
2 changed files with 73 additions and 58 deletions

View file

@ -55,7 +55,8 @@
:luukvbaal/stabilize.nvim {:config #(setup :stabilize)} :luukvbaal/stabilize.nvim {:config #(setup :stabilize)}
:tweekmonster/startuptime.vim {:cmd ["StartupTime"]} :tweekmonster/startuptime.vim {:cmd ["StartupTime"]}
:folke/noice.nvim {:config #(setup :noice {:presets {:inc_rename true}}) :folke/noice.nvim {:lazy true
:config #(setup :noice {:presets {:inc_rename true}})
:dependencies [:MunifTanjim/nui.nvim]} :dependencies [:MunifTanjim/nui.nvim]}
:folke/persistence.nvim {:config #(require "dots.plugins.persistence")} :folke/persistence.nvim {:config #(require "dots.plugins.persistence")}
:folke/zen-mode.nvim {:config #(require "dots.plugins.zen-mode") :folke/zen-mode.nvim {:config #(require "dots.plugins.zen-mode")
@ -75,9 +76,10 @@
:tpope/vim-surround {} :tpope/vim-surround {}
:hauleth/sad.vim {} :hauleth/sad.vim {}
:wellle/targets.vim {} ; more text objects. IE: cin (change in next parens). generally better handling of surrounding objects. :wellle/targets.vim {} ; more text objects. IE: cin (change in next parens). generally better handling of surrounding objects.
:mg979/vim-visual-multi {} :mg979/vim-visual-multi {:lazy true}
:tommcdo/vim-exchange {} :tommcdo/vim-exchange {}
:justinmk/vim-sneak {:config #(require "dots.plugins.sneak")} :justinmk/vim-sneak {:lazy true
:config #(require "dots.plugins.sneak")}
; >>> ; >>>
; treesitter <<< ; treesitter <<<
@ -93,10 +95,12 @@
; >>> ; >>>
; debugger <<< ; debugger <<<
:rcarriga/nvim-dap-ui {:config #(setup :dapui) :rcarriga/nvim-dap-ui {:lazy true
:config #(setup :dapui)
:dependencies [:mfussenegger/nvim-dap]} :dependencies [:mfussenegger/nvim-dap]}
:mfussenegger/nvim-dap {} :mfussenegger/nvim-dap {:lazy true}
:nvim-telescope/telescope-dap.nvim {:dependencies [:nvim-telescope/telescope.nvim :nvim-telescope/telescope-dap.nvim {:lazy true
:dependencies [:nvim-telescope/telescope.nvim
:mfussenegger/nvim-dap]} :mfussenegger/nvim-dap]}
@ -104,17 +108,20 @@
; >>> ; >>>
; git stuff <<< ; git stuff <<<
:ldelossa/gh.nvim {:config #(do ((. (require "litee.lib") :setup)) :ldelossa/gh.nvim {:lazy true
:config #(do ((. (require "litee.lib") :setup))
((. (require "litee.gh") :setup))) ((. (require "litee.gh") :setup)))
:dependencies [:ldelossa/litee.nvim]} :dependencies [:ldelossa/litee.nvim]}
:pwntester/octo.nvim {:dependencies [:nvim-lua/plenary.nvim :pwntester/octo.nvim {:lazy true
:dependencies [:nvim-lua/plenary.nvim
:nvim-telescope/telescope.nvim :nvim-telescope/telescope.nvim
:kyazdani42/nvim-web-devicons] :kyazdani42/nvim-web-devicons]
:config #(setup :octo)} :config #(setup :octo)}
:sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"] :sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"]
:config #(require "dots.plugins.diffview")} :config #(require "dots.plugins.diffview")}
:lewis6991/gitsigns.nvim {:dependencies [:vim-gruvbox8] :lewis6991/gitsigns.nvim {:lazy true
:dependencies [:vim-gruvbox8]
:config #(require "dots.plugins.gitsigns")} :config #(require "dots.plugins.gitsigns")}
:ruanyl/vim-gh-line {} :ruanyl/vim-gh-line {}
@ -140,15 +147,17 @@
:neovim/nvim-lspconfig {} :neovim/nvim-lspconfig {}
:smjonas/inc-rename.nvim {:config #(setup :inc_rename)} :smjonas/inc-rename.nvim {:config #(setup :inc_rename)}
:dnlhc/glance.nvim {:config #(require "dots.plugins.glance")} :dnlhc/glance.nvim {:lazy true
:config #(require "dots.plugins.glance")}
; >>> ; >>>
; cmp <<< ; cmp <<<
:hrsh7th/vim-vsnip {} :hrsh7th/vim-vsnip {:lazy true}
:hrsh7th/vim-vsnip-integ {} :hrsh7th/vim-vsnip-integ {:lazy true}
:rafamadriz/friendly-snippets {} :rafamadriz/friendly-snippets {}
:hrsh7th/nvim-cmp {:dependencies [[:hrsh7th/cmp-nvim-lsp] :hrsh7th/nvim-cmp {:lazy true
:dependencies [[:hrsh7th/cmp-nvim-lsp]
[:hrsh7th/cmp-buffer] [:hrsh7th/cmp-buffer]
[:hrsh7th/cmp-vsnip] [:hrsh7th/cmp-vsnip]
[:hrsh7th/cmp-nvim-lua] [:hrsh7th/cmp-nvim-lua]
@ -171,7 +180,8 @@
:Olical/conjure {:ft ["fennel"]} :Olical/conjure {:ft ["fennel"]}
:eraserhd/parinfer-rust {:build "cargo build --release"} :eraserhd/parinfer-rust {:build "cargo build --release"}
:lervag/vimtex {:config #(require :dots.plugins.vimtex)} :lervag/vimtex {:ft ["latex" "tex"]
:config #(require :dots.plugins.vimtex)}
:kmonad/kmonad-vim {} :kmonad/kmonad-vim {}
:elkowar/yuck.vim {:ft ["yuck"]} :elkowar/yuck.vim {:ft ["yuck"]}
:cespare/vim-toml {:ft ["toml"]} :cespare/vim-toml {:ft ["toml"]}
@ -183,19 +193,19 @@
:leafgarland/typescript-vim {:ft ["typescript" "typescript-react" "javascript"]} :leafgarland/typescript-vim {:ft ["typescript" "typescript-react" "javascript"]}
:HerringtonDarkholme/yats.vim {} ; typescript syntax highlighting :HerringtonDarkholme/yats.vim {} ; typescript syntax highlighting
:mxw/vim-jsx {} :mxw/vim-jsx {}
:mattn/emmet-vim {:config #(require "dots.plugins.emmet")} :mattn/emmet-vim {:lazy true
:config #(require "dots.plugins.emmet")}
:purescript-contrib/purescript-vim {:ft ["purescript"]} :purescript-contrib/purescript-vim {:ft ["purescript"]}
:derekelkins/agda-vim {:ft ["agda"]} :derekelkins/agda-vim {:ft ["agda"]}
:neovimhaskell/haskell-vim { :ft ["haskell"]} :neovimhaskell/haskell-vim { :ft ["haskell"]}
:stewy33/mercury-vim {}
:ionide/Ionide-vim {}
:rust-lang/rust.vim {:ft ["rust"] :rust-lang/rust.vim {:ft ["rust"]
:dependencies ["mattn/webapi-vim"] :dependencies ["mattn/webapi-vim"]
:config #(do (set vim.g.rustfmt_fail_silently 1))} :config #(do (set vim.g.rustfmt_fail_silently 1))}
:simrat39/rust-tools.nvim {:dependencies ["nvim-lua/popup.nvim" "nvim-lua/plenary.nvim"]} :simrat39/rust-tools.nvim {:ft ["rust" "toml"]
:dependencies ["nvim-lua/popup.nvim" "nvim-lua/plenary.nvim"]}
:Saecki/crates.nvim {:dependencies ["nvim-lua/plenary.nvim"] :Saecki/crates.nvim {:dependencies ["nvim-lua/plenary.nvim"]
:event ["BufRead Cargo.toml"] :event ["BufRead Cargo.toml"]

View file

@ -14,50 +14,55 @@
(utils.keymap :n :<C-p> ":Telescope find_files<CR>") (utils.keymap :n :<C-p> ":Telescope find_files<CR>")
(def prompt "blacker") (defn setup-telescope-theme []
(if (def prompt "blacker")
(= prompt "bright") (if
(let [promptbg "#689d6a"] (= prompt "bright")
(utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg}) (let [promptbg "#689d6a"]
(utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.dark0}) (utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg})
(utils.highlight-add :TelescopePromptTitle {:bg promptbg :fg colors.dark1})) (utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.dark0})
(utils.highlight-add :TelescopePromptTitle {:bg promptbg :fg colors.dark1}))
(= prompt "dark") (= prompt "dark")
(let [promptbg "#252525"] (let [promptbg "#252525"]
(utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg}) (utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg})
(utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.light2}) (utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.light2})
(utils.highlight-add :TelescopePromptPrefix {:bg promptbg :fg colors.neutral_aqua}) (utils.highlight-add :TelescopePromptPrefix {:bg promptbg :fg colors.neutral_aqua})
(utils.highlight-add :TelescopePromptTitle {:bg colors.neutral_blue :fg colors.dark1})) (utils.highlight-add :TelescopePromptTitle {:bg colors.neutral_blue :fg colors.dark1}))
(= prompt "black") (= prompt "black")
(let [promptbg "#212526"] (let [promptbg "#212526"]
(utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg}) (utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg})
(utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.light2}) (utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.light2})
(utils.highlight-add :TelescopePromptPrefix {:bg promptbg :fg colors.neutral_aqua}) (utils.highlight-add :TelescopePromptPrefix {:bg promptbg :fg colors.neutral_aqua})
(utils.highlight-add :TelescopePromptTitle {:bg colors.neutral_green :fg colors.dark1})) (utils.highlight-add :TelescopePromptTitle {:bg colors.neutral_green :fg colors.dark1}))
(= prompt "blacker") (= prompt "blacker")
(let [promptbg "#1f2324"] (let [promptbg "#1f2324"]
(utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg}) (utils.highlight-add :TelescopePromptBorder {:bg promptbg :fg promptbg})
(utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.light2}) (utils.highlight-add :TelescopePromptNormal {:bg promptbg :fg colors.light2})
(utils.highlight-add :TelescopePromptPrefix {:bg promptbg :fg colors.neutral_aqua}) (utils.highlight-add :TelescopePromptPrefix {:bg promptbg :fg colors.neutral_aqua})
(utils.highlight-add :TelescopePromptTitle {:bg colors.neutral_blue :fg colors.dark1}))) (utils.highlight-add :TelescopePromptTitle {:bg colors.neutral_blue :fg colors.dark1})))
(def side "darker") (def side "darker")
(if (if
(= side "brighter") (= side "brighter")
(let [previewbg "#1f2324"] (let [previewbg "#1f2324"]
(utils.highlight-add :TelescopePreviewNormal {:bg previewbg}) (utils.highlight-add :TelescopePreviewNormal {:bg previewbg})
(utils.highlight-add :TelescopePreviewBorder {:bg previewbg :fg previewbg})) (utils.highlight-add :TelescopePreviewBorder {:bg previewbg :fg previewbg}))
(= side "darker") (= side "darker")
(let [previewbg "#1a1e1f"] (let [previewbg "#1a1e1f"]
(utils.highlight-add :TelescopePreviewNormal {:bg previewbg}) (utils.highlight-add :TelescopePreviewNormal {:bg previewbg})
(utils.highlight-add :TelescopePreviewBorder {:bg previewbg :fg previewbg}))) (utils.highlight-add :TelescopePreviewBorder {:bg previewbg :fg previewbg})))
(utils.highlight-add :TelescopeBorder {:bg colors.dark0_hard :fg colors.dark0_hard}) (utils.highlight-add :TelescopeBorder {:bg colors.dark0_hard :fg colors.dark0_hard})
(utils.highlight-add :TelescopeNormal {:bg colors.dark0_hard}) (utils.highlight-add :TelescopeNormal {:bg colors.dark0_hard})
(utils.highlight-add :TelescopePreviewTitle {:bg colors.neutral_green :fg colors.dark1}) (utils.highlight-add :TelescopePreviewTitle {:bg colors.neutral_green :fg colors.dark1})
(utils.highlight-add :TelescopeResultsTitle {:bg colors.neutral_aqua :fg colors.dark1}) (utils.highlight-add :TelescopeResultsTitle {:bg colors.neutral_aqua :fg colors.dark1})
(utils.highlight-add :TelescopeSelection {:bg colors.neutral_aqua :fg colors.dark1}))
; TODO this is the hackiest thing I've ever done
(vim.defer_fn setup-telescope-theme 50)
(utils.highlight-add :TelescopeSelection {:bg colors.neutral_aqua :fg colors.dark1})