mirror of
https://github.com/stevenproctor/dotfiles.git
synced 2026-11-22 15:18:25 -06:00
nvim - move from aniseed to nfnl
This commit is contained in:
48 files changed
+766
-64
No files matched your search
@@ -1,4 +1,4 @@
|
||||
(local a (require :aniseed.core))
|
||||
(local a (require :nfnl.core))
|
||||
(local u (require :dotfiles.util))
|
||||
|
||||
(vim.cmd.set :shortmess+=c)
|
||||
@@ -117,8 +117,3 @@
|
||||
(vim.api.nvim_create_user_command :FennelScratchBuffer make-fennel-scratch {})
|
||||
|
||||
(u.nnoremap :<leader>fsb ":call FennelScratchBuffer ()<CR>")
|
||||
|
||||
;; (fn compile-fnl [] (print :recompiling)
|
||||
;; (anenv.init {:force true :init :dotfiles.init}))
|
||||
;;
|
||||
;; (vim.api.nvim_create_user_command :AniseedCompile compile-fnl {})
|
||||
@@ -1,5 +1,17 @@
|
||||
(local a (require :aniseed.core))
|
||||
(local a (require :nfnl.core))
|
||||
(local str (require :nfnl.string))
|
||||
(local fs (require :nfnl.fs))
|
||||
|
||||
(fn require-all []
|
||||
(let [require-exclusions (a.->set [:init])]
|
||||
(->> (fs.relglob :fnl/dotfiles :*.fnl)
|
||||
(a.map #(a.first (str.split $ :.fnl)))
|
||||
(a.filter #(not (a.contains? require-exclusions $)))
|
||||
(a.map #(.. :dotfiles. $))
|
||||
;(a.map #(require $))
|
||||
)))
|
||||
|
||||
;; (require-all)
|
||||
(require :dotfiles.core)
|
||||
(require :dotfiles.plugins)
|
||||
(require :dotfiles.mapping)
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
(local util (require :dotfiles.util))
|
||||
(local nfnl (require :nfnl.api))
|
||||
|
||||
|
||||
(fn noremap [mode from to]
|
||||
"Sets a mapping with {:noremap true}."
|
||||
@@ -6,17 +8,12 @@
|
||||
|
||||
; (set nvim.g.mapleader "\\")
|
||||
|
||||
(fn aniseed-reload []
|
||||
(each [k _ (ipairs package.loaded)]
|
||||
(when (string.match k "^dotfiles%..+")
|
||||
(tset package.loaded k nil)))
|
||||
((. (require :aniseed.env) :init) {:module :dotfiles.init :compile true})
|
||||
(print "aniseed reloaded!"))
|
||||
|
||||
(vim.keymap.set :n "<leader>`" aniseed-reload)
|
||||
(vim.keymap.set :n "<leader>`"
|
||||
(fn []
|
||||
(nfnl.compile-all-files (vim.fn.stdpath :config))
|
||||
(vim.cmd.source (.. (vim.fn.stdpath :config) :/init.lua))))
|
||||
|
||||
; (noremap :n "<leader>`" ":source ~/.config/nvim/init.lua<CR>")
|
||||
(noremap :n :<leader>! ":call AniseedCompile()<CR>")
|
||||
|
||||
(noremap :n :<Enter> ":nohlsearch<Enter>/<BS>")
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
(local core (require :aniseed.core))
|
||||
(local core (require :nfnl.core))
|
||||
(local conjure-config (require :conjure.config))
|
||||
|
||||
; (set nvim.g.conjure#eval#result_register "*")
|
||||
; (set nvim.g.conjure#log#botright true)
|
||||
@@ -6,7 +7,7 @@
|
||||
(set vim.g.conjure#client#clojure#nrepl#mapping#session_clone :sC)
|
||||
(set vim.g.conjure#extract#tree_sitter#enabled true)
|
||||
|
||||
(let [conjure-config (require :conjure.config)]
|
||||
(conjure-config.assoc-in [:filetypes]
|
||||
(core.concat (conjure-config.filetypes) [:markdown]))
|
||||
(conjure-config.assoc-in [:filetype :markdown] :conjure.client.clojure.nrepl))
|
||||
(conjure-config.assoc-in [:filetypes]
|
||||
(core.concat (conjure-config.filetypes) [:markdown]))
|
||||
|
||||
(conjure-config.assoc-in [:filetype :markdown] :conjure.client.clojure.nrepl)
|
||||
@@ -5,9 +5,9 @@
|
||||
(fn bufmap [mode from to] (util.noremap mode from to {:local? true}))
|
||||
|
||||
(fn map-fugitive-keys []
|
||||
(bufmap :n :<leader>gp ":Git pull<CR>" )
|
||||
(bufmap :n :<leader>gp ":Git pull<CR>")
|
||||
(bufmap :n :<leader>gP ":Git push<CR>")
|
||||
(bufmap :n :<leader>gF ":Git push -f<CR>"))
|
||||
|
||||
(vim.api.nvim_create_autocmd [:FileType]
|
||||
{:pattern :fugitive :callback map-fugitive-keys})
|
||||
{:pattern :fugitive :callback map-fugitive-keys})
|
||||
@@ -1,4 +1,4 @@
|
||||
(local a (require :aniseed.core))
|
||||
(local a (require :nfnl.core))
|
||||
(local u (require :dotfiles.util))
|
||||
(local lsp (require :vim.lsp))
|
||||
(local lspconfig (require :lspconfig))
|
||||
@@ -122,9 +122,8 @@
|
||||
|
||||
(fn default-server-handler [server-name]
|
||||
(let [specific-opts (a.get server-specific-opts server-name {})
|
||||
server (a.get lspconfig server-name)
|
||||
server-opts (a.merge base-server-opts specific-opts)]
|
||||
(server.setup server-opts)))
|
||||
(vim.lsp.config server-name server-opts)))
|
||||
|
||||
(fn lsp-execute-command [cmd ...]
|
||||
(let [buf-uri (vim.uri_from_bufnr 0)
|
||||
@@ -135,7 +134,6 @@
|
||||
args (a.concat opts [...])]
|
||||
(vim.lsp.buf.execute_command {:command cmd :arguments args})))
|
||||
|
||||
|
||||
(fn setup-handlers [language_servers]
|
||||
(each [_ server-name (pairs language_servers)]
|
||||
(default-server-handler server-name)))
|
||||
@@ -149,8 +147,4 @@
|
||||
; (mason-lspconfig.setup)
|
||||
; (mason-lspconfig.setup_handlers [default-server-handler])))
|
||||
|
||||
{: on_attach
|
||||
: default-server-handler
|
||||
: setup-handlers
|
||||
}
|
||||
|
||||
{: on_attach : default-server-handler : setup-handlers}
|
||||
@@ -1,14 +1,12 @@
|
||||
(local mason (require :mason))
|
||||
(local mason-lspconf (require :mason-lspconfig) )
|
||||
(local mason-lspconf (require :mason-lspconfig))
|
||||
(local lspconfig (require :dotfiles.plugin.lspconfig))
|
||||
|
||||
(local a (require :aniseed.core))
|
||||
|
||||
(fn setup []
|
||||
(mason.setup {:ui {:icons {:package_installed "✓"}}})
|
||||
(when mason-lspconf
|
||||
(mason-lspconf.setup {:ensure_installed [:lua_ls]})
|
||||
(lspconfig.setup-handlers (mason-lspconf.get_installed_servers))))
|
||||
(mason.setup {:ui {:icons {:package_installed "✓"}}})
|
||||
(when mason-lspconf
|
||||
(mason-lspconf.setup {:ensure_installed [:lua_ls] :automatic_enable true})
|
||||
(lspconfig.setup-handlers (mason-lspconf.get_installed_servers))))
|
||||
|
||||
(setup)
|
||||
;; (mason.setup)
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
(local nfnl (require :nfnl))
|
||||
(nfnl.setup {:compile_on_write true})
|
||||
@@ -1,4 +1,4 @@
|
||||
(local core (require :aniseed.core))
|
||||
(local core (require :nfnl.core))
|
||||
(local conceal (require :dotfiles.conceal))
|
||||
(local ts-utils (require :dotfiles.ts-utils))
|
||||
(local stars ["◉" "⦾" "○" "✸" "✿" "✶" "•" "‣"])
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
(local a (require :aniseed.core))
|
||||
(local a (require :nfnl.core))
|
||||
(local treesitter (require :dotfiles.plugin.treesitter))
|
||||
(local ts-parsers (require :nvim-treesitter.parsers))
|
||||
(local ts-utils (require :nvim-treesitter.ts_utils))
|
||||
@@ -53,19 +53,25 @@
|
||||
|
||||
(fn TreeSitterLangParedit []
|
||||
(when (host-lang-in? paredit-host-langs)
|
||||
(when-let [cursor-lang (language-at-cursor)]
|
||||
(->> cursor-lang
|
||||
(paredit-lang?)
|
||||
(bool->int)
|
||||
(set vim.g.paredit_mode))
|
||||
(vim.fn.PareditInitBuffer))))
|
||||
(let [cursor-lang (language-at-cursor)]
|
||||
(when cursor-lang
|
||||
(->> cursor-lang
|
||||
(paredit-lang?)
|
||||
(bool->int)
|
||||
(set vim.g.paredit_mode))
|
||||
(vim.fn.PareditInitBuffer)))))
|
||||
|
||||
(vim.api.nvim_create_autocmd [:FileType]
|
||||
{:pattern :ruby :callback (lambda [] (vim.fn.PareditInitBalancingAllBracketsBuffer))})
|
||||
{:pattern :ruby
|
||||
:callback (lambda []
|
||||
(vim.fn.PareditInitBalancingAllBracketsBuffer))})
|
||||
|
||||
(vim.api.nvim_create_autocmd [:FileType]
|
||||
{:pattern :javascript :callback (lambda [] (vim.fn.PareditInitBalancingAllBracketsBuffer))})
|
||||
{:pattern :javascript
|
||||
:callback (lambda []
|
||||
(vim.fn.PareditInitBalancingAllBracketsBuffer))})
|
||||
|
||||
(vim.api.nvim_create_autocmd [:FileType]
|
||||
{:pattern terraform :callback (lambda [] ( vim.fn.PareditInitBalancingAllBracketsBuffer))})
|
||||
|
||||
{:pattern :terraform
|
||||
:callback (lambda []
|
||||
(vim.fn.PareditInitBalancingAllBracketsBuffer))})
|
||||
@@ -1,5 +1,5 @@
|
||||
(local packer (require :packer))
|
||||
(local core (require :aniseed.core))
|
||||
(local core (require :nfnl.core))
|
||||
|
||||
(fn safe-require-plugin-config [name]
|
||||
(let [(ok? val-or-err) (pcall require (.. :dotfiles.plugin. name))]
|
||||
@@ -15,7 +15,7 @@
|
||||
(-?> (. opts :mod) (safe-require-plugin-config))
|
||||
(use (core.assoc opts 1 name))))))
|
||||
|
||||
(local packages {:Olical/aniseed {}
|
||||
(local packages {:Olical/nfnl {}
|
||||
:Olical/conjure {:mod :conjure}
|
||||
:Olical/fennel.vim {}
|
||||
:ahmedkhalf/project.nvim {}
|
||||
@@ -48,7 +48,7 @@
|
||||
:requires [:nvim-lua/plenary.nvim]}
|
||||
:junegunn/vim-easy-align {:mod :easyalign}
|
||||
:kovisoft/paredit {:mod :paredit
|
||||
:require [:nvim-treesitter/nvim-treesitter] }
|
||||
:require [:nvim-treesitter/nvim-treesitter]}
|
||||
:kristijanhusak/vim-dadbod-completion {}
|
||||
:kristijanhusak/vim-dadbod-ui {}
|
||||
:L3MON4D3/LuaSnip {:mod :luasnip}
|
||||
@@ -57,12 +57,21 @@
|
||||
; :michaelb/sniprun {:run "bash ./install.sh" :mod :sniprun}
|
||||
:mrjones2014/smart-splits.nvim {:mod :smartsplits}
|
||||
:mechatroner/rainbow_csv {}
|
||||
:MunifTanjim/nui.nvim {}
|
||||
:neovim/nvim-lspconfig {:mod :lspconfig}
|
||||
:norcalli/nvim-colorizer.lua {:mod :colorizer}
|
||||
:nvim-neo-tree/neo-tree.nvim {:branch :v3.x
|
||||
:require [:nvim-lua/plenary.nvim
|
||||
:nvim-tree/nvim-web-devicons
|
||||
; not strictly required, but recommended
|
||||
:MunifTanjim/nui.nvim
|
||||
; :3rd/image.nvim, ; Optional image support in preview window: See `# Preview Mode` for more information
|
||||
]}
|
||||
:nvim-orgmode/orgmode {:mod :orgmode}
|
||||
:nvim-telescope/telescope.nvim {:requires [[:nvim-lua/popup.nvim]
|
||||
[:nvim-lua/plenary.nvim]]
|
||||
:mod :telescope}
|
||||
:nvim-tree/nvim-web-devicons {}
|
||||
:nvim-treesitter/nvim-treesitter {:run ":TSUpdate"
|
||||
:mod :treesitter}
|
||||
:nvim-treesitter/playground {}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
(local core (require :aniseed.core))
|
||||
(local core (require :nfnl.core))
|
||||
|
||||
(fn root [bufnr lang]
|
||||
(let [parser (vim.treesitter.get_parser bufnr lang {})
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
(local a (require :aniseed.core))
|
||||
(local a (require :nfnl.core))
|
||||
|
||||
(fn noremap [mode from to opts]
|
||||
(let [map-opts {:noremap true :silent true}
|
||||
|
||||
Reference in new issue
Block a user