mitchell/dotfiles
1
0
Fork 0
mirror of https://github.com/mitchell/dotfiles.git synced 2025-09-04 08:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

m-cloud changes

Browse source
This commit is contained in:
mitchell 2024-07-20 00:48:33 -04:00
parent 44780e9a9e
commit b2510c45b9
4 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.config/fish/config.fish
View file

@ -2,15 +2,11 @@ function configure_fish
# Determine OS # Determine OS
set uname (uname) set uname (uname)
# Set umask
umask 077
# Begin profile init # Begin profile init
# (These functions are defined in the functions/ directory.) # (These functions are defined in the functions/ directory.)
define_global_variables define_global_variables
import_sources $uname import_sources $uname
define_aliases $uname define_aliases $uname
ssh_agent_startup
end end
configure_fish configure_fish

17
.config/fish/functions/import_sources.fish
View file

@ -1,19 +1,10 @@
function import_sources -a uname -d 'Loads any additional fish files needed at init.' 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 test -f ~/.asdf/plugins/dotnet-core/set-dotnet-home.fish; and source ~/.asdf/plugins/dotnet-core/set-dotnet-home.fish
# ASDF configuration code test -e ~/.asdf/asdf.fish
if test -z $ASDF_DATA_DIR and source ~/.asdf/asdf.fish
set _asdf_shims "$HOME/.asdf/shims" and mkdir -p ~/.config/fish/completions
else and ln -sf ~/.asdf/completions/asdf.fish ~/.config/fish/completions
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 /opt/homebrew/bin/brew test -e /opt/homebrew/bin/brew
and /opt/homebrew/bin/brew shellenv | source - and /opt/homebrew/bin/brew shellenv | source -

1
.config/nvim/lua/plugins/treesitter.lua
View file

@ -23,7 +23,6 @@ return {
"groovy", "groovy",
"java", "java",
"objc", "objc",
"swift",
"hcl", "hcl",
"terraform", "terraform",
"yaml", "yaml",

13
.gitconfig
View file

@ -26,7 +26,6 @@
[core] [core]
editor = nvim editor = nvim
pager = delta
[color] [color]
ui = auto ui = auto
@ -39,15 +38,3 @@
[pull] [pull]
rebase = true rebase = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
dark = true
side-by-side = true
line-numbers = true
[merge]
conflictstyle = zdiff3