From 45d39ae0c67bb086f4df0c366b251e06c888408d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 30 Aug 2023 08:23:15 +0200 Subject: [aliases] also check home for dircolors --- config/essentials/zsh/aliases.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 0c7c1ac..6df28e3 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -50,7 +50,8 @@ alias pf='profanity' alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml' -if [ -x /usr/bin/dircolors ]; then +if [ -x /usr/bin/dircolors ] || [ -x $HOME/../usr/bin/dircolors ] +then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" # alias ls='ls -h --color --group-directories-first' #alias dir='dir --color=auto' -- cgit v1.2.3 From 15cb59f6adc9b45338c08392cecb5d256ba136e6 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 30 Aug 2023 08:27:45 +0200 Subject: [aliases] added googoo~ + tmux aliases --- config/essentials/zsh/aliases.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 28aef75..e17218d 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -5,10 +5,13 @@ if [ $SHELL = "/bin/zsh" ] then # googoo aliases + alias o~='o $HOME' alias o/='o /' alias o/s='o /srv' + alias go~='go $HOME' alias go/='go /' alias go/s='go /srv' + alias ogo~='ogo $HOME' alias ogo/='ogo /' alias ogo/s='ogo /srv' @@ -134,8 +137,10 @@ alias sxt='sxiv -t' alias wgsh='wget --quiet --show-progress' alias wgc='wgsh "$(clipo)"' alias ss4='ss -tln4p' +alias mdb='mariadb -u admin -ppass admindb' alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb' alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb' +alias tmux='tmux a || tmux' # ssh alias sha='ssh-add' -- cgit v1.2.3 From 7ce79173671ddedcef6a8eee96a3dab9fefbc4c2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 30 Aug 2023 08:28:10 +0200 Subject: [nvim] added zk remaps --- config/essentials/nvim/lua/user/zk.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 8004238..0e3064c 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -69,6 +69,7 @@ require('telekasten').setup({ }) vim.keymap.set("n", "z", "Telekasten panel") +vim.keymap.set("n", "zb", "Telekasten show_backlinks") vim.keymap.set("n", "zz", "Telekasten follow_link") vim.keymap.set("n", "zN", "Telekasten new_templated_note") vim.keymap.set("n", "zT", "Telekasten goto_today") @@ -79,7 +80,9 @@ vim.keymap.set("n", "zg", "Telekasten search_notes") vim.keymap.set("n", "zm", "Telekasten browse_media") vim.keymap.set("n", "zn", "Telekasten new_note") vim.keymap.set("n", "zp", "Telekasten preview_img") +vim.keymap.set("n", "zr", "Telekasten rename_note") vim.keymap.set("n", "zs", "Telekasten switch_vault") +vim.keymap.set("n", "zS", "Telekasten search_notes") vim.keymap.set("n", "zt", "Telekasten panel") vim.keymap.set("n", "zw", "Telekasten find_weekly_notes") -vim.keymap.set("n", "#", "Telekasten show_tags") +vim.keymap.set("n", "z#", "Telekasten show_tags") -- cgit v1.2.3 From 604180342f4d5b1d629faf74d3ed7ffec30cfc3c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 30 Aug 2023 08:28:21 +0200 Subject: [nvim] added DataEssentials vault --- config/essentials/nvim/lua/user/zk.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 0e3064c..41072a6 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -50,6 +50,11 @@ require('telekasten').setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, + DataEssentials = { + home = home .. "/" .. "DataEssentials", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, NetworkEssentials = { home = home .. "/" .. "NetworkEssentials", template_new_note = home .. "/" .. "templates/new_note.md", -- cgit v1.2.3 From 63c0bcf403754c060dcbfd6b762408c291b0d3a7 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 30 Aug 2023 08:28:55 +0200 Subject: [nvim] moved common lsp from java.lua to setup.lua --- config/essentials/nvim/ftplugin/java.lua | 16 ---------------- config/essentials/nvim/lua/user/cmp/setup.lua | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/ftplugin/java.lua b/config/essentials/nvim/ftplugin/java.lua index d1df118..ce0a202 100644 --- a/config/essentials/nvim/ftplugin/java.lua +++ b/config/essentials/nvim/ftplugin/java.lua @@ -12,22 +12,6 @@ end 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") - nnoremap('gd', vim.lsp.buf.definition, bufopts, "Go to definition") - nnoremap('gi', vim.lsp.buf.implementation, bufopts, "Go to implementation") - nnoremap('K', vim.lsp.buf.hover, bufopts, "Hover text") - nnoremap('', vim.lsp.buf.signature_help, bufopts, "Show signature") - nnoremap('wa', vim.lsp.buf.add_workspace_folder, bufopts, "Add workspace folder") - nnoremap('wr', vim.lsp.buf.remove_workspace_folder, bufopts, "Remove workspace folder") - nnoremap('wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts, "List workspace folders") - nnoremap('D', vim.lsp.buf.type_definition, bufopts, "Go to type definition") - nnoremap('rn', vim.lsp.buf.rename, bufopts, "Rename") - nnoremap('', vim.lsp.buf.code_action, bufopts, "Code actions") - vim.keymap.set('v', "", "lua vim.lsp.buf.range_code_action()", - { noremap=true, silent=true, buffer=bufnr, desc = "Code actions" }) - nnoremap('f', function() vim.lsp.buf.format { async = true } end, bufopts, "Format file") -- Java extensions provided by jdtls nnoremap("i", jdtls.organize_imports, bufopts, "Organize imports") diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua index 8f8291e..36d55e3 100644 --- a/config/essentials/nvim/lua/user/cmp/setup.lua +++ b/config/essentials/nvim/lua/user/cmp/setup.lua @@ -42,3 +42,27 @@ cmp.setup.cmdline(':', { { name = 'cmdline', keyword_length = 4 } }), }) + +local function nnoremap(rhs, lhs, bufopts, desc) + bufopts.desc = desc + vim.keymap.set("n", rhs, lhs, bufopts) +end + +-- Regular Neovim LSP client keymappings +local bufopts = { noremap=true, silent=true } +nnoremap('gD', vim.lsp.buf.declaration, bufopts, "Go to declaration") +nnoremap('gd', vim.lsp.buf.definition, bufopts, "Go to definition") +nnoremap('gi', vim.lsp.buf.implementation, bufopts, "Go to implementation") +nnoremap('K', vim.lsp.buf.hover, bufopts, "Hover text") +nnoremap('', vim.lsp.buf.signature_help, bufopts, "Show signature") +nnoremap('wa', vim.lsp.buf.add_workspace_folder, bufopts, "Add workspace folder") +nnoremap('wr', vim.lsp.buf.remove_workspace_folder, bufopts, "Remove workspace folder") +nnoremap('wl', function() +print(vim.inspect(vim.lsp.buf.list_workspace_folders())) +end, bufopts, "List workspace folders") +nnoremap('D', vim.lsp.buf.type_definition, bufopts, "Go to type definition") +nnoremap('rn', vim.lsp.buf.rename, bufopts, "Rename") +nnoremap('', vim.lsp.buf.code_action, bufopts, "Code actions") +vim.keymap.set('v', "", "lua vim.lsp.buf.range_code_action()", +{ noremap=true, silent=true, desc = "Code actions" }) +nnoremap('f', function() vim.lsp.buf.format { async = true } end, bufopts, "Format file") -- cgit v1.2.3 From 60eabe31c0d1d58f11fcb95a5be120b59c5bfc5d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 30 Aug 2023 08:29:27 +0200 Subject: [nvim] added telescope-media-files --- config/essentials/nvim/after/plugin/telescope.lua | 25 ++++++++--------------- config/essentials/nvim/lua/user/packer.lua | 1 + 2 files changed, 9 insertions(+), 17 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/telescope.lua b/config/essentials/nvim/after/plugin/telescope.lua index f93ed60..06c5a03 100644 --- a/config/essentials/nvim/after/plugin/telescope.lua +++ b/config/essentials/nvim/after/plugin/telescope.lua @@ -1,3 +1,6 @@ +require('telescope').load_extension('fzf') +require('telescope').load_extension('media_files') + require('telescope').setup({ defaults = { path_display = { @@ -14,13 +17,17 @@ require('telescope').setup({ override_generic_sorter = true, override_file_sorter = true, case_mode = "smart_case", + }, + media_files = { + filetypes = {"png", "webp", "jpg", "jpeg"}, + find_cmd = "rg" } } }) -require('telescope').load_extension('fzf') local builtin = require('telescope.builtin') vim.keymap.set('n', 'ff', builtin.find_files) +vim.keymap.set('n', 'fb', builtin.buffers) vim.keymap.set('n', 'fg', builtin.git_files) vim.keymap.set('n', 'fw', builtin.live_grep) -- symbols @@ -35,23 +42,7 @@ require("telescope").setup { 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/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index 9351460..4a174bc 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -8,6 +8,7 @@ return require('packer').startup(function(use) } use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } use {'nvim-telescope/telescope-ui-select.nvim' } + use {'nvim-telescope/telescope-media-files.nvim'} use('nvim-telescope/telescope-symbols.nvim') use('theprimeagen/harpoon') -- cgit v1.2.3