From 1b4603b3945facd5c027fdadd43f58674418325a Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Thu, 25 May 2023 00:13:44 +0100 Subject: [PATCH 1/2] [MINOR] fish replaced functions with abbr --- .config/fish/config.fish | 2 +- .config/fish/myfunctions/dotfiles.fish | 5 +--- .config/fish/myfunctions/packages.fish | 32 ---------------------- .config/fish/myfunctions/pacman.fish | 19 +++---------- .config/fish/myfunctions/replacements.fish | 5 ++-- 5 files changed, 9 insertions(+), 54 deletions(-) delete mode 100644 .config/fish/myfunctions/packages.fish diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 50a842e..9464e2d 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -14,6 +14,6 @@ fish_add_path $HOME/.ghcup/bin source ~/.config/fish/myfunctions/code.fish source ~/.config/fish/myfunctions/dotfiles.fish -source ~/.config/fish/myfunctions/packages.fish +source ~/.config/fish/myfunctions/pacman.fish source ~/.config/fish/myfunctions/qol.fish source ~/.config/fish/myfunctions/replacements.fish diff --git a/.config/fish/myfunctions/dotfiles.fish b/.config/fish/myfunctions/dotfiles.fish index 30a0f59..859999a 100644 --- a/.config/fish/myfunctions/dotfiles.fish +++ b/.config/fish/myfunctions/dotfiles.fish @@ -2,9 +2,6 @@ function config /usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME $argv end -function lazyconfig - lazygit --git-dir=$HOME/dotfiles/ --work-tree=$HOME/ $argv -end -alias lc=lazyconfig +abbr -a lc "lazygit --git-dir=$HOME/dotfiles/ --work-tree=$HOME/" diff --git a/.config/fish/myfunctions/packages.fish b/.config/fish/myfunctions/packages.fish deleted file mode 100644 index 8809bac..0000000 --- a/.config/fish/myfunctions/packages.fish +++ /dev/null @@ -1,32 +0,0 @@ -function i - sudo pacman -S $argv -end - -function zi - sudo zypper install $argv -end - -function s - sudo pacman -Ss $argv -end - -function zs - sudo zypper search $argv -end - -function u - sudo pacman -Syu -end - -function zu - sudo zypper refresh && sudo zypper update -end - -function r - sudo pacman -Rns $argv -end - -function zr - sudo zypper remove $argv -end - diff --git a/.config/fish/myfunctions/pacman.fish b/.config/fish/myfunctions/pacman.fish index e3d76ee..916bc41 100644 --- a/.config/fish/myfunctions/pacman.fish +++ b/.config/fish/myfunctions/pacman.fish @@ -1,16 +1,5 @@ -function i - sudo pacman -S $argv -end - -function s - sudo pacman -Ss $argv -end - -function u - sudo pacman -Syu -end - -function r - sudo pacman -Rns $argv -end +abbr -a i sudo pacman -S +abbr -a s sudo pacman -Ss +abbr -a u sudo pacman -Syu +abbr -a r sudo pacman -Rns diff --git a/.config/fish/myfunctions/replacements.fish b/.config/fish/myfunctions/replacements.fish index 0c56528..df45d3d 100644 --- a/.config/fish/myfunctions/replacements.fish +++ b/.config/fish/myfunctions/replacements.fish @@ -1,8 +1,9 @@ function ls exa --icons -l $argv end -alias find=fd -alias df=duf +abbr -a find fd +abbr -a df duf +abbr -a v nvim function rm echo "rm is disabled, use trash instead" end From eebb660b7123617daf219ea4df8ef4b706e8860b Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Thu, 25 May 2023 00:14:21 +0100 Subject: [PATCH 2/2] [MINOR] nvim removed hardtime and fixed Mason icons --- .config/nvim/lua/plugins/copilot.lua | 14 ++++++++++++++ .config/nvim/lua/plugins/lazy.lua | 7 ------- .config/nvim/lua/plugins/mason.lua | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 .config/nvim/lua/plugins/copilot.lua diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua new file mode 100644 index 0000000..07d83af --- /dev/null +++ b/.config/nvim/lua/plugins/copilot.lua @@ -0,0 +1,14 @@ +require("copilot").setup({ + suggestion = {enabled = false}, + panel = {enabled = false}, + filetypes = { + yaml = false, + help = false, + gitcommit = false, + gitrebase = false, + hgcommit = false, + svn = false, + cvs = false, + ["."] = true + } +}) diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index f7f87f3..801bc3b 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -36,13 +36,6 @@ lazy.setup({ 'tpope/vim-surround', 'tpope/vim-obsession', - { - 'm4xshen/hardtime.nvim', - config = function() - require 'hardtime'.setup {} - end - }, - --Tmux navigation { 'alexghergh/nvim-tmux-navigation', diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index 09400ec..6f43ffb 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -8,8 +8,8 @@ local options = { ui = { icons = { package_pending = " ", - package_installed = " ", - package_uninstalled = " ﮊ", + package_installed = "󰄳 ", + package_uninstalled = " ", }, keymaps = {