diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index ef2ee23..45a56a7 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -8,11 +8,11 @@ "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-zotcite": { "branch": "main", "commit": "281f43726bed2c5eb96bea1544edcf2e069795db" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "flutter-tools.nvim": { "branch": "main", "commit": "ce18f5da5f9c458cd26eef5c3accb0c37b2263c2" }, "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "fzf-lua": { "branch": "main", "commit": "ace9968be267b034e450be4feaf6e9107bc34fbd" }, "gruvbox-material": { "branch": "master", "commit": "b16dcd787db5ba9302b54ebeac186784c2aed29a" }, @@ -24,22 +24,18 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markview.nvim": { "branch": "main", "commit": "fb10bcbb401780234c2e8bd2ec3fc85a94521944" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "9b9b7cfa38b4871c3e44cfe89cf6d53fd40684d9" }, - "mini.files": { "branch": "main", "commit": "f5d06532a9b8cfff0f17226bf8ae7b15227ddb88" }, + "mini.notify": { "branch": "main", "commit": "1c901d62581439f3d17382a5bf7001a282d6468b" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-cmp": { "branch": "perf", "commit": "6c3d595f3223c1ae7392d4fde1626355439af6c1" }, - "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, - "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-lspconfig": { "branch": "master", "commit": "dcf511d53fae9675c6fde4241d94b2daaa5e0cd5" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-treesitter": { "branch": "master", "commit": "4f04fb7027ce786ac4adfd1c629ca40aea96ffec" }, "nvim-treesitter-context": { "branch": "master", "commit": "78a81c7494e7d1a08dd1200b556933e513fd9f29" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf" }, "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" }, "pastify.nvim": { "branch": "main", "commit": "5e0e7e5e1b4880476a35a82d3dfe93764a9a37da" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "rustaceanvim": { "branch": "master", "commit": "29f42cc149f915d771c550b6dfe7c788d856cf04" }, diff --git a/.config/nvim/lua/core/variables.lua b/.config/nvim/lua/core/variables.lua index 34110bc..c8ae4bd 100644 --- a/.config/nvim/lua/core/variables.lua +++ b/.config/nvim/lua/core/variables.lua @@ -46,6 +46,3 @@ vim.opt.signcolumn = "yes" vim.opt.autoread = true -- disable swapfile vim.opt.swapfile = false ---Make completion stop on command ambiguity -vim.opt.wildmenu = true -vim.opt.wildmode = 'longest:full,full' diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index 2e85eaf..6d3367b 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -108,16 +108,6 @@ return { }, { { name = "buffer", keyword_length = 5 }, }), - window = { - completion = { - border = "rounded", - winhighlight = "Normal:Normal,FloatBorder:Normal,CursorLine:Visual,Search:None", - }, - documentation = { - border = "rounded", - winhighlight = "Normal:Normal,FloatBorder:Normal,CursorLine:Visual,Search:None", - }, - } }) local cmp_autopairs = require("nvim-autopairs.completion.cmp") diff --git a/.config/nvim/lua/plugins/editing.lua b/.config/nvim/lua/plugins/editing.lua index 2e28a3a..0088202 100644 --- a/.config/nvim/lua/plugins/editing.lua +++ b/.config/nvim/lua/plugins/editing.lua @@ -22,34 +22,4 @@ return { }) end, }, - - { - "epwalsh/obsidian.nvim", - version = "v3.9.0", - lazy = true, - ft = "markdown", - dependencies = { - "nvim-lua/plenary.nvim", - }, - opts = { - workspaces = { - { - name = "tese", - path = "~/vaults/uni/tese/", - }, - { - name = "chronolens", - path = "~/vaults/uni/chronolens/", - }, - }, - completion = { - nvim_cmp = true, - min_chars = 2, - }, - picker = { - name = "fzf-lua", - }, - - }, - } } diff --git a/.config/nvim/lua/plugins/fzf-lua.lua b/.config/nvim/lua/plugins/fzf-lua.lua index 4bae661..f13880c 100644 --- a/.config/nvim/lua/plugins/fzf-lua.lua +++ b/.config/nvim/lua/plugins/fzf-lua.lua @@ -8,6 +8,7 @@ return { fzflua.register_ui_select() fzflua.setup({ defaults = { + headers = false, winopts = { border = "single", width = 0.6, @@ -18,7 +19,7 @@ return { previewer = false, winopts = { width = 0.5, - height = 0.5, + height = 0.3, } }, grep = { @@ -36,7 +37,6 @@ return { vim.keymap.set('n', 'fg', fzflua.live_grep, {}) vim.keymap.set('n', 'fb', fzflua.buffers, {}) vim.keymap.set('n', 'fh', fzflua.help_tags, {}) - vim.keymap.set({'n','v'}, 'fc', fzflua.commands, {}) end } } diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 04fa069..e8412ec 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -199,7 +199,7 @@ return { vim.keymap.set("n", "k", vim.lsp.buf.signature_help, bufopts) vim.keymap.set("n", "D", vim.lsp.buf.type_definition, bufopts) vim.keymap.set("n", "rn", rename_func, bufopts_expr) - vim.keymap.set({"n","v"}, "ca", vim.lsp.buf.code_action, bufopts) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) vim.keymap.set("n", "ge", vim.diagnostic.goto_next, bufopts) vim.keymap.set("n", "gE", vim.diagnostic.goto_prev, bufopts) vim.keymap.set("n", "fo", function() conform.format({ lsp_fallback = true }) end, bufopts) diff --git a/.config/nvim/lua/plugins/navigation.lua b/.config/nvim/lua/plugins/navigation.lua index 4370864..3952476 100644 --- a/.config/nvim/lua/plugins/navigation.lua +++ b/.config/nvim/lua/plugins/navigation.lua @@ -18,64 +18,8 @@ return { }, { "stevearc/oil.nvim", - config = function() - require("oil").setup({ - float = { - preview_split = "right" - }, - }) - -- Function to open oil.nvim in a vertical split - local function open_oil_split() - -- Calculate the width for the split (20% of the total width) - local width = math.floor(vim.o.columns * 0.2) -- 20% of total width - -- Create a vertical split and set width - vim.cmd("vsplit") -- Create a vertical split - vim.cmd(string.format("vertical resize %d", width)) -- Resize to 20% - -- Open oil in the new split - require("oil").open() -- Use open() to open oil.nvim - end - - -- Key mapping to open oil in a vertical split - vim.api.nvim_set_keymap('n', 'o', ':lua require("oil").open_float()', { noremap = true, silent = true }) - vim.keymap.set('n', 'O', open_oil_split, { noremap = true, silent = true }) - - end + opts = {}, }, - -- { - -- 'echasnovski/mini.files', - -- version = false, - -- opts = { - -- mappings = { - -- close = 'q', - -- go_in = '', - -- go_in_plus = 'l', - -- go_out = '', - -- go_out_plus = 'h', - -- reset = '', - -- show_help = 'g?', - -- synchronize = 's', - -- }, - -- options = { - -- permanent_delete = false - -- } - -- }, - -- keys = { - -- { - -- "o", - -- function() - -- require("mini.files").open(vim.api.nvim_buf_get_name(0), true) - -- end, - -- desc = "Open mini.files (Directory of the current file)" - -- }, - -- { - -- "O", - -- function() - -- require("mini.files").open(vim.uv.cwd(), true) - -- end, - -- desc = "Open mini.files (cwd)" - -- } - -- } - -- }, { 'mrjones2014/smart-splits.nvim', config = function() diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua index b2b56bd..02b5d59 100644 --- a/.config/nvim/lua/plugins/ui.lua +++ b/.config/nvim/lua/plugins/ui.lua @@ -24,23 +24,24 @@ return { event = "VeryLazy", ft = 'qf' }, - -- { - -- "OXY2DEV/markview.nvim", - -- ft = "markdown", - -- dependencies = { - -- "nvim-treesitter/nvim-treesitter", - -- "nvim-tree/nvim-web-devicons", - -- }, - -- opts = { - -- modes = { "n", "no", "c" }, - -- callbacks = { - -- on_enable = function(_, win) - -- vim.wo[win].conceallevel = 2; - -- vim.wo[win].concealcursor = "c"; - -- end - -- } - -- } - -- }, + { + "OXY2DEV/markview.nvim", + ft = "markdown", + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-tree/nvim-web-devicons", + }, + opts = { + modes = { "n", "no", "i", "c" }, + hybrid_modes = { "i" }, + callbacks = { + on_enable = function(_, win) + vim.wo[win].conceallevel = 2; + vim.wo[win].concealcursor = "c"; + end + } + } + }, { "folke/zen-mode.nvim", event = "VeryLazy", diff --git a/.config/pipewire/pipewire.conf.d/settings.conf b/.config/pipewire/pipewire.conf.d/settings.conf index f9ab0bc..2233232 100644 --- a/.config/pipewire/pipewire.conf.d/settings.conf +++ b/.config/pipewire/pipewire.conf.d/settings.conf @@ -1,6 +1,6 @@ context.properties = { - default.clock.rate = 44100 - default.clock.allowed-rates = [ 44100 ] + default.clock.rate = 96000 + default.clock.allowed-rates = [ 96000 ] default.clock.quantum = 128 default.clock.max-quantum = 128 default.clock.min-quantum = 128 diff --git a/.gitconfig b/.gitconfig index a845918..dc801c4 100644 --- a/.gitconfig +++ b/.gitconfig @@ -29,7 +29,7 @@ [tag] gpgsign = true [pull] - rebase = false + rebase = true [init] defaultBranch = main [alias] diff --git a/.local/bin/tms b/.local/bin/tms index 40731ab..46cf1b9 100755 --- a/.local/bin/tms +++ b/.local/bin/tms @@ -6,11 +6,10 @@ else uni_projects=$(find ~/projects/University -mindepth 3 -maxdepth 3 -type d) personal_projects=$(find ~/projects/Personal -mindepth 1 -maxdepth 1 -type d) work_projects=$(find ~/projects/Work -mindepth 1 -maxdepth 1 -type d) - vaults=$(find ~/vaults/ -mindepth 2 -maxdepth 2 -type d) gits=$(find ~/gits -mindepth 1 -maxdepth 1 -type d) dotfiles=$(find ~/.config -mindepth 1 -maxdepth 1 -type d) #Merge the two lists - selected=$(echo -e "$uni_projects\n$personal_projects\n$work_projects\n$dotfiles\n$gits\n$vaults" | fzf) + selected=$(echo -e "$uni_projects\n$personal_projects\n$work_projects\n$dotfiles\n$gits" | fzf) fi if [[ -z $selected ]]; then