diff options
| -rwxr-xr-x | bin/guiscripts/dmcalc | 19 | ||||
| -rw-r--r-- | config/essentials/nvim/after/plugin/telescope.lua | 28 | ||||
| -rw-r--r-- | config/essentials/nvim/ftplugin/java.lua | 34 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/packer.lua | 1 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/zk.lua | 1 |
5 files changed, 58 insertions, 25 deletions
diff --git a/bin/guiscripts/dmcalc b/bin/guiscripts/dmcalc index 46c35c6..80fe853 100755 --- a/bin/guiscripts/dmcalc +++ b/bin/guiscripts/dmcalc @@ -1,12 +1,9 @@ #!/bin/sh -dmenu -p Calculate: < /dev/null | - xargs echo | - bc 2>&1 | - xargs -I {} echo -e "{}\n" | - dmenu -p Answer: -l 1 -g 1 | - xclipp -# TODO -# ask for calculation -# shows answer -# if esc -> quit -# if enter, continue with answer +calc=0 +result="calc:" +while [ "$calc" ] +do + calc="$(echo -n | dmenu -p "$result")" + result="$(echo "$result $calc" | bc)" +done +echo -n "$result" | xclip diff --git a/config/essentials/nvim/after/plugin/telescope.lua b/config/essentials/nvim/after/plugin/telescope.lua index b57713e..f93ed60 100644 --- a/config/essentials/nvim/after/plugin/telescope.lua +++ b/config/essentials/nvim/after/plugin/telescope.lua @@ -27,3 +27,31 @@ vim.keymap.set('n', '<leader>fw', builtin.live_grep) vim.keymap.set("n", "<leader>tse", "<cmd>lua require'telescope.builtin'.symbols{ sources = {'emoji', 'gitmoji'} }<CR>") vim.keymap.set("n", "<leader>tsn", "<cmd>lua require'telescope.builtin'.symbols{ sources = {'nerd'} }<CR>") vim.keymap.set("n", "<leader>tsj", "<cmd>lua require'telescope.builtin'.symbols{ sources = {'julia'} }<CR>") + +-- This is your opts table +require("telescope").setup { + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown { + -- even more opts + } + + -- pseudo code / specification for writing custom displays, like the one + -- for "codeactions" + -- specific_opts = { + -- [kind] = { + -- make_indexed = function(items) -> indexed_items, width, + -- make_displayer = function(widths) -> displayer + -- make_display = function(displayer) -> function(e) + -- make_ordinal = function(e) -> string + -- }, + -- -- for example to disable the custom builtin "codeactions" display + -- do the following + -- codeactions = false, + -- } + } + } +} +-- To get ui-select loaded and working with telescope, you need to call +-- load_extension, somewhere after setup function: +require("telescope").load_extension("ui-select") diff --git a/config/essentials/nvim/ftplugin/java.lua b/config/essentials/nvim/ftplugin/java.lua index 9cb52e1..d1df118 100644 --- a/config/essentials/nvim/ftplugin/java.lua +++ b/config/essentials/nvim/ftplugin/java.lua @@ -2,13 +2,14 @@ local home = os.getenv('HOME') local root_markers = {'gradlew', 'mvnw', '.git'} local root_dir = require('jdtls.setup').find_root(root_markers) local workspace_folder = home .. "/.local/share/eclipse/" .. vim.fn.fnamemodify(root_dir, ":p:h:t") +local jdtls = require('jdtls') -function nnoremap(rhs, lhs, bufopts, desc) +local function nnoremap(rhs, lhs, bufopts, desc) bufopts.desc = desc vim.keymap.set("n", rhs, lhs, bufopts) end -local on_attach = function(client, bufnr) +local on_attach = function(_, bufnr) -- Regular Neovim LSP client keymappings local bufopts = { noremap=true, silent=true, buffer=bufnr } nnoremap('gD', vim.lsp.buf.declaration, bufopts, "Go to declaration") @@ -16,23 +17,23 @@ local on_attach = function(client, bufnr) nnoremap('gi', vim.lsp.buf.implementation, bufopts, "Go to implementation") nnoremap('K', vim.lsp.buf.hover, bufopts, "Hover text") nnoremap('<C-k>', vim.lsp.buf.signature_help, bufopts, "Show signature") - nnoremap('<space>wa', vim.lsp.buf.add_workspace_folder, bufopts, "Add workspace folder") - nnoremap('<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts, "Remove workspace folder") - nnoremap('<space>wl', function() + nnoremap('<leader>wa', vim.lsp.buf.add_workspace_folder, bufopts, "Add workspace folder") + nnoremap('<leader>wr', vim.lsp.buf.remove_workspace_folder, bufopts, "Remove workspace folder") + nnoremap('<leader>wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, bufopts, "List workspace folders") - nnoremap('<space>D', vim.lsp.buf.type_definition, bufopts, "Go to type definition") - nnoremap('<space>rn', vim.lsp.buf.rename, bufopts, "Rename") - nnoremap('<space>ca', vim.lsp.buf.code_action, bufopts, "Code actions") - vim.keymap.set('v', "<space>ca", "<ESC><CMD>lua vim.lsp.buf.range_code_action()<CR>", + nnoremap('<leader>D', vim.lsp.buf.type_definition, bufopts, "Go to type definition") + nnoremap('<leader>rn', vim.lsp.buf.rename, bufopts, "Rename") + nnoremap('<leader><Return>', vim.lsp.buf.code_action, bufopts, "Code actions") + vim.keymap.set('v', "<leader><Return>", "<ESC><CMD>lua vim.lsp.buf.range_code_action()<CR>", { noremap=true, silent=true, buffer=bufnr, desc = "Code actions" }) - nnoremap('<space>f', function() vim.lsp.buf.format { async = true } end, bufopts, "Format file") + nnoremap('<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts, "Format file") -- Java extensions provided by jdtls - nnoremap("<C-o>", jdtls.organize_imports, bufopts, "Organize imports") - nnoremap("<space>ev", jdtls.extract_variable, bufopts, "Extract variable") - nnoremap("<space>ec", jdtls.extract_constant, bufopts, "Extract constant") - vim.keymap.set('v', "<space>em", [[<ESC><CMD>lua require('jdtls').extract_method(true)<CR>]], + nnoremap("<leader><leader>i", jdtls.organize_imports, bufopts, "Organize imports") + nnoremap("<leader>ev", jdtls.extract_variable, bufopts, "Extract variable") + nnoremap("<leader>ec", jdtls.extract_constant, bufopts, "Extract constant") + vim.keymap.set('v', "<leader>em", [[<ESC><CMD>lua require('jdtls').extract_method(true)<CR>]], { noremap=true, silent=true, buffer=bufnr, desc = "Extract method" }) end @@ -51,3 +52,8 @@ local config = { root_dir = root_dir, } require('jdtls').start_or_attach(config) + +vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.println(\\2);<cr>") +vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.println(\\2);<cr><esc>A") +vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.println(\"\\2: \" + \\2);<cr>") +vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.println(\"\\2: \" + \\2);<cr><esc>A") diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index 47c6600..86a70ed 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -7,6 +7,7 @@ return require('packer').startup(function(use) requires = { {'nvim-lua/plenary.nvim'} } } use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } + use {'nvim-telescope/telescope-ui-select.nvim' } use('nvim-telescope/telescope-symbols.nvim') use('theprimeagen/harpoon') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index a3cdefb..9de8b87 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -42,6 +42,7 @@ require('telekasten').setup({ }) vim.keymap.set("n", "<leader>z", "<cmd>Telekasten panel<cr>") +vim.keymap.set("n", "<leader>zz", "<cmd>Telekasten follow_link<cr>") vim.keymap.set("n", "<leader>zN", "<cmd>Telekasten new_templated_note<cr>") vim.keymap.set("n", "<leader>zT", "<cmd>Telekasten goto_today<cr>") vim.keymap.set("n", "<leader>zW", "<cmd>Telekasten goto_thisweek<cr>") |