From 126a2076cc9fb1466d9ed57538a54ffc06ff0623 Mon Sep 17 00:00:00 2001 From: Emmet Date: Mon, 16 Sep 2024 21:46:12 -0500 Subject: [PATCH] More neovide + nvim config --- flake.nix | 5 ++++- user/app/doom-emacs/doom.nix | 3 --- user/app/nvim/init.lua | 2 ++ user/app/nvim/lua/chadrc.lua | 15 +++++++++++++++ user/app/nvim/lua/configs/lspconfig.lua | 5 ++++- user/app/nvim/lua/mappings.lua | 3 +++ user/app/nvim/lua/plugins/init.lua | 2 +- user/app/nvim/nvim.nix | 19 +++++++++++++++++++ 8 files changed, 48 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index ac70a0f..1ecda3f 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,10 @@ (editor == "nano")) then "exec " + term + " -e " + editor else - editor); + (if (editor == "neovide") then + "neovide -- --listen /tmp/nvimsocket" + else + editor)); }; # create patched nixpkgs diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index c516fbe..dde3ddf 100644 --- a/user/app/doom-emacs/doom.nix +++ b/user/app/doom-emacs/doom.nix @@ -48,9 +48,6 @@ in home.packages = (with pkgs-emacs; [ emacs-lsp-booster - nil - nixfmt - kotlin-language-server file wmctrl jshon diff --git a/user/app/nvim/init.lua b/user/app/nvim/init.lua index 64d8655..1c842e2 100644 --- a/user/app/nvim/init.lua +++ b/user/app/nvim/init.lua @@ -11,6 +11,8 @@ if vim.g.neovide then vim.g.neovide_transparency = 0.8 vim.g.neovide_floating_blur_amount_x = 8.0 vim.g.neovide_floating_blur_amount_y = 8.0 + vim.g.neovide_refresh_rate = 120 + vim.g.neovide_cursor_vfx_mode = "pixiedust" end vim.g.neovide_scale_factor = 1.0 diff --git a/user/app/nvim/lua/chadrc.lua b/user/app/nvim/lua/chadrc.lua index 5fd0c74..0a54e69 100644 --- a/user/app/nvim/lua/chadrc.lua +++ b/user/app/nvim/lua/chadrc.lua @@ -14,4 +14,19 @@ M.base46 = { -- }, } +M.ui = { + theme = "stylix", + nvdash = { + load_on_startup = true, + buttons = { + { " Find File", "Spc .", "Telescope find_files" }, + { "󰙅 Nvimtree", "SPC e", "NvimTreeToggle" }, + { " Projects ", "Spc p p", "Telescope workspaces" }, + { "󰯌 Vsplit ", "Spc w v", "vsplit" }, + { "󰯋 Split ", "Spc w s", "split" }, + { "󰋗 Help", "Spc c h", "NvCheatsheet" }, + }, + } +} + return M diff --git a/user/app/nvim/lua/configs/lspconfig.lua b/user/app/nvim/lua/configs/lspconfig.lua index 478df01..ea9e812 100644 --- a/user/app/nvim/lua/configs/lspconfig.lua +++ b/user/app/nvim/lua/configs/lspconfig.lua @@ -4,7 +4,7 @@ require("nvchad.configs.lspconfig").defaults() local lspconfig = require "lspconfig" -- EXAMPLE -local servers = { "html", "cssls" } +local servers = { "html", "cssls", "nil_ls", "marksman", "clangd", "pylsp", "ts_ls", "java_language_server", "dockerls", "docker_compose_language_service", "jsonls", "kotlin_language_server", "bashls", "yamlls", "sqls" } local nvlsp = require "nvchad.configs.lspconfig" -- lsps with default config @@ -15,6 +15,9 @@ for _, lsp in ipairs(servers) do capabilities = nvlsp.capabilities, } end +lspconfig.gdscript.setup { + cmd = { "ncat", "localhost", "6005"} +} -- configuring single server, example: typescript -- lspconfig.ts_ls.setup { diff --git a/user/app/nvim/lua/mappings.lua b/user/app/nvim/lua/mappings.lua index b074c8b..412948f 100644 --- a/user/app/nvim/lua/mappings.lua +++ b/user/app/nvim/lua/mappings.lua @@ -30,6 +30,9 @@ map("n", "gg", "Neogit", { desc = "Neogit status buffer" }) map("n", "c", "gcc", { desc = "Toggle Comment", remap = true }) map("v", "c", "gc", { desc = "Toggle comment", remap = true }) map("n", "pp", "Telescope workspaces", { desc = "telescope workspaces" }) +map("n", "pf", "Telescope find_files", { desc = "telescope find files" }) +map("n", "", "q", { desc = "quit" }) +map("n", "wd>", "q", { desc = "quit" }) map("n", "ws", "split", { desc = "horizontal split" }) map("n", "wS", "split", { desc = "horizontal split" }) map("n", "wv", "vsplit", { desc = "vertical split" }) diff --git a/user/app/nvim/lua/plugins/init.lua b/user/app/nvim/lua/plugins/init.lua index a433f1b..69c205e 100644 --- a/user/app/nvim/lua/plugins/init.lua +++ b/user/app/nvim/lua/plugins/init.lua @@ -18,7 +18,7 @@ return { opts = { ensure_installed = { "vim", "lua", "vimdoc", - "html", "css" + "html", "css", 'gdscript' }, }, }, diff --git a/user/app/nvim/nvim.nix b/user/app/nvim/nvim.nix index 4d41d0a..6944c74 100644 --- a/user/app/nvim/nvim.nix +++ b/user/app/nvim/nvim.nix @@ -3,9 +3,28 @@ { home.packages = with pkgs; [ neovim + neovim-remote neovide lua-language-server + vscode-langservers-extracted + nil + clang-tools + marksman + python311Packages.python-lsp-server + typescript-language-server + java-language-server + dockerfile-language-server-nodejs + docker-compose-language-service + kotlin-language-server + bash-language-server + yaml-language-server + sqls + nmap ]; + programs.neovim = { + viAlias = true; + vimAlias = true; + }; home.file.".config/nvim".source = ./.; home.file.".config/nvim".recursive = true; home.file.".config/nvim/lua/themes/stylix.lua".source = config.lib.stylix.colors {