punkfairie/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update .config/fish/conf.d/10-starship.fish

Browse source 
Update .config/fish/conf.d/20-gpg.fish
Update .config/fish/conf.d/30-chezmoi.fish
Update .config/fish/conf.d/30-eza.fish
Update .config/fish/conf.d/30-fzf.fish
Update .config/fish/conf.d/30-git.fish
Update .config/fish/conf.d/30-go.fish
Update .config/fish/conf.d/30-journalctl.fish
Update .config/fish/conf.d/30-lazygit.fish
Update .config/fish/conf.d/30-less.fish
Update .config/fish/conf.d/30-php.fish
Remove .config/fish/conf.d/30-polybar.fish
Update .config/fish/conf.d/30-systemctl.fish
Update .config/fish/conf.d/30-volta.fish
Update .config/fish/conf.d/30-wget.fish
Update .config/fish/conf.d/30-yay.fish
Update .config/fish/conf.d/30-bitwarden.fish
Update .config/topgrade.d/01-commands.toml
This commit is contained in:
punkfairie 2024-10-02 21:01:45 -07:00
parent 3f10356bd2
commit 91ce6c48d6
Signed by: punkfairie
GPG key ID: A86AF57F837E320F
18 changed files with 155 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dot_config/fish/conf.d/10-starship.fish
View file

@ -1,5 +1,6 @@
#!/usr/bin/env fish
if command -v starship &>/dev/null
function starship_transient_prompt_func
starship module character
end
@ -8,3 +9,4 @@ if status is-interactive
starship init fish | source
enable_transience
end
end

2
dot_config/fish/conf.d/20-gpg.fish
View file

@ -1,6 +1,6 @@
#!/usr/bin/env fish
if test "$(command -v gpgconf &>/dev/null)"
if command -v gpgconf &>/dev/null
set -gx GPG_TTY (tty)
gpgconf --launch gpg-agent
end

2
dot_config/fish/conf.d/30-chezmoi.fish
View file

@ -1,5 +1,6 @@
#!/usr/bin/env fish
if command -v chezmoi &>/dev/null
abbr -a cz --position command chezmoi
abbr -a czap --position command "chezmoi apply"
abbr -a cza --position command "chezmoi add"
@ -10,3 +11,4 @@ abbr -a czu --position command "chezmoi update"
abbr -a czct --position command "chezmoi chattr +t"
abbr -a czcm --position command 'git aa && git c -m "$(chezmoi generate git-commit-message)" && git p'
end

2
dot_config/fish/conf.d/30-eza.fish
View file

@ -1,5 +1,6 @@
#!/usr/bin/env fish
if command -v eza &>/dev/null
function ls --wraps eza
eza --all --icons=auto --sort=name --group-directories-first $argv
end
@ -16,3 +17,4 @@ end
function lslt --wraps eza
lsl --tree --color=always $argv
end
end

8
dot_config/fish/conf.d/30-fzf.fish.tmpl
View file

@ -1,6 +1,9 @@
#!/usr/bin/env fish
if command -v fzf &>/dev/null
if command -v rg &>/dev/null
set -gx FZF_DEFAULT_CMD 'rg --files --hidden --glob "!.git"'
end
set -gx FZF_DEFAULT_OPTS "\
--margin=10%,5% \
@ -15,5 +18,10 @@ set -gx FZF_DEFAULT_OPTS "\
--color=marker:{{ .drapeau.colors.base06 }},fg+:{{ .drapeau.colors.base05 }},prompt:{{ .drapeau.colors.base0E }},hl+:{{ .drapeau.colors.base08 }}"
# fzf.fish
if command -v eza &>/dev/null
set -g fzf_preview_dir_cmd eza --all --color=always --sort=name --group-directories-first
end
if command -v delta &>/dev/null
set -g fzf_diff_highlighter delta --paging=never --features=arctic-fox
end
end

6
dot_config/fish/conf.d/30-git.fish
View file

@ -1,10 +1,11 @@
#!/usr/bin/env fish
if command -v git &>/dev/null
abbr -a g --position command git
################################################################################
############################################################################
# Functions #
################################################################################
############################################################################
function git_develop_branch
command git rev-parse --git-dir &>/dev/null || return
@ -48,3 +49,4 @@ function git_current_branch
echo (string replace "refs/heads/" "" $ref)
end
end

2
dot_config/fish/conf.d/30-go.fish
View file

@ -1,3 +1,5 @@
#!/usr/bin/env fish
if command -v go &>/dev/null
fish_add_path "$HOME/go/bin"
end

2
dot_config/fish/conf.d/30-journalctl.fish
View file

@ -1,4 +1,6 @@
#!/usr/bin/env fish
if command -v journalctl &>/dev/null
abbr -a jf --position command "sudo journalctl --follow --unit"
abbr -a je --position command "sudo journalctl --pager-end --unit"
end

2
dot_config/fish/conf.d/30-lazygit.fish.tmpl
View file

@ -1,5 +1,6 @@
#!/usr/bin/env fish
if command -v lazygit &>/dev/null
function lzg --wraps=lazygit
{{ if eq .drapeau.colors.name "catppuccin" -}}
set -f configs "$XDG_CONFIG_HOME/lazygit/config.yml,$XDG_CONFIG_HOME/lazygit/{{ .drapeau.colors.name }}/themes-mergable/{{ .drapeau.colors.flavor }}/pink.yml"
@ -9,3 +10,4 @@ function lzg --wraps=lazygit
lazygit --use-config-file="$configs"
end
end

10
dot_config/fish/conf.d/30-less.fish
View file

@ -1,19 +1,19 @@
#!/usr/bin/env fish
if command -v less &>/dev/null
set -gx LESS -R
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
abbr -a L --position anywhere --set-cursor "% | less"
if command -v nvim &>/dev/null
function lessv
if ! command -v nvim &>/dev/null
return
end
if test -e "/usr/share/nvim/runtime/macros/less.sh"
/usr/share/nvim/runtime/macros/less.sh $argv
else if test -e "/usr/local/share/nvim/runtime/macros/less.sh"
/usr/local/share/nvim/runtime/macros/less.sh $argv
end
end
end
end

4
dot_config/fish/conf.d/30-php.fish
View file

@ -1,7 +1,11 @@
#!/usr/bin/env fish
if command -v composer &>/dev/null
fish_add_path "$HOME/.config/composer/vendor/bin"
end
if command -v php &>/dev/null
abbr -a p --position command php
abbr -a pa --position command "php artisan"
abbr -a a --position command "php artisan"
end

5
dot_config/fish/conf.d/30-polybar.fish
View file

@ -1,5 +0,0 @@
#!/usr/bin/env fish
function polybar-start
"$HOME/.config/polybar/launch.sh" --colorblocks &
end

2
dot_config/fish/conf.d/30-systemctl.fish
View file

@ -1,5 +1,6 @@
#!/usr/bin/env fish
if command -v systemctl &>/dev/null
abbr -a sctl --position command "sudo systemctl"
abbr -a sctls --position command "sudo systemctl status"
abbr -a sctle --position command "sudo systemctl enable --now"
@ -7,3 +8,4 @@ abbr -a sctld --position command "sudo systemctl disable --now"
abbr -a sctlr --position command "sudo systemctl restart"
abbr -a sctlo --position command "sudo systemctl stop"
abbr -a sctla --position command "sudo systemctl start"
end

2
dot_config/fish/conf.d/30-volta.fish
View file

@ -1,5 +1,7 @@
#!/usr/bin/env fish
if command -v volta &>/dev/null
fish_add_path "$HOME/.volta/bin"
set -gx VOLTA_HOME "$HOME/.volta"
end

8
dot_config/fish/conf.d/30-wget.fish
View file

@ -1,7 +1,9 @@
#!/usr/bin/env fish
if command -v wget &>/dev/null
set -gx WGETRC "$XDG_CONFIG_HOME/wgetrc"
#function wget --wraps wget
# wget --hsts-file="$XDG_CACHE_HOME/wget-hsts" $argv
#end
function wget --wraps wget
command wget --hsts-file="$XDG_CACHE_HOME/wget-hsts" $argv
end
end

2
dot_config/fish/conf.d/30-yay.fish
View file

@ -1,5 +1,6 @@
#!/usr/bin/env fish
if command -v yay
abbr -a y --position command yay
abbr -a yi --position command "yay -S"
abbr -a yr --position command "yay -R"
@ -11,3 +12,4 @@ abbr -a ysi --position command "yay -Qs"
function yay-group-missing --argument-names group
comm -23 <(yay -Sg $group | awk '{print $2}' | sort) <(yay -Qq | sort)
end
end

14
dot_config/fish/conf.d/encrypted_30-bitwarden.fish.asc
View file

@ -1,10 +1,10 @@
-----BEGIN PGP MESSAGE-----
jA0ECQMIvR4z836ZO3//0sApAakbVKnuKb9TrQatlObf0ORC/qcp6yLIL7vTuRLH
kCtX75AFRrcGlTDEPjpO261FNeoRLEZJZJ911UJgobJOOwr/yAgy4Blcf8m7NC9q
PyaJfS37+5TURWjpTmeNBCg/vyzF5IQX5lxurM524VVdl1NN0hFn1NlIrJ2OvNy+
OnUrjtM+CWQuDvuK1RIt73A6SjXsuSIbKxSZji5HZRN9qv7Tdbmv8pKoDwtmU1ZH
8juNFv6IA6mA0UDgScUBY6u5lOTzbcnE/UV/tjuxeUjalzuGTB5xXnH5ggw50LcG
yKSpNivjBe8nmgY=
=yQ/O
jA0ECQMInwAQ3xxYOS7/0sAoAWRHbdhtTICBBJCFsnNIlSUNyhCXNgduEIcgss+m
6DpDROJbe2pA+yBSntZXNO0w3VnrCYWsvurl0rDY4KFglAl+2ALrN0/9YfecAbC4
XtutfDkAu/u6V7eLKBgovXpz6Jdt2Vtey5mkANQpD9ET+TVjPCJBhTQeSjqR886p
hQf6glkbOJOLEh11o+IvM6L7wvHG9gh8mxSVEImn8Ypd5BrnqODxeIIkEiFzTU/N
TDpiUSvILNcHDzBuUqyuKWUzS//r4+cKW6jTlOR7W5HO899uywcQodwyq4bIGoi9
12E7OpMEf5mu/Q==
=uySh
-----END PGP MESSAGE-----

6
dot_config/topgrade.d/01-commands.toml.tmpl
View file

@ -11,9 +11,3 @@
# Custom commands
[commands]
"Fish Shell Completions" = "fish_update_completions"
{{ if lookPath "yay" -}}
"Update package list" = "yay -Qeq > {{ joinPath .chezmoi.sourceDir "dot_config/packages/" .chezmoi.hostname }} && set_color green && printf '%s'  && set_color normal && printf '%s' ' done\n'"
{{ end -}}
{{if lookPath "brew" -}}
"Update Brewfile" = "brew bundle dump --describe --force --file={{ joinPath .chezmoi.sourceDir "dot_config/packages/Brewfile" }} && set_color green && printf '%s'  && set_color normal && printf '%s' ' done\n'"
{{ end -}}