From 6f44bdbce2bdf8111a18357fa61932a48d9b7b82 Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 12 Nov 2024 15:41:16 +0000 Subject: [PATCH 1/4] [nvim] hardtime.nvim --- .config/nvim/lua/plugins/editing.lua | 7 ++++++- Library/LaunchAgents/ethernetstatus.plist | 20 -------------------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 Library/LaunchAgents/ethernetstatus.plist diff --git a/.config/nvim/lua/plugins/editing.lua b/.config/nvim/lua/plugins/editing.lua index 2e28a3a..e8cdc9f 100644 --- a/.config/nvim/lua/plugins/editing.lua +++ b/.config/nvim/lua/plugins/editing.lua @@ -51,5 +51,10 @@ return { }, }, - } + }, + { + "m4xshen/hardtime.nvim", + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + opts = {} + }, } diff --git a/Library/LaunchAgents/ethernetstatus.plist b/Library/LaunchAgents/ethernetstatus.plist deleted file mode 100644 index 2fc1848..0000000 --- a/Library/LaunchAgents/ethernetstatus.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Label - net.francof.ethernetstatus - ProgramArguments - - /Users/afonso/.local/bin/ethernetstatus - Ethernet Status - - RunAtLoad - - WatchPaths - - /Library/Preferences/SystemConfiguration - - - - From 40bc6fca8df9a9f0307170ccf78aa0510241a2fd Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 12 Nov 2024 15:42:29 +0000 Subject: [PATCH 2/4] [nvim] cleanup old stuff --- .config/nvim/lua/plugins/lsp.lua | 1 - .config/nvim/lua/plugins/misc.lua | 6 --- .config/nvim/lua/plugins/treesitter.lua | 7 ---- .config/nvim/lua/plugins/ui.lua | 53 ++++++++++++++++++++----- 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 04fa069..bf2bb4a 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -16,7 +16,6 @@ return { { "smjonas/inc-rename.nvim", opts = { - input_buffer_type = "dressing", save_in_cmdline_history = false, } }, diff --git a/.config/nvim/lua/plugins/misc.lua b/.config/nvim/lua/plugins/misc.lua index f7fb9b6..3e75761 100644 --- a/.config/nvim/lua/plugins/misc.lua +++ b/.config/nvim/lua/plugins/misc.lua @@ -20,12 +20,6 @@ return { end, { desc = "Previous todo comment" }) }, }, - { - "TobinPalmer/pastify.nvim", - event = "VeryLazy", - cmd = { "Pastify" }, - opts = {}, - }, { 'eandrju/cellular-automaton.nvim', config = function() diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 01f74f7..c1d2366 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -27,13 +27,6 @@ return { treesitter.setup(options) end }, - { - "nvim-treesitter/nvim-treesitter-context", - event = "VeryLazy", - config = function() - require 'treesitter-context'.setup() - end, - }, { 'echasnovski/mini.ai', event = "VeryLazy", diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua index b2b56bd..0ef0c75 100644 --- a/.config/nvim/lua/plugins/ui.lua +++ b/.config/nvim/lua/plugins/ui.lua @@ -8,22 +8,53 @@ return { vim.g.tpipeline_statusline = '%=%l:%c' end }, - { - "j-hui/fidget.nvim", - opts = { - progress = { - display = { - render_limit = 3, - } - } - }, - }, - --Better quick fix { 'kevinhwang91/nvim-bqf', event = "VeryLazy", ft = 'qf' }, + + { + "folke/noice.nvim", + event = "VeryLazy", + opts = { + views = { + cmdline_popup = { + position = { + row = "100%", + col = "0%", + }, + size = { + min_width = 60, + width = "auto", + height = "auto", + }, + }, + cmdline_popupmenu = { + relative = "editor", + position = { + row = "85%", + col = "0%", + }, + }, + }, + lsp = { + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + presets = { + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = true, -- enables an input dialog for inc-rename.nvim + }, + }, + dependencies = { + "MunifTanjim/nui.nvim", + } + }, + -- { -- "OXY2DEV/markview.nvim", -- ft = "markdown", From 2f4814158e7adec74c88a48b478e822dddde749e Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 12 Nov 2024 15:42:56 +0000 Subject: [PATCH 3/4] [nvim] laststatus --- .config/nvim/lua/core/variables.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.config/nvim/lua/core/variables.lua b/.config/nvim/lua/core/variables.lua index 34110bc..718d8df 100644 --- a/.config/nvim/lua/core/variables.lua +++ b/.config/nvim/lua/core/variables.lua @@ -46,6 +46,4 @@ 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' +vim.opt.laststatus = 3 From 9431c745295b12c8724f74288de1c6efea3cfd47 Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 12 Nov 2024 15:46:32 +0000 Subject: [PATCH 4/4] [zsh] added more envs and remove direnv --- .config/zsh/.zshenv | 3 +++ .config/zsh/.zshrc | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index d045ada..654463f 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -14,6 +14,8 @@ if [[ $(uname) == "Darwin" ]]; then export PATH="/opt/homebrew/bin:$PATH" export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH" export PATH="/opt/homebrew/opt/texlive/bin:$PATH" + export GEM_HOME=$HOME/.gem + export PATH=$PATH:$GEM_HOME/bin else #ONLY LINUX export LIBVA_DRIVER_NAME=nvidia @@ -40,3 +42,4 @@ export XDG_CACHE_HOME="${HOME}/.cache" export XDG_DATA_HOME="${HOME}/.local/share" export XDG_STATE_HOME="${HOME}/.local/state" +. "$HOME/.cargo/env" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 2dc272f..31a7b3e 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -47,9 +47,8 @@ unset __conda_setup if [ -f "$HOME/.miniforge3/etc/profile.d/mamba.sh" ]; then . "$HOME/.miniforge3/etc/profile.d/mamba.sh" fi - # <<< conda initialize <<< -eval "$(direnv hook zsh)" + if [[ $(uname) == "Darwin" ]]; then eval "$(/opt/homebrew/bin/brew shellenv)" fi