diff options
Diffstat (limited to '')
| -rw-r--r-- | nvim/lua/plugins/dashboard-nvim.lua | 85 | ||||
| -rw-r--r-- | nvim/lua/plugins/nvim-lspconfig.lua | 7 | ||||
| -rw-r--r-- | nvim/lua/plugins/nvim-treesitter.lua | 3 | ||||
| -rw-r--r-- | nvim/lua/plugins/oil.lua | 12 | ||||
| -rw-r--r-- | nvim/lua/plugins/toggleterm.lua | 8 |
5 files changed, 18 insertions, 97 deletions
diff --git a/nvim/lua/plugins/dashboard-nvim.lua b/nvim/lua/plugins/dashboard-nvim.lua index 06b87f9..ea071df 100644 --- a/nvim/lua/plugins/dashboard-nvim.lua +++ b/nvim/lua/plugins/dashboard-nvim.lua @@ -100,18 +100,6 @@ Headers = { [[ ]], }, { - [[⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣀⣤⣤⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣀⣤⣤⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣠⣤⣤⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⠀⠀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀⠀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⠀⠀⠀⠀⠀⠀⣠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣆⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⣿⣿⣿⡆⠀⠀⠀⢸⣿⣿⠿⠿⢿⣿⣿⣿⣿⡿⠿⠿⣿⣿⡇⠀⠀⠀⣾⣿⣿⡿⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡆⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⢿⣿⠿⠿⠿⠿⣿⣿⣿⡏⠀⠀⠀⢹⣿⡇⠀⠀⠀⢸⣿⢱⣶⣴⣶⢹⣿⣿⡏⣶⣦⣶⡎⣿⡇⠀⠀⠀⢿⣿⠁⠀⠀⠈⣿⣿⣿⡿⠟⣋⣽⣿⣿⠇⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⠘⣿⣧⣄⣀⣴⣿⣿⣿⣷⣄⣀⣠⣾⣟⠀⠀⠀⠀⠈⣿⣦⣙⣛⣡⣾⡿⢿⣷⣌⣛⣋⣴⣿⠁⠀⠀⠀⠘⣿⣦⣄⣀⣴⣿⣿⣿⣿⣶⣶⣤⣿⡟⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⠀⢿⣿⣿⣿⣿⣏⣼⣌⣿⣿⣿⣿⣿⡟⠀⠀⠀⠀⠀⢿⣿⣿⣿⣿⣿⣰⣆⣿⣿⣿⣿⣿⡿⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣏⣼⣌⣿⣿⣿⣿⣿⠏⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⠀⠀⠉⠉⢿⣿⣿⣿⣿⣿⣿⡏⠉⠁⠀⠀⠀⠀⠀⠀⠀⠉⠉⢹⣿⣿⣿⣿⣿⣿⡏⠉⠉⠀⠀⠀⠀⠀⠀⠀⠉⠉⣿⣿⣿⣿⣿⣿⣿⡏⠉⠁⠀⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠁⠁⠁⠉⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠁⠁⠉⠉⠈⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠁⠁⠁⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀]], - [[ ]], - }, - { [[ ,-. _,---._ __ / \ ]], [[ / ) .-' `./ / \ ]], [[ ( ( ,' `/ /| ]], @@ -149,79 +137,6 @@ Headers = { [[ \/_____________________/ ]], [[ ]], }, - { - [[ ____ ]], - [[ ,-~~~~' '~~~~-, ]], - [[ ,' '', ]], - [[ ( Y ]], - [[ { I ]], - [[ { - `. ]], - [[ | ', ) ]], - [[ | | ,..__ __. Y ]], - [[ | .,_./ Y ' / ^Y J )| ]], - [[ \ |' / | | || ]], - [[ \ L_/ . _ (_,.'( ]], - [[ \, , ^^""' / | ) ]], - [[ \_ \ /,L] / ]], - [[ '-_`-, ` ` ./` ]], - [[ `-(_ ) ]], - [[ ^^\..___,.--` ]], - [[ ]], - }, - { - [[ ____ ]], - [[ _.-'78o `"`--._ ]], - [[ ,o888o. .o888o, ''-. ]], - [[ ,88888P `78888P..______.] ]], - [[ /_..__..----"" __.' ]], - [[ `-._ /""| _..-'' ]], - [[ "`-----\ `\ ]], - [[ | ;.-""--.. ]], - [[ | ,8o. o88. `. ]], - [[ `;888P `788P : ]], - [[ .o""-.|`-._ ./ ]], - [[ J88 _.-/ ";"-P----' ]], - [[ `--'\`| / / ]], - [[ | / | | ]], - [[ \| / | ]], - [[ `-----`---' ]], - [[ ]], - }, - { - [[ ,. ]], - [[ J;`. ]], - [[ iyi.`. ]], - [[ j?7;. : ]], - [[ fclu:.` : ]], - [[ dE2Xvi;. `. ]], - [[ JGL56bhx;.'; ]], - [[ 4KPY^f:l"`-; ]], - [[ """l:;-"" ]], - [[ `; \ ]], - [[ .' ; ]], - [[ /'.' ]], - [[ f .' ]], - [[ `. \ ]], - [[ `-' ]], - [[ ]], - }, - { - [[ ___..._ ]], - [[ _,--' "`-. ]], - [[ ,'. . \ ]], - [[ ,/:. . . .' ]], - [[ |;.. . _..--' ]], - [[ `--:...-,-'""\ ]], - [[ |:. `. ]], - [[ l;. l ]], - [[ `|:. | ]], - [[ |:. `., ]], - [[ .l;. j, , ]], - [[ `. \`;:. //,/ ]], - [[ .\\)`;,|\'/( ]], - [[ ` ` ` ]], - [[ ]], - } } Quotes = { diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua index b1a6451..464f9df 100644 --- a/nvim/lua/plugins/nvim-lspconfig.lua +++ b/nvim/lua/plugins/nvim-lspconfig.lua @@ -69,7 +69,12 @@ local config = function() capabilities = capabilities, }) -- nixd configuration - lspconfig.nixd.setup({ + -- lspconfig.nixd.setup({ + -- on_attach = on_attach, + -- capabilities = capabilities, + -- }) + -- typescript-language-server + lspconfig.ts_ls.setup({ on_attach = on_attach, capabilities = capabilities, }) diff --git a/nvim/lua/plugins/nvim-treesitter.lua b/nvim/lua/plugins/nvim-treesitter.lua index 988673b..800df42 100644 --- a/nvim/lua/plugins/nvim-treesitter.lua +++ b/nvim/lua/plugins/nvim-treesitter.lua @@ -18,7 +18,8 @@ local config = function() "cpp", "rust", "haskell", - "nix" + "nix", + "javascript" }, auto_install = false, highlight = { diff --git a/nvim/lua/plugins/oil.lua b/nvim/lua/plugins/oil.lua index be3f35e..e717988 100644 --- a/nvim/lua/plugins/oil.lua +++ b/nvim/lua/plugins/oil.lua @@ -12,17 +12,17 @@ local config = function() delete_to_trash = true, skip_confirm_for_simple_edits = true, keymaps = { - ["o?"] = "actions.show_help", + ["b?"] = "actions.show_help", ["<CR>"] = "actions.select", - ["op"] = "actions.preview", + ["bp"] = "actions.preview", ["q"] = "actions.close", - ["or"] = "actions.refresh", + ["br"] = "actions.refresh", ["-"] = "actions.parent", ["_"] = "actions.open_cwd", ["~"] = "actions.cd", - ["os"] = "actions.change_sort", - ["o."] = "actions.toggle_hidden", - ["ot"] = "actions.toggle_trash", + ["bs"] = "actions.change_sort", + ["b."] = "actions.toggle_hidden", + ["bt"] = "actions.toggle_trash", }, use_default_keymaps = false, }) diff --git a/nvim/lua/plugins/toggleterm.lua b/nvim/lua/plugins/toggleterm.lua index f47d0ab..0426436 100644 --- a/nvim/lua/plugins/toggleterm.lua +++ b/nvim/lua/plugins/toggleterm.lua @@ -1,6 +1,6 @@ local init = function() local keymap = vim.keymap - keymap.set("n", "<C-t>", ":ToggleTerm<Enter>:startinsert<Enter>", + keymap.set("n", "<C-t>", ":ToggleTerm<Enter>", { noremap = true, silent = true, desc = "Terminal (ToggleTerm)" }) -- Terminal keymap.set("t", "<C-t>", "<C-\\><C-n>:ToggleTerm<Enter>") keymap.set("n", "<Space>g", ":ToggleLazyGit<Enter>", @@ -11,9 +11,9 @@ local config = function() require("toggleterm").setup { autochdir = false, direction = "float", - -- open_mapping = [[<c-t>]], - -- terminal_mappings = true, - start_in_insert = false, + open_mapping = [[<c-t>]], + terminal_mappings = true, + start_in_insert = true, float_opts = { border = "curved", }, |