mirror of
https://github.com/SeriousBug/dotfiles
synced 2024-12-04 18:30:37 -06:00
add work overrides
This commit is contained in:
parent
a5bd92397b
commit
23f052ff83
|
@ -50,6 +50,9 @@ depends = ["theme", "system"]
|
|||
[system.variables]
|
||||
has_battery = false
|
||||
intel_backlight = false
|
||||
platform = "linux"
|
||||
force_fish_shell = false
|
||||
has_gpg = true
|
||||
|
||||
[theme.variables]
|
||||
# These are specified in bg-fg pairs, background and text color. The _fg color
|
||||
|
|
|
@ -3,7 +3,7 @@ if status is-interactive
|
|||
end
|
||||
# set up direnv
|
||||
direnv hook fish | source
|
||||
|
||||
{{#if (eq platform "linux") }}
|
||||
# set current desktop, needed for desktop sharing with Wayland
|
||||
set -gx XDG_CURRENT_DESKTOP sway
|
||||
|
||||
|
@ -26,3 +26,11 @@ for flatpakdir in ~/.local/share/flatpak/exports/bin /var/lib/flatpak/exports/bi
|
|||
contains $flatpakdir $PATH; or set -a PATH $flatpakdir
|
||||
end
|
||||
end
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq platform "macos") }}
|
||||
# Set Mac keyboard shortcuts
|
||||
bind \u0192 forward-word
|
||||
bind \u222B backward-word
|
||||
bind \u2202 kill-word
|
||||
{{/if}}
|
||||
|
|
|
@ -1,39 +1,41 @@
|
|||
[user]
|
||||
email = kaan@bgenc.net
|
||||
name = Kaan Barmore-Genc
|
||||
signingkey = F5DEC5268AA501F35FBD5978B2E280771CD62FCF
|
||||
email = kaan@bgenc.net
|
||||
name = Kaan Barmore-Genc
|
||||
signingkey = F5DEC5268AA501F35FBD5978B2E280771CD62FCF
|
||||
[init]
|
||||
defaultBranch = main
|
||||
defaultBranch = main
|
||||
[pull]
|
||||
rebase = true
|
||||
rebase = true
|
||||
{{#if has_gpg}}
|
||||
[commit]
|
||||
gpgSign = true
|
||||
gpgSign = true
|
||||
[tag]
|
||||
gpgsign = true
|
||||
gpgsign = true
|
||||
{{/if}}
|
||||
[pager]
|
||||
diff = delta
|
||||
log = delta
|
||||
reflog = delta
|
||||
show = delta
|
||||
diff = delta
|
||||
log = delta
|
||||
reflog = delta
|
||||
show = delta
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
diffFilter = delta --color-only
|
||||
[delta]
|
||||
features = side-by-side line-numbers decorations
|
||||
whitespace-error-style = 22 reverse
|
||||
features = side-by-side line-numbers decorations
|
||||
whitespace-error-style = 22 reverse
|
||||
[merge]
|
||||
ff = no
|
||||
ff = no
|
||||
[alias]
|
||||
stat = status
|
||||
stat = status
|
||||
[core]
|
||||
editor = code --wait
|
||||
editor = code --wait
|
||||
[credential]
|
||||
helper = store
|
||||
helper = store
|
||||
[filter "lfs"]
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
[push]
|
||||
autoSetupRemote = true
|
||||
autoSetupRemote = true
|
||||
[submodule]
|
||||
recurse = true
|
||||
recurse = true
|
||||
|
|
|
@ -1090,7 +1090,11 @@ mark3_background #f274bc
|
|||
|
||||
#: Advanced
|
||||
|
||||
{{#if force_fish_shell }}
|
||||
shell /usr/local/bin/fish --login --interactive
|
||||
{{else}}
|
||||
shell .
|
||||
{{/if}}
|
||||
|
||||
#: The shell program to execute. The default value of . means to use
|
||||
#: whatever shell is set as the default shell for the current user.
|
||||
|
|
Loading…
Reference in a new issue