diff --git a/common/.config/btop/btop.conf b/common/.config/btop/btop.conf index 7c5f96e..00084d7 100644 --- a/common/.config/btop/btop.conf +++ b/common/.config/btop/btop.conf @@ -50,7 +50,7 @@ graph_symbol_proc = "default" shown_boxes = "cpu mem net proc" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. -update_ms = 2000 +update_ms = 400 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. @@ -60,7 +60,7 @@ proc_sorting = "memory" proc_reversed = False #* Show processes as a tree. -proc_tree = True +proc_tree = False #* Use the cpu graph colors in the process list. proc_colors = True diff --git a/common/.config/nvim/lua/keymappings.lua b/common/.config/nvim/lua/keymappings.lua index 2edcdcb..81bbf29 100644 --- a/common/.config/nvim/lua/keymappings.lua +++ b/common/.config/nvim/lua/keymappings.lua @@ -32,12 +32,6 @@ vim.api.nvim_set_keymap('v', '', '<<_', opts) vim.api.nvim_set_keymap('i', '', '\t', opts) vim.api.nvim_set_keymap('i', '', '\b', opts) --- window movement -vim.api.nvim_set_keymap('', '', '', opts) -vim.api.nvim_set_keymap('', '', '', opts) -vim.api.nvim_set_keymap('', '', '', opts) -vim.api.nvim_set_keymap('', '', '', opts) - -- jumping back and forth vim.api.nvim_set_keymap('', '', '', opts) vim.api.nvim_set_keymap('', '', '', opts) diff --git a/common/.config/nvim/lua/plugin-config/obsidian.lua b/common/.config/nvim/lua/plugin-config/obsidian.lua new file mode 100644 index 0000000..abbcc37 --- /dev/null +++ b/common/.config/nvim/lua/plugin-config/obsidian.lua @@ -0,0 +1,19 @@ +require('obsidian').setup({ + dir = '~/Obsidian', + completion = { + nvim_cmp = true, -- if using nvim-cmp, otherwise set to false + }, + follow_url_func = function(url) + -- Open the URL in the default web browser. + vim.fn.jobstart({'xdg-open', url}) -- linux + end, +}) + +vim.keymap.set('n', 'go', function() + if require('obsidian').util.cursor_on_markdown_link() then + return 'ObsidianFollowLink' + else + return 'go' + end +end, { noremap = false, expr = true }) + diff --git a/common/.config/nvim/lua/plugin-config/smart-splits.lua b/common/.config/nvim/lua/plugin-config/smart-splits.lua index 3aa8885..1fde5d4 100644 --- a/common/.config/nvim/lua/plugin-config/smart-splits.lua +++ b/common/.config/nvim/lua/plugin-config/smart-splits.lua @@ -12,7 +12,7 @@ require('smart-splits').setup({ -- whether to wrap to opposite side when cursor is at an edge -- e.g. by default, moving left at the left edge will jump -- to the rightmost window, and vice versa, same for up/down. - wrap_at_edge = true, + at_edge = 'wrap', -- when moving cursor between splits left or right, -- place the cursor on the same row of the *screen* -- regardless of line numbers. False by default. @@ -46,13 +46,23 @@ require('smart-splits').setup({ }, }) -vim.keymap.set('n', '', require('smart-splits').resize_left) -vim.keymap.set('n', '', require('smart-splits').resize_down) -vim.keymap.set('n', '', require('smart-splits').resize_up) -vim.keymap.set('n', '', require('smart-splits').resize_right) --- moving between splits -vim.keymap.set('n', '', require('smart-splits').move_cursor_left) -vim.keymap.set('n', '', require('smart-splits').move_cursor_down) -vim.keymap.set('n', '', require('smart-splits').move_cursor_up) -vim.keymap.set('n', '', require('smart-splits').move_cursor_right) +-- resize splits +vim.keymap.set('', '', require('smart-splits').resize_left) +vim.keymap.set('', '', require('smart-splits').resize_down) +vim.keymap.set('', '', require('smart-splits').resize_up) +vim.keymap.set('', '', require('smart-splits').resize_right) + +-- moving between splits +vim.keymap.set('', '', require('smart-splits').move_cursor_left) +vim.keymap.set('', '', require('smart-splits').move_cursor_down) +vim.keymap.set('', '', require('smart-splits').move_cursor_up) +vim.keymap.set('', '', require('smart-splits').move_cursor_right) + +local opts = { noremap = true, silent = true } + +-- window movement +vim.api.nvim_set_keymap('', '', '', opts) +vim.api.nvim_set_keymap('', '', '', opts) +vim.api.nvim_set_keymap('', '', '', opts) +vim.api.nvim_set_keymap('', '', '', opts) diff --git a/common/.config/nvim/lua/plugin-config/telescope.lua b/common/.config/nvim/lua/plugin-config/telescope.lua index b84c385..11cb5dd 100644 --- a/common/.config/nvim/lua/plugin-config/telescope.lua +++ b/common/.config/nvim/lua/plugin-config/telescope.lua @@ -6,6 +6,7 @@ vim.api.nvim_set_keymap('n', 'fb', "lua require'telescope.builtin'. vim.api.nvim_set_keymap('n', 'fh', "lua require'telescope.builtin'.help_tags()", opts) vim.api.nvim_set_keymap('n', 'fc', "TodoTelescope",opts) vim.api.nvim_set_keymap('n', 'fu', "Telescope undo",opts) +vim.api.nvim_set_keymap('n', 'fo', "ObsidianSearch",opts) local actions = require('telescope.actions') local themes = require('telescope.themes') diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua index 683afdf..af68551 100644 --- a/common/.config/nvim/lua/plugins.lua +++ b/common/.config/nvim/lua/plugins.lua @@ -77,6 +77,14 @@ local packer = require('packer').startup(function(use) end } + -- highlight variables under the cursor + use { + 'tzachar/local-highlight.nvim', + config = function() + require('local-highlight').setup() + end + } + -- better hotfix window (for showing and searching through results in telescope's find usages) use 'kevinhwang91/nvim-bqf' @@ -100,9 +108,9 @@ local packer = require('packer').startup(function(use) -- zen mode use { - "folke/zen-mode.nvim", + 'folke/zen-mode.nvim', config = function() - require("zen-mode").setup({}) + require('zen-mode').setup({}) end } @@ -140,9 +148,17 @@ local packer = require('packer').startup(function(use) -- auto brace pairs vscode-style use { - "windwp/nvim-autopairs", + 'windwp/nvim-autopairs', config = function() - require("nvim-autopairs").setup({}) + require('nvim-autopairs').setup({}) + end + } + + -- obsidian!!! + use { + 'epwalsh/obsidian.nvim', + config = function() + require('plugin-config/obsidian') end } @@ -152,20 +168,32 @@ local packer = require('packer').startup(function(use) use { 'lukas-reineke/indent-blankline.nvim', config = function () - require("indent_blankline").setup { - char = "│", - filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" }, + require('indent_blankline').setup { + char = '│', + filetype_exclude = { 'help', 'alpha', 'dashboard', 'neo-tree', 'Trouble', 'lazy' }, } end } + -- nicer looking indent guides use { 'echasnovski/mini.indentscope', config = function () - require('mini.indentscope').setup { - symbol = "│", + require('mini.indentscope').setup({ + symbol = '│', options = { try_as_border = true }, - } + }) + end + } + + -- colourcolumn that looks better + use { + 'ecthelionvi/NeoColumn.nvim', + config = function() + require('NeoColumn').setup({ + NeoColumn = 80, + always_on = true, + }) end } @@ -181,16 +209,16 @@ local packer = require('packer').startup(function(use) -- AI Autocompletion use { - "zbirenbaum/copilot.lua", - cmd = "Copilot", - event = "InsertEnter", + 'zbirenbaum/copilot.lua', + cmd = 'Copilot', + event = 'InsertEnter', config = function() - require("copilot").setup({ + require('copilot').setup({ suggestion = { enabled = true, auto_trigger = true, keymap = { - accept = "", + accept = '', } }, }) @@ -231,7 +259,7 @@ local packer = require('packer').startup(function(use) 'ray-x/lsp_signature.nvim', config = function () require('lsp_signature').setup({ - hint_prefix="🚀" + hint_prefix='🚀' }) end }