aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorame <[email protected]>2023-11-12 22:34:01 -0600
committerame <[email protected]>2023-11-12 22:34:01 -0600
commitbf2feaaff3b337fd0512a340d15618fb128fec0e (patch)
treecb1533704e6afc08c135f7536da3ac98fcda08ed
parent740f4bd903cd3e3c5cccd6c66b7496022466c8f0 (diff)
added stuff:3
-rw-r--r--init.lua13
-rw-r--r--lua/config/whichkey.lua37
-rw-r--r--lua/opt.lua4
3 files changed, 41 insertions, 13 deletions
diff --git a/init.lua b/init.lua
index ce1d978..dc1a74e 100644
--- a/init.lua
+++ b/init.lua
@@ -21,7 +21,13 @@ local packer_bootstrap = ensure_packer()
return require('packer').startup(function(use)
- use 'mfussenegger/nvim-jdtls'
+ --use 'm4xshen/hardtime.nvim'
+ use 'sindrets/diffview.nvim'
+ use 'm00qek/baleia.nvim'
+ use 'potamides/pantran.nvim'
+ --use 'chrisbra/Colorizer'
+ use 'RaafatTurki/hex.nvim'
+ use 'mfussenegger/nvim-jdtls'
use 'nvim-lua/completion-nvim'
use 'ziglang/zig.vim'
use 'p00f/clangd_extensions.nvim'
@@ -52,10 +58,7 @@ return require('packer').startup(function(use)
use 'DNLHC/glance.nvim'
use 'marko-cerovac/material.nvim'
use 'Abstract-IDE/Abstract-cs'
- use {
- 'nvim-telescope/telescope.nvim', tag = '0.1.1',
- requires = { {'nvim-lua/plenary.nvim'} }
- }
+ use 'nvim-telescope/telescope.nvim'
use 'ggandor/flit.nvim'
use 'RRethy/nvim-base16'
use 'lewis6991/impatient.nvim'
diff --git a/lua/config/whichkey.lua b/lua/config/whichkey.lua
index 2fb572f..732d422 100644
--- a/lua/config/whichkey.lua
+++ b/lua/config/whichkey.lua
@@ -21,8 +21,8 @@ function M.setup()
local mappings = {
--["w"] = { "<cmd>update!<CR>", "Save" },
- ["f"] = { "<cmd>Neotree<CR>", "fs"},
- ["t"] = { "<cmd>UndotreeToggle<CR>", "clip tree"},
+ ["f"] = { "<cmd>Neotree toggle<CR>", "fs"},
+ ["c"] = { "<cmd>UndotreeToggle<CR>", "clip tree"},
["e"] = { "<cmd>TroubleToggle<CR>", "errors" },
["g"] = {
name = "'games'",
@@ -36,14 +36,35 @@ function M.setup()
["i"] = { "<cmd>lua require('sudoku').setup{}<CR><cmd>Sudoku<CR>", "sudoku" },
},
["n"] = {
- name = "sci",
- ["i"] = { "<cmd>lua require('nabla').toggle_virt({autogen=true})<CR>", "toggle" },
- },
+ name = "visual changes",
+ ["d"] = { function ()
+ if not _G.__diffview_open then
+ _G.__diffview_open = true;
+ vim.cmd("DiffviewOpen");
+ else _G.__diffview_open = false;
+ vim.cmd("DiffviewClose")
+ end
+ end, "toggle diff"},
+ ["s"] = { "<cmd>if &spell<CR>set nospell<CR>else<CR>set spell<CR>endif<CR>", "spellcheck"},
+ ["i"] = { "<cmd>lua require('nabla').toggle_virt({autogen=true})<CR>", "toggle markdown" },
+ ["h"] = { "<cmd>HexToggle<CR>", "hex" }
+ },
+ ["u"] = {
+ name = "utils",
+ ["h"] = { "<cmd>Hardtime toggle<CR>", "toggle hardtime" },
+ },
["q"] = {
- name = "quick chords",
+ name = "quick",
["l"] = { "0v$", "line" },
- ["s"] = { "\"+y", "system grab" },
- },
+ ["s"] = { "\"+y", "system grab" },
+ },
+ ["t"] = {
+ name = "telescope",
+ ["f"] = { "<cmd>Telescope find_files<CR>", "find files" },
+ ["b"] = { "<cmd>Telescope git_branches<CR>", "git branches" },
+ ["c"] = { "<cmd>Telescope git_commits<CR>", "git commits" },
+ ["l"] = { "<cmd>Telescope live_grep<CR>", "ripgrep" }
+ },
["z"] = {
name = "packer",
c = { "<cmd>PackerCompile<cr>", "compile" },
diff --git a/lua/opt.lua b/lua/opt.lua
index 03d7721..7c7dc9e 100644
--- a/lua/opt.lua
+++ b/lua/opt.lua
@@ -6,6 +6,9 @@ require('config.whichkey').setup()
require('startup').setup({theme = 'evil'})
require('gitsigns').setup()
--require("nvim-tree").setup()
+require('telescope').setup()
+require('hardtime').setup({enabled=false})
+require('hex').setup()
require("todo-comments").setup{}
require('toggleterm').setup({
direction = 'float',
@@ -100,3 +103,4 @@ wilder.set_option('renderer', wilder.wildmenu_renderer({
wilder.basic_highlighter(),
}),
}))
+