mirror of
https://github.com/mitchell/dotfiles.git
synced 2025-09-01 07:24:00 +00:00
m-cloud changes
This commit is contained in:
parent
44780e9a9e
commit
b2510c45b9
|
@ -2,15 +2,11 @@ function configure_fish
|
|||
# Determine OS
|
||||
set uname (uname)
|
||||
|
||||
# Set umask
|
||||
umask 077
|
||||
|
||||
# Begin profile init
|
||||
# (These functions are defined in the functions/ directory.)
|
||||
define_global_variables
|
||||
import_sources $uname
|
||||
define_aliases $uname
|
||||
ssh_agent_startup
|
||||
end
|
||||
|
||||
configure_fish
|
||||
|
|
|
@ -1,19 +1,10 @@
|
|||
function import_sources -a uname -d 'Loads any additional fish files needed at init.'
|
||||
test -f ~/.asdf/plugins/dotnet-core/set-dotnet-home.fish; and source ~/.asdf/plugins/dotnet-core/set-dotnet-home.fish
|
||||
|
||||
# ASDF configuration code
|
||||
if test -z $ASDF_DATA_DIR
|
||||
set _asdf_shims "$HOME/.asdf/shims"
|
||||
else
|
||||
set _asdf_shims "$ASDF_DATA_DIR/shims"
|
||||
end
|
||||
|
||||
# Do not use fish_add_path (added in Fish 3.2) because it
|
||||
# potentially changes the order of items in PATH
|
||||
if not contains $_asdf_shims $PATH
|
||||
set -gx --prepend PATH $_asdf_shims
|
||||
end
|
||||
set --erase _asdf_shims
|
||||
test -e ~/.asdf/asdf.fish
|
||||
and source ~/.asdf/asdf.fish
|
||||
and mkdir -p ~/.config/fish/completions
|
||||
and ln -sf ~/.asdf/completions/asdf.fish ~/.config/fish/completions
|
||||
|
||||
test -e /opt/homebrew/bin/brew
|
||||
and /opt/homebrew/bin/brew shellenv | source -
|
||||
|
|
|
@ -23,7 +23,6 @@ return {
|
|||
"groovy",
|
||||
"java",
|
||||
"objc",
|
||||
"swift",
|
||||
"hcl",
|
||||
"terraform",
|
||||
"yaml",
|
||||
|
|
13
.gitconfig
13
.gitconfig
|
@ -26,7 +26,6 @@
|
|||
|
||||
[core]
|
||||
editor = nvim
|
||||
pager = delta
|
||||
|
||||
[color]
|
||||
ui = auto
|
||||
|
@ -39,15 +38,3 @@
|
|||
|
||||
[pull]
|
||||
rebase = true
|
||||
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
|
||||
[delta]
|
||||
navigate = true
|
||||
dark = true
|
||||
side-by-side = true
|
||||
line-numbers = true
|
||||
|
||||
[merge]
|
||||
conflictstyle = zdiff3
|
||||
|
|
Loading…
Reference in a new issue