From 7388894febcba51958d757e656aa206256d08edb Mon Sep 17 00:00:00 2001 From: ALescoulie Date: Fri, 2 Aug 2024 17:26:50 -0700 Subject: [PATCH] fix nvim errors by removing dap code --- hm/hm_modules/nvim/ide.nvim | 86 ------------------------ hm/hm_modules/nvim/init.lua | 12 ---- hm/hm_modules/nvim/init.nvim | 9 ++- hm/hm_modules/nvim/nvim.nix | 122 ++++++++++++++++------------------- 4 files changed, 62 insertions(+), 167 deletions(-) diff --git a/hm/hm_modules/nvim/ide.nvim b/hm/hm_modules/nvim/ide.nvim index 830ef14..b3f84fe 100644 --- a/hm/hm_modules/nvim/ide.nvim +++ b/hm/hm_modules/nvim/ide.nvim @@ -47,89 +47,3 @@ nmap tg :TestVisit let maplocalleader = "\\" -" Dap settings - -nnoremap ff Telescope find_files -nnoremap fg Telescope live_grep -nnoremap fb Telescope buffers -nnoremap fh Telescope help_tags - -lua << EOF -local dap_ok, dap = pcall(require, "dap") -if not (dap_ok) then - print("nvim-dap not installed!") - return -end - -dap.adapters.haskell = { - type = 'executable'; - command = 'haskell-debug-adapter'; - args = {'--hackage-version=0.0.33.0'}; -} - -local workspaceFolder = vim.fn.getcwd() -dap.configurations = { - haskell = { - { - type = 'haskell'; - request = 'launch'; - name = "haskell-debug-adapter"; - program = "${file}"; - workspace = "${workspaceFolder}"; - startup = "${workspaceFolder}/test/Spec.hs"; - startupFunc = ""; - startupArgs = ""; - stopOnEntry = false; - mainArgs = ""; - ghciPrompt = "H>>= "; - ghciInitialPrompt = "> "; - ghciCmd = "cabal repl --test --no-load --no-build --main-is TARGET --ghci-options -fprint-evld-with-show"; - ghciEnv = {dummy=""}, - logFile = "${workspaceFolder}/hda.log"; - logLevel = "DEBUG"; - forceInspect = false; - } - } -} - - -local ht = require('haskell-tools') -local def_opts = { noremap = true, silent = true, } -ht.start_or_attach { - hls = { - on_attach = function(client, bufnr) - local opts = vim.tbl_extend('keep', def_opts, { buffer = bufnr, }) - -- haskell-language-server relies heavily on codeLenses, - -- so auto-refresh (see advanced configuration) is enabled by default - vim.keymap.set('n', 'ca', vim.lsp.codelens.run, opts) - vim.keymap.set('n', 'hs', ht.hoogle.hoogle_signature, opts) - vim.keymap.set('n', 'ea', ht.lsp.buf_eval_all, opts) - end, - }, -} - --- Suggested keymaps that do not depend on haskell-language-server: -local bufnr = vim.api.nvim_get_current_buf() --- set buffer = bufnr in ftplugin/haskell.lua -local opts = { noremap = true, silent = true, buffer = bufnr } - --- Toggle a GHCi repl for the current package -vim.keymap.set('n', 'rr', ht.repl.toggle, opts) --- Toggle a GHCi repl for the current buffer -vim.keymap.set('n', 'rf', function() - ht.repl.toggle(vim.api.nvim_buf_get_name(0)) -end, def_opts) -vim.keymap.set('n', 'rq', ht.repl.quit, opts) - --- Detect nvim-dap launch configurations --- (requires nvim-dap and haskell-debug-adapter) -ht.dap.discover_configurations(bufnr) - --- Adding hoogle to telescope -local telescope = require('telescope') - -telescope.load_extension('hoogle') - - -EOF - diff --git a/hm/hm_modules/nvim/init.lua b/hm/hm_modules/nvim/init.lua index acbc32b..e69de29 100644 --- a/hm/hm_modules/nvim/init.lua +++ b/hm/hm_modules/nvim/init.lua @@ -1,12 +0,0 @@ -local dap_ui_ok, ui = pcall(require, "dapui") -if not (dap_ok and dap_ui_ok) then - require("notify")("dap-ui not installed!", "warning") - return -end - -dap.configurations = { - haskell = { - { - type = "haskell", - name = "Debug", - requestgt diff --git a/hm/hm_modules/nvim/init.nvim b/hm/hm_modules/nvim/init.nvim index 492d3a1..97a04a5 100644 --- a/hm/hm_modules/nvim/init.nvim +++ b/hm/hm_modules/nvim/init.nvim @@ -21,9 +21,14 @@ autocmd BufNewFile,BufRead flake.lock set syntax=json autocmd BufNewFile,BufRead coc-settings.json set syntax=jsonc " Set colorscheme and transparency -colorscheme purify +let g:adwaita_dark = v:true +let g:adwaita_disable_cursorline = v:true +let g:adwaita_transparent = v:true +colorscheme adwaita + hi Normal guibg=NONE ctermbg=NONE -highlight LineNr term=bold cterm=NONE ctermfg=white ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE +highlight LineNr term=bold gui=NONE guifg=DarkViolet guibg=NONE +highlight Comment guifg=LightBlue guibg=NONE " Indentation settings and other stuff set autoindent smartindent ignorecase smartcase number splitbelow diff --git a/hm/hm_modules/nvim/nvim.nix b/hm/hm_modules/nvim/nvim.nix index 5c19ae2..1b1a682 100644 --- a/hm/hm_modules/nvim/nvim.nix +++ b/hm/hm_modules/nvim/nvim.nix @@ -1,73 +1,61 @@ { config, lib, pkgs, ... }: -let - - - haskellDapPlugins = with pkgs.haskellPackages; [ - haskell-dap - ghci-dap - haskell-debug-adapter - - ]; - - pythonDapPlugins = []; - - languageDebugPlugins = - haskellDapPlugins ++ - pythonDapPlugins; -in - with lib; - { - programs.neovim = { +{ + programs.neovim = { + enable = true; + defaultEditor = true; + viAlias = true; + vimAlias = true; + plugins = with pkgs.vimPlugins; [ + fzf-vim + nerdtree + nerdtree-git-plugin + rainbow + vim-airline + vim-easymotion + vim-floaterm + vim-nix + vim-plug + vim-sleuth + adwaita-nvim + coc-nvim + coc-rust-analyzer + coc-tsserver + coq_nvim + editorconfig-nvim + goyo-vim + limelight-vim + nerdcommenter + taglist-vim + vim-fugitive + vim-gitgutter + vim-terraform + vim-test + vimtex + awesome-vim-colorschemes + telescope-nvim + nvim-dap + nvim-dap-ui + ]; + + coc = { enable = true; - defaultEditor = true; - viAlias = true; - vimAlias = true; - plugins = with pkgs.vimPlugins; [ - fzf-vim - nerdtree - nerdtree-git-plugin - rainbow - vim-airline - vim-easymotion - vim-floaterm - vim-nix - vim-plug - vim-sleuth - tokyonight-nvim - coc-nvim - coc-rust-analyzer - coc-tsserver - coq_nvim - editorconfig-nvim - goyo-vim - limelight-vim - nerdcommenter - taglist-vim - vim-fugitive - vim-gitgutter - vim-terraform - vim-test - vimtex - awesome-vim-colorschemes - telescope-nvim - nvim-dap - nvim-dap-ui - ] ++ languageDebugPlugins; - - coc = { - enable = true; - settings = builtins.fromJSON (builtins.readFile ./coc-settings.json); - }; - - extraConfig = '' - source ${pkgs.vimPlugins.vim-plug}/plug.vim - - ${builtins.readFile ./init.nvim} - ${builtins.readFile ./ide.nvim} - ''; + settings = builtins.fromJSON (builtins.readFile ./coc-settings.json); }; - home.packages = with pkgs; [ nodejs nodePackages.npm fortran-language-server haskellPackages.hoogle]; - } + extraConfig = '' + source ${pkgs.vimPlugins.vim-plug}/plug.vim + + ${builtins.readFile ./init.nvim} + ${builtins.readFile ./ide.nvim} + ''; + }; + + home.packages = with pkgs; [ + nodejs + nodePackages.npm + fortran-language-server + haskellPackages.hoogle + ]; +}