From 30ae3cfa42e485a00a268c332a76ae322cf32246 Mon Sep 17 00:00:00 2001 From: "eric.marin" Date: Wed, 9 Oct 2024 19:26:26 +0200 Subject: added ags and removed eww --- nvim/lazy-lock.json | 38 ++++++++-------- nvim/lua/plugins/dashboard-nvim.lua | 85 ------------------------------------ nvim/lua/plugins/nvim-lspconfig.lua | 7 ++- nvim/lua/plugins/nvim-treesitter.lua | 3 +- nvim/lua/plugins/oil.lua | 12 ++--- nvim/lua/plugins/toggleterm.lua | 8 ++-- 6 files changed, 37 insertions(+), 116 deletions(-) (limited to 'nvim') diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 0b2124f..93f66be 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,32 +1,32 @@ { - "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, + "catppuccin": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "dashboard-nvim": { "branch": "master", "commit": "2af7b6d5bb24099dbbdf4a6cacc5fcf2a7094d62" }, - "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, + "dashboard-nvim": { "branch": "master", "commit": "06f0cad2716f28830bc02850382ed859620dac21" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, - "lspsaga.nvim": { "branch": "main", "commit": "e64351d0e6335eadf089aa2b9f17221e54ca10a4" }, + "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, + "lspsaga.nvim": { "branch": "main", "commit": "f0b5d2ce3912a9d84fae8083cb9cab90def39f3e" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, + "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "d88ae6623fef09251e3aa20001bb761686eae730" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-lspconfig": { "branch": "master", "commit": "d3f169f436e1b44538bfe7e13b4721eec48dbc59" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" }, - "nvim-treesitter": { "branch": "master", "commit": "b6a6d8997c46dc15682020ce4fddc5a89ee1ac0d" }, - "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, - "oil.nvim": { "branch": "master", "commit": "665bf2edc9f9a6d77a6fc636df36276c97fb5d66" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "telescope.nvim": { "branch": "master", "commit": "fe999db6e0c39c8984519ead75660e0e2d3245d3" }, - "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, + "nvim-treesitter": { "branch": "master", "commit": "9d2acd49976e2a9da72949008df03436f781fd23" }, + "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, + "oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope.nvim": { "branch": "master", "commit": "dc6fc321a5ba076697cca89c9d7ea43153276d81" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, - "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, + "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, "vim-highlightedyank": { "branch": "master", "commit": "afb0f262b490706c23e94012c2ab9fa67c0481ce" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, - "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } } 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 @@ -99,18 +99,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", [""] = "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", "", ":ToggleTerm:startinsert", + keymap.set("n", "", ":ToggleTerm", { noremap = true, silent = true, desc = "Terminal (ToggleTerm)" }) -- Terminal keymap.set("t", "", ":ToggleTerm") keymap.set("n", "g", ":ToggleLazyGit", @@ -11,9 +11,9 @@ local config = function() require("toggleterm").setup { autochdir = false, direction = "float", - -- open_mapping = [[]], - -- terminal_mappings = true, - start_in_insert = false, + open_mapping = [[]], + terminal_mappings = true, + start_in_insert = true, float_opts = { border = "curved", }, -- cgit v1.2.3