aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bashrc1
-rw-r--r--.config/git/ignore8
-rw-r--r--.env2
-rw-r--r--.gitconfig1
-rw-r--r--.vimrc3
-rwxr-xr-xscripts/bootstrap.sh3
6 files changed, 16 insertions, 2 deletions
diff --git a/.bashrc b/.bashrc
index 999df4e..a37d60f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -14,6 +14,7 @@ PS1='[\u@\h \W]\$ '
source "$HOME/.aliases"
source "$HOME/.fzfrc"
+[ -r "$HOME/.bash_local" ] && source "$HOME/.bash_local"
if command -v fish > /dev/null; then
__FISH_IS_ACTIVE=${__FISH_IS_ACTIVE:-0}
diff --git a/.config/git/ignore b/.config/git/ignore
new file mode 100644
index 0000000..f5a0259
--- /dev/null
+++ b/.config/git/ignore
@@ -0,0 +1,8 @@
+.DS_Store
+compile_commands.json
+
+gtags.conf
+gtags.files
+GTAGS
+GRTAGS
+GPATH
diff --git a/.env b/.env
index a77e94a..c8c184f 100644
--- a/.env
+++ b/.env
@@ -26,5 +26,7 @@ if command -v delta > /dev/null; then
export GIT_PAGER='delta --diff-highlight'
fi
+export GTAGSLABEL=native-pygments
+
# XBOX Controller Remap
export SDL_GAMECONTROLLERCONFIG='050000005e040000130b000013050000,Xbox Series X Controller,a:b1,b:b0,x:b4,y:b3,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Linux,'
diff --git a/.gitconfig b/.gitconfig
index c61a10f..707ecdc 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,7 +13,6 @@
[diff "gpg"]
textconv = gpg -o-
[core]
- excludesFile = ~/.gitignore
attributesfile = ~/.gitattributes
[alias]
ap = add --patch
diff --git a/.vimrc b/.vimrc
index 71954de..6cc82ad 100644
--- a/.vimrc
+++ b/.vimrc
@@ -134,6 +134,9 @@ set directory=~/.vim/.swp//
" tags
set tags=./.tags;,.tags
+if executable('gtags-cscope')
+ let &csprg='gtags-cscope'
+endif
" mapping
let mapleader=','
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 6ab0649..e073c90 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -25,7 +25,8 @@ link_all () {
.zprofile .newsboat .ledgerrc .nnnrc .alacritty.yml .fzfrc \
.env .config/kitty .wezterm.lua .config/mpv \
.config/sway .config/swaylock .config/zathura .tigrc .config/foot \
- .config/fish .arch.aliases .bashrc .zinitrc
+ .config/fish .arch.aliases .bashrc .zinitrc \
+ .config/git
}
main () {