Compare commits
No commits in common. "7fab1f798c203cf403e36270e4e852f14444baaf" and "0f34a00a4ed434242017f0be9e706289e2754397" have entirely different histories.
7fab1f798c
...
0f34a00a4e
|
@ -133,6 +133,7 @@
|
||||||
autosuggestion.enable = false;
|
autosuggestion.enable = false;
|
||||||
|
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
|
bindkey -v
|
||||||
autopair-init
|
autopair-init
|
||||||
'';
|
'';
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
|
|
|
@ -2,22 +2,22 @@
|
||||||
|
|
||||||
(nvim.g :mapleader " ")
|
(nvim.g :mapleader " ")
|
||||||
|
|
||||||
; (nvim.opt :runtimepath (.. vim.opt.runtimepath "/home/anish/.config/nvim/,"))
|
(nvim.opt :runtimepath (.. vim.opt.runtimepath "/home/anish/.config/nvim/,"))
|
||||||
(nvim.opt :tabstop 2)
|
(nvim.opt :tabstop 2)
|
||||||
(nvim.opt :showmatch true)
|
(nvim.opt :showmatch)
|
||||||
(nvim.opt :shiftwidth 2)
|
(nvim.opt :shiftwidth 2)
|
||||||
(nvim.opt :autoindent true)
|
(nvim.opt :autoindent)
|
||||||
(nvim.opt :undofile true)
|
(nvim.opt :undofile)
|
||||||
(nvim.opt :signcolumn "auto:4")
|
(nvim.opt :signcolumn "auto:4")
|
||||||
(nvim.opt :title true)
|
(nvim.opt :title)
|
||||||
(nvim.opt :number true)
|
(nvim.opt :number)
|
||||||
; (nvim.opt :nocompatible)
|
(nvim.opt :nocompatible)
|
||||||
(nvim.opt :relativenumber true)
|
(nvim.opt :relativenumber)
|
||||||
(nvim.opt :showtabline 2)
|
(nvim.opt :showtabline 2)
|
||||||
(nvim.opt :expandtab true)
|
(nvim.opt :expandtab)
|
||||||
(nvim.opt :autowriteall true)
|
(nvim.opt :autowriteall)
|
||||||
|
|
||||||
(nvim.opt :lisp true) ; include - in word to move better in snake-case)
|
(nvim.opt :lisp) ; include - in word to move better in snake-case)
|
||||||
(nvim.g :sexp_filetypes "clojure,scheme,lisp,janet,fennel,yuck") ; include the lisps I use
|
(nvim.g :sexp_filetypes "clojure,scheme,lisp,janet,fennel,yuck") ; include the lisps I use
|
||||||
|
|
||||||
(nvim.opt :termguicolors)
|
(nvim.opt :termguicolors)
|
|
@ -1,21 +1,9 @@
|
||||||
(local nvim (require :lib/nvim))
|
(local nvim (require :lib/nvim))
|
||||||
(local wk (require :which-key))
|
(local wk (require :which-key))
|
||||||
|
|
||||||
;; Convenient way to indent stuff in visual mode
|
|
||||||
(nvim.keymap [:v] "<" "<gv" {:noremap true})
|
|
||||||
(nvim.keymap [:v] ">" ">gv" {:noremap true})
|
|
||||||
(nvim.keymap [:n] "<space>" "<NOP>" {:noremap true :silent true})
|
|
||||||
|
|
||||||
(vim.api.nvim_create_user_command "FTermToggle" (fn [_]
|
|
||||||
((-> (require :FTerm)
|
|
||||||
(. :toggle))))
|
|
||||||
{:bang true})
|
|
||||||
(nvim.keymap [:t] "<TAB>" "<cmd>:FTermToggle<CR>")
|
|
||||||
(nvim.keymap [:n] "<TAB>" "<cmd>:FTermToggle<CR>" {:nnoremap true})
|
|
||||||
|
|
||||||
(local
|
(local
|
||||||
normal-map-leader
|
normal-map-leader
|
||||||
{"t" [":Neotree toggle<CR>"
|
{"t" [""
|
||||||
"Toggle neo-tree"]
|
"Toggle neo-tree"]
|
||||||
"w" ["<cmd>:w<cr>"
|
"w" ["<cmd>:w<cr>"
|
||||||
"Write file"]
|
"Write file"]
|
||||||
|
@ -24,7 +12,7 @@
|
||||||
"r" [":RainbowParenthesesToggleAll<CR>"
|
"r" [":RainbowParenthesesToggleAll<CR>"
|
||||||
"Toggle Rainbow Parens"]
|
"Toggle Rainbow Parens"]
|
||||||
; Telescope
|
; Telescope
|
||||||
"f" {:name "Files"
|
"f" {:Name "Files"
|
||||||
:f ["<cmd>Telescope find_files<cr>"
|
:f ["<cmd>Telescope find_files<cr>"
|
||||||
"Find Files (in Telescope)"]
|
"Find Files (in Telescope)"]
|
||||||
:g ["<cmd>Telescope live_grep<cr>"
|
:g ["<cmd>Telescope live_grep<cr>"
|
||||||
|
@ -38,16 +26,16 @@
|
||||||
:r ["<cmd>Telescope oldfiles<CR>"
|
:r ["<cmd>Telescope oldfiles<CR>"
|
||||||
"Recent files"]}
|
"Recent files"]}
|
||||||
; Git
|
; Git
|
||||||
"g" {:name "Git"
|
"g" {:Name "Git"
|
||||||
"s" [":G<CR>"
|
"s" [":G<CR>"
|
||||||
"Git Status"]
|
"Git Status"]
|
||||||
"f" [":G fetch --all<cr>"
|
"f" [":G fetch --all"
|
||||||
"Git Fetch"]
|
"Git Fetch"]
|
||||||
"b" [":GBranches<cr>"
|
"b" [":GBranches"
|
||||||
"Git Branch"]
|
"Git Branch"]
|
||||||
"p" [":Git! push<cr>"
|
"p" [":Git! push"
|
||||||
"Git Push"]
|
"Git Push"]
|
||||||
"d" [":GDiff<cr>"
|
"d" [":GDiff"
|
||||||
"Git Diff"]
|
"Git Diff"]
|
||||||
"h" [""
|
"h" [""
|
||||||
"Commit Hunk under Cursor"]}
|
"Commit Hunk under Cursor"]}
|
||||||
|
@ -55,7 +43,7 @@
|
||||||
; nmap <leader>gh :diffget //2<CR>
|
; nmap <leader>gh :diffget //2<CR>
|
||||||
; nnoremap <leader>gc :G commit -v -q %:p<CR>
|
; nnoremap <leader>gc :G commit -v -q %:p<CR>
|
||||||
; Buffers
|
; Buffers
|
||||||
"b" {:name "Buffer"
|
"b" {:Name "Buffer"
|
||||||
:a [""
|
:a [""
|
||||||
"Buffer Add"]
|
"Buffer Add"]
|
||||||
:q [""
|
:q [""
|
||||||
|
@ -67,7 +55,7 @@
|
||||||
:p ["<cmd>:tabp<CR>"
|
:p ["<cmd>:tabp<CR>"
|
||||||
"Buffer Previous"]}
|
"Buffer Previous"]}
|
||||||
; Search
|
; Search
|
||||||
"s" {:name "Search"
|
"s" {:Name "Search"
|
||||||
:b ["<cmd>Telescope current_buffer_fuzzy_find<CR>"
|
:b ["<cmd>Telescope current_buffer_fuzzy_find<CR>"
|
||||||
"Search in current buffer"]
|
"Search in current buffer"]
|
||||||
:s ["<cmd>Telescope live_grep<CR>"
|
:s ["<cmd>Telescope live_grep<CR>"
|
||||||
|
@ -77,7 +65,7 @@
|
||||||
:c ["<cmd>let @/ = \"\"<CR>:echo 'Search highlight cleared'<CR>"
|
:c ["<cmd>let @/ = \"\"<CR>:echo 'Search highlight cleared'<CR>"
|
||||||
"Clear search"]}
|
"Clear search"]}
|
||||||
; Code
|
; Code
|
||||||
"c" {:name "Code"
|
"c" {:Name "Code"
|
||||||
:d [":lua vim.lsp.buf.definition()<CR>"
|
:d [":lua vim.lsp.buf.definition()<CR>"
|
||||||
"Go to Definition"]
|
"Go to Definition"]
|
||||||
:i [":lua require('telescope.builtin').lsp_implementation()<CR>"
|
:i [":lua require('telescope.builtin').lsp_implementation()<CR>"
|
||||||
|
@ -91,6 +79,6 @@
|
||||||
:o [":LSoutlineToggle<CR>"
|
:o [":LSoutlineToggle<CR>"
|
||||||
"Outline"]}
|
"Outline"]}
|
||||||
; Kitaab
|
; Kitaab
|
||||||
"z" {:name "Kitaab"}})
|
"z" {:Name "Kitaab"}})
|
||||||
|
|
||||||
(wk.register normal-map-leader {:prefix "<leader>"})
|
(wk.register normal-map-leader {:prefix "<leader>"})
|
3
home/profiles/nvim/config/conf/plugins.fnl
Normal file
3
home/profiles/nvim/config/conf/plugins.fnl
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
(local nvim (require :lib/nvim))
|
||||||
|
|
||||||
|
(nvim.g :tidal_target "terminal")
|
|
@ -1,22 +0,0 @@
|
||||||
(local nvim (require :lib/nvim))
|
|
||||||
|
|
||||||
(nvim.g :tidal_target "terminal")
|
|
||||||
|
|
||||||
(local navic (require :nvim-navic))
|
|
||||||
|
|
||||||
(let [lualine (require :lualine)]
|
|
||||||
(lualine.setup {:options {:theme "ayu"}
|
|
||||||
:sections {:lualine_c [:filename {1 navic.get_location
|
|
||||||
:cond navic.is_available}]
|
|
||||||
:lualine_y [(fn []
|
|
||||||
(let [msg "No Active Lsp"
|
|
||||||
buf_ft (vim.api.nvim_buf_get_option 0 "filetype")
|
|
||||||
clients (vim.lsp.get_active_clients)]
|
|
||||||
(if (= (next clients) nil) msg)
|
|
||||||
(each [_ client (ipairs clients)]
|
|
||||||
(let [filetypes (. client :config :filetypes)]
|
|
||||||
(if (and filetypes (vim.fn.index filetypes buf_ft)) client.name)))
|
|
||||||
msg))]
|
|
||||||
:lualine_x [:filetype]}}))
|
|
||||||
|
|
||||||
(require :neo-tree)
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
-- A function that applies passes the output of string.format to the print
|
||||||
|
-- function
|
||||||
|
---@param string string #template string
|
||||||
|
local function fprint(string, ...)
|
||||||
|
print(string.format(string, ...))
|
||||||
|
end
|
||||||
|
|
||||||
if pcall(require, "hotpot") then
|
if pcall(require, "hotpot") then
|
||||||
-- Setup hotpot.nvim
|
-- Setup hotpot.nvim
|
||||||
require("hotpot").setup({
|
require("hotpot").setup({
|
||||||
|
@ -24,3 +31,7 @@ if pcall(require, "hotpot") then
|
||||||
else
|
else
|
||||||
print("Unable to require hotpot")
|
print("Unable to require hotpot")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- vim.cmd[[colorscheme tokyonight]]
|
||||||
|
-- -- vim.cmd[[colorscheme lumona]]
|
||||||
|
-- vim.cmd[[packadd cfilter]]
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue