Compare commits

...

7 commits

7 changed files with 21 additions and 11 deletions

11
arch-packages/PKGBUILD Normal file
View file

@ -0,0 +1,11 @@
# https://gitlab.archlinux.org/pacman/pacman/-/issues/93
pkgname=dummy
pkgver=1
pkgrel=1
pkgdesc="Provides packages we do not want installed"
arch=('any')
provides=(
'polkit'
'rtkit'
'udisks2'
)

View file

@ -45,12 +45,12 @@ abbr gcount 'git shortlog -sn'
abbr gcp 'git cherry-pick'
abbr gcpa 'git cherry-pick --abort'
abbr gcpc 'git cherry-pick --continue'
abbr gd 'git diff'
abbr gdca 'git diff --cached'
abbr gdcw 'git diff --cached --word-diff'
abbr gdct 'git diff --staged'
abbr gd 'git diff --word-diff=color'
abbr gdca 'git diff --word-diff=color --cached'
abbr gdcw 'git diff --word-diff=color --cached'
abbr gdct 'git diff --word-diff=color --staged'
abbr gdT 'git diff-tree --no-commit-id --name-only -r'
abbr gdup 'git diff @{upstream}'
abbr gdup 'git diff --word-diff=color @{upstream}'
abbr gf 'git fetch'
abbr gfa 'git fetch --all --prune --tags -f'
abbr gfo 'git fetch origin'

View file

@ -4,7 +4,7 @@ function gl --description 'Git browse commits'
return 0
end
set -l log_line_to_hash "echo {} | grep -o '[a-f0-9]\{7\}' | head -1"
set -l log_line_to_hash "echo {} | grep -o '[a-f0-9]\{9\}' | head -1"
set -l view_commit "$log_line_to_hash | xargs -I % sh -c 'git show --color=always % | bat -ldiff'"
set -l view_commit_nvim "$log_line_to_hash | xargs -I % sh -c 'git show %'"
set -l copy_commit_hash "$log_line_to_hash | wl-copy"

View file

@ -1,3 +0,0 @@
function update --description 'Arch system update'
paru -Syyuu --assume-installed polkit,rtkit,udisks2
end

View file

@ -22,6 +22,7 @@
cleanup = scissors
verbose = true
[core]
abbrev = 9
editor = nvim
excludesfile = ~/.config/git/ignore
[diff]

View file

@ -19,7 +19,7 @@ vim.o.termguicolors = true
vim.o.fileformat = 'unix'
vim.o.inccommand = 'split'
vim.o.mouse = ''
vim.o.completeopt = 'menuone,noselect'
vim.o.completeopt = 'menuone,noselect,fuzzy'
vim.o.wildmode = 'longest:full,full'
vim.o.wildoptions = 'pum'
vim.o.pumblend = 30

View file

@ -194,7 +194,8 @@ function M.hls_config()
cabalFormattingProvider = 'cabalfmt',
formattingProvider = 'ormolu',
maxCompletions = 20,
plugin = { stan = { globalOn = false } }
plugin = { stan = { globalOn = false } },
sessionLoading = 'multipleComponents'
}
},
}