dot_config/git/config

@@ -16,48 +16,20 @@
 	allowedSignersFile = ~/.config/git/allowed_signers
 
 [alias]
-	root = rev-parse --show-toplevel
-	current-branch = symbolic-ref --short HEAD
-
-	b = branch
-	bb = switch
-	bc = switch -c
-	bcf = bc -f
-	bx = branch -d
-	bxf = bx -f
-	br = branch -m
-	brx = br -f
-
-	mm = merge
-
-	r = rebase
-	ri = rebase -i
-	rp = rebase @{upstream}
-
 	s = status -sb
 	ss = s -uno
-	si = "!hx $(git root)/.gitignore"
+	bs = switch
-
+	bc = switch -c
-	pp = pull
-	pe = """!git_remote=$(git remote | fzf); \
-		git_branch=$(git current-branch); \
-		[ -z $git_remote ] && echo 'No remote selected.' && exit 1; \
-		git pull $git_remote $git_branch"""
-
 	a = add
 	c = commit
 	cm = commit -m
-	co = checkout
 	d = diff
+	l = log
+	sl = log --pretty='format:%h %G? %s%d' -n20 --graph --color
+	fixup = "!git log -n50 --pretty='format:%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup"
+	ri = rebase -i
+	pru = "!git pull -r --autostash upstream $(git remote show upstream | sed -n '/HEAD branch/s/.*: //p')"
 
-	l = log -n20 --graph --color --decorate --oneline
-	ll = log --all --graph --color --decorate
-
-	fixup = """!git_commit=$(git log -n50 --pretty='format:%h %s' --no-merges | fzf | cut -c -7); \
-		git commit --fixup $git_commit"""
-
-	pru = !git pull -r --autostash $(git rev-parse --abbrev-ref @{upstream} | tr '/' ' ')
-	ui = !lazygit
 
 [branch]
 	sort = -committerdate

dot_config/helix/languages.toml

@@ -4,13 +4,52 @@ auto-format = true
 formatter = { command = "yamlfmt", args = ["-"] }
 
 [[language]]
-name = "xbps-template"
+name = "bash"
-scope = "source.xbps"
-roots = ["xbps-src"]
 file-types = [
-  { glob = "srcpkgs/*/template" }
+  "sh",
+  "bash",
+  "ash",
+  "dash",
+  "ksh",
+  "mksh",
+  "zsh",
+  "zshenv",
+  "zlogin",
+  "zlogout",
+  "zprofile",
+  "zshrc",
+  "eclass",
+  "ebuild",
+  "bazelrc",
+  "Renviron",
+  "zsh-theme",
+  "cshrc",
+  "tcshrc",
+  "bashrc_Apple_Terminal",
+  "zshrc_Apple_Terminal",
+  { glob = "i3/config" },
+  { glob = "sway/config" },
+  { glob = "tmux.conf" },
+  { glob = ".bash_history" },
+  { glob = ".bash_login" },
+  { glob = ".bash_logout" },
+  { glob = ".bash_profile" },
+  { glob = ".bashrc" },
+  { glob = ".profile" },
+  { glob = ".zshenv" },
+  { glob = ".zlogin" },
+  { glob = ".zlogout" },
+  { glob = ".zprofile" },
+  { glob = ".zshrc" },
+  { glob = ".zimrc" },
+  { glob = "APKBUILD" },
+  { glob = ".bash_aliases" },
+  { glob = ".Renviron" },
+  { glob = ".xprofile" },
+  { glob = ".xsession" },
+  { glob = ".xsessionrc" },
+  { glob = ".yashrc" },
+  { glob = ".yash_profile" },
+  { glob = ".hushlogin" },
+  { glob = "template" },
 ]
-comment-token = "#"
-language-servers = [ "bash-language-server" ]
-indent = { tab-width = 4, unit = "\t" }
-grammar = "bash"

private_dot_local/private_share/private_Steam/steamapps/common/Counter-Strike Global Offensive/game/csgo/cfg/executable_autoexec.cfg

@@ -5,7 +5,6 @@
 // -nojoy -novid -nointro -high -threads 11 +exec autoexec.cfg
 // Linux Wayland Launch Options
 // LD_PRELOAD="" gamescope --adaptive-sync --force-grab-cursor -w 2560 -h 1440 -f -r 165 -- %command% -nojoy -high -threads 11 +exec autoexec -full
-// gamescope -w 2560 -h 1440 -W 2560 -H 1440 -r 165 -e --rt --force-windows-fullscreen -o 15 -f --force-grab-cursor --immediate-flips --adaptive-sync -- 
 
 // keyboard binds
 bind q "slot3; lastinv"