diff --git a/docs/TODO.md b/docs/TODO.md index eda47fe..a285e79 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -10,7 +10,6 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md)) - [ ] OS Hardening with nix-mineral - [ ] Nixvim - - [ ] Telescope Theme - [ ] Markdown tab size 2 - [ ] UFO for folding - [ ] neotest golang diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index d906e6e..94a3248 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -8,6 +8,8 @@ ./plugins/tree.nix ./plugins/ui.nix ./plugins/utils.nix + ./plugins/dap.nix + ./plugins/telescope.nix ./options.nix ./keymaps.nix diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix index ae1a3b4..b5d2b26 100644 --- a/home/programs/nvim/keymaps.nix +++ b/home/programs/nvim/keymaps.nix @@ -243,7 +243,7 @@ options.desc = "Close"; } - # code + # Code { key = "cd"; action = "lua vim.lsp.buf.definition()"; @@ -254,26 +254,11 @@ action = "lua vim.lsp.buf.references()"; options.desc = "LSP References"; } - { - key = "ci"; - action = "lua vim.lsp.buf.implementation()"; - options.desc = "LSP Implementation"; - } { key = "ct"; action = "lua vim.lsp.buf.type_definition()"; options.desc = "LSP Type Definition"; } - { - key = "cs"; - action = "lua vim.lsp.buf.signature_help()"; - options.desc = "LSP Signature Help"; - } - { - key = "ch"; - action = "lua vim.lsp.buf.hover()"; - options.desc = "LSP Hover"; - } { key = "ca"; action = "lua vim.lsp.buf.code_action()"; @@ -284,11 +269,6 @@ action = "lua vim.lsp.buf.formatting()"; options.desc = "LSP Formatting"; } - { - key = "ce"; - action = "lua vim.lsp.diagnostic.show_line_diagnostics()"; - options.desc = "LSP Line Diagnostics"; - } { key = "cn"; action = "lua vim.lsp.diagnostic.goto_next()"; @@ -299,7 +279,16 @@ action = "lua vim.lsp.diagnostic.goto_prev()"; options.desc = "LSP Previous Diagnostic"; } - + { + key = "cu"; + action = "lua require('dapui').toggle()"; + options.desc = "Toggle Dapui"; + } + { + key = "cb"; + action = "lua require('dap').toggle_breakpoint()"; + options.desc = "Toggle breakpoint"; + } ]; }; } diff --git a/home/programs/nvim/plugins/dap.nix b/home/programs/nvim/plugins/dap.nix new file mode 100644 index 0000000..1de9291 --- /dev/null +++ b/home/programs/nvim/plugins/dap.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: { + programs.nixvim.plugins.dap = { + enable = true; + adapters = { }; + signs = { + dapBreakpoint = { + text = "●"; + texthl = "DapBreakpoint"; + }; + dapBreakpointCondition = { + text = "●"; + texthl = "DapBreakpointCondition"; + }; + dapLogPoint = { + text = "◆"; + texthl = "DapLogPoint"; + }; + }; + extensions = { + dap-go = { + enable = true; + delve.path = "${pkgs.delve}/bin/dlv"; + }; + dap-ui = { enable = true; }; + dap-virtual-text = { enable = true; }; + }; + }; +} diff --git a/home/programs/nvim/plugins/telescope.nix b/home/programs/nvim/plugins/telescope.nix new file mode 100644 index 0000000..f1118a5 --- /dev/null +++ b/home/programs/nvim/plugins/telescope.nix @@ -0,0 +1,26 @@ +{ config, ... }: { + programs.nixvim = { + highlight = { + TelescopePromptPrefix.fg = "#${config.lib.stylix.colors.base0D}"; + TelescopeSelectionCaret = { + fg = "#${config.lib.stylix.colors.base0D}"; + bg = "#${config.lib.stylix.colors.base01}"; + }; + TelescopeSelection.bg = "#${config.lib.stylix.colors.base01}"; + TelescopePromptTitle = { + bg = "#${config.lib.stylix.colors.base00}"; + fg = "#${config.lib.stylix.colors.base0D}"; + }; + TelescopePromptNormal.bg = "#${config.lib.stylix.colors.base00}"; + TelescopePromptBorder = { + bg = "#${config.lib.stylix.colors.base00}"; + fg = "#${config.lib.stylix.colors.base0D}"; + }; + }; + plugins.telescope = { + enable = true; + extensions.fzf-native = { enable = true; }; + settings.defaults = { selection_caret = "❚ "; }; + }; + }; +} diff --git a/home/programs/nvim/plugins/ui.nix b/home/programs/nvim/plugins/ui.nix index bc8c113..39cffcc 100644 --- a/home/programs/nvim/plugins/ui.nix +++ b/home/programs/nvim/plugins/ui.nix @@ -6,6 +6,8 @@ lualine = { enable = true; settings = { + options.disabled_filetypes.statusline = + [ "dashboard" "alpha" "neo-tree" ]; alwaysDivideMiddle = true; globalstatus = true; @@ -30,10 +32,12 @@ }; }; }; - dap.enable = true; web-devicons.enable = true; noice.enable = true; - notify.enable = true; + notify = { + enable = true; + level = "warn"; + }; gitsigns = { enable = true; settings.current_line_blame = false; diff --git a/home/programs/nvim/plugins/utils.nix b/home/programs/nvim/plugins/utils.nix index 6e6b58f..7bc8911 100644 --- a/home/programs/nvim/plugins/utils.nix +++ b/home/programs/nvim/plugins/utils.nix @@ -17,14 +17,6 @@ comment.enable = true; nvim-autopairs.enable = true; friendly-snippets.enable = true; - telescope = { - enable = true; - extensions.fzf-native = { enable = true; }; - settings = { - selection_caret = "/ "; - layout_config = { prompt_position = "top"; }; - }; - }; todo-comments.enable = true; treesitter = { enable = true; @@ -34,7 +26,6 @@ highlight.enable = true; }; }; - # TODO: Add not working harpoon = { enable = true; enableTelescope = true; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 107ff69..17b0e13 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -44,7 +44,6 @@ xfce.thunar bitwarden vlc - figma-linux # Dev go @@ -60,13 +59,13 @@ pfetch pandoc btop - cava # Just cool peaclock cbonsai pipes cmatrix + cava # Backup vscode