secstate/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few more FreeBSD fixes to dotfiles

Browse Source
This commit is contained in:
Colin Powell
2020-01-27 01:03:45 -05:00
parent adc472661f
commit bfbb3b2027
6 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fish/.config/fish/config.fish
View File

@ -3,7 +3,10 @@ set -gx PATH ~/.cargo/bin $PATH
set -gx PATH ~/.emacs.d/bin $PATH set -gx PATH ~/.emacs.d/bin $PATH
set -gx PATH ~/.fzf/bin $PATH set -gx PATH ~/.fzf/bin $PATH
set -gx PATH ~/.local/bin $PATH set -gx PATH ~/.local/bin $PATH
set -gx PATH ~/.asdf/install/rust/stable/bin $PATH
fzf_key_bindings fzf_key_bindings
set -gx EDITOR vi set -gx EDITOR vi
set -gx XDG_RUNTIME_DIR /run/user/(id -u) set -gx XDG_RUNTIME_DIR /run/user/(id -u)
eval (python -m virtualfish) eval (python -m virtualfish)
direnv hook fish | source

2
fish/.config/fish/fish_variables
View File

@ -41,7 +41,7 @@ SETUVAR fish_pager_color_completion:\x1d
SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_user_paths:/Users/colinpowell/\x2efzf/bin SETUVAR fish_user_paths:/Users/colinpowell/\x2efzf/bin\x1e/home/powellc/\x2efzf/bin
SETUVAR pure_begin_prompt_with_current_directory:true SETUVAR pure_begin_prompt_with_current_directory:true
SETUVAR pure_color_command_duration:pure_color_warning SETUVAR pure_color_command_duration:pure_color_warning
SETUVAR pure_color_current_directory:pure_color_primary SETUVAR pure_color_current_directory:pure_color_primary

2
fish/.config/fish/functions/fish_user_key_bindings.fish
View File

@ -1,2 +1,4 @@
function fish_user_key_bindings function fish_user_key_bindings
end end
fzf_key_bindings

3
git/.gitconfig
View File

@ -27,9 +27,6 @@
hs = for-each-ref --sort=-committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))' hs = for-each-ref --sort=-committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3
[pager]
diff = diff-so-fancy | less --tabs=1,5 -RFX
show = diff-so-fancy | less --tabs=1,5 -RFX
[gpg] [gpg]
program = /usr/local/bin/gpg program = /usr/local/bin/gpg
[status] [status]

3
i3/.Xresources
View File

@ -1,2 +1,5 @@
setxkbmap -model pc105 -layout us,ru -option grp:ctrls_toggle setxkbmap -model pc105 -layout us,ru -option grp:ctrls_toggle
setxkbmap -option caps:escape -option compose:ralt & setxkbmap -option caps:escape -option compose:ralt &
Xcursor*theme: dmz
Xcursor*size: 24

14
x/.xinitrc
View File

@ -1,2 +1,12 @@
SETXKBMAP -option caps:escape & export XDG_RUNTIME_DIR=/tmp
setxkbmap -option compose:menu & if [ ! -d "$XDG_RUNTIME_DIR" ]; then
mkdir "$XDG_RUNTIME_DIR"
chmod 0700 "$XDG_RUNTIME_DIR"
fi
setxkbmap -model pc105 -layout us,ru -option grp:ctrls_toggle
setxkbmap -option caps:escape -option compose:ralt &
emacs --daemon
exec i3