Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stow #35

Merged
merged 131 commits into from
Feb 6, 2024
Merged

stow #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
3a65dcb
removes stats and updates comments
edheltzel Jan 29, 2024
d7f1961
Add zsh configuration files for stow
edheltzel Jan 29, 2024
9158b19
setting fish for stow
edheltzel Jan 29, 2024
2e0cd36
setting up fish for stow
edheltzel Jan 29, 2024
8025212
Remove deprecated nvim setup script
edheltzel Jan 29, 2024
9a16832
adds nvim stow package and copies lazyvim to nvim dir
edheltzel Jan 29, 2024
2cba758
stow controls `dots/dot-*` now
edheltzel Jan 29, 2024
b0ab872
todos for next steps
edheltzel Jan 30, 2024
f739ffb
adds warp to dotfiles
edheltzel Jan 30, 2024
93fbe7c
Update font settings in .gitconfig
edheltzel Jan 30, 2024
2ffaa6f
Add Keychron Q11 ANSI Knob layout configuration to misc/
edheltzel Jan 30, 2024
0e4f450
setup config with stow
edheltzel Jan 30, 2024
d5bd371
add stow ignore to config
edheltzel Jan 30, 2024
6d535dc
moves custom utils into fish/ dir - since these are used with a custo…
edheltzel Jan 30, 2024
04e266a
moved fish into config/ and renamed all dots/ using the . prefix to k…
edheltzel Jan 30, 2024
0447edc
moves nvim into config/
edheltzel Jan 30, 2024
ef03441
removes raycast from config/
edheltzel Jan 30, 2024
336af01
raycast export
edheltzel Jan 30, 2024
af00610
move zsh files to dots/
edheltzel Jan 30, 2024
ee87255
remove bun from packages/setup.sh
edheltzel Jan 30, 2024
f1cadb6
adds stow ignores
edheltzel Jan 30, 2024
acd914b
moved config/vscode to misc/vscode
edheltzel Jan 30, 2024
11ab5ab
removes the config/vscode
edheltzel Jan 30, 2024
80bffca
if I'm not using it then im removing it.
edheltzel Jan 30, 2024
86181cd
making fish a stow package.... again
edheltzel Jan 30, 2024
0f6cfc8
making nvim a stow package again
edheltzel Jan 30, 2024
af89e5f
Add .stow-local-ignore file to ignore setup.sh and .DS_Store
edheltzel Jan 30, 2024
b9d2eed
WIP: adds stow to the install script
edheltzel Jan 30, 2024
5dd67c0
includes a stow global ignore and removes redundant local ignores
edheltzel Jan 30, 2024
cad78f1
adding custom raycast script command
edheltzel Jan 31, 2024
b20236b
comments
edheltzel Jan 31, 2024
02f2584
iterm2 udpate pref
edheltzel Jan 31, 2024
214ce33
local an global ignores for stow
edheltzel Jan 31, 2024
7fe736c
updates makefile support - should include in all projects
edheltzel Jan 31, 2024
fd3c9a0
adds makefile for stowing
edheltzel Jan 31, 2024
4d7baab
moves additional scripts back to package directories
edheltzel Jan 31, 2024
ffd3d78
update duti for vscode insiders
edheltzel Jan 31, 2024
2eb6a0c
press and hold disable options for vscode and insiders
edheltzel Jan 31, 2024
69ef563
custom keys for warp & global dictionary update
edheltzel Jan 31, 2024
64497aa
WIP: bootstrap and install scripts
edheltzel Jan 31, 2024
a866531
WIP readme needs updated
edheltzel Jan 31, 2024
4538f2d
adding bigmac to gitconfig.local.
edheltzel Jan 31, 2024
297ffe6
update echo for make
edheltzel Jan 31, 2024
954430e
update keyboard
edheltzel Jan 31, 2024
0d0906b
fixes eza error when using the -F flag, its no longer needed with eza…
edheltzel Feb 1, 2024
c176545
removes symlink to old dotfiles locations
edheltzel Feb 1, 2024
2f3d257
lazyvim customization - nothing really yet
edheltzel Feb 1, 2024
664a7ad
includes all linked to help
edheltzel Feb 1, 2024
ff91e98
update todos
edheltzel Feb 1, 2024
8680012
Add git-undo function to fish shell
edheltzel Feb 1, 2024
a09eb0c
Update unset function description
edheltzel Feb 1, 2024
64fef92
includes typescript support for lazyvim
edheltzel Feb 1, 2024
5c82a31
adds git-cbr command to checkout branches with changes .
edheltzel Feb 1, 2024
347908f
updates git functions and aliases
edheltzel Feb 1, 2024
63a21e4
adds tldrf to search through all the tldr pages with fzf
edheltzel Feb 1, 2024
7a867a6
readme update: moved todos to readme and started update the readme docs
edheltzel Feb 1, 2024
99fc392
lazyvim keymaps to match vspacecode which key
edheltzel Feb 1, 2024
29dd847
readme update with todos
edheltzel Feb 1, 2024
610c3a4
readme update with todos
edheltzel Feb 2, 2024
d340dec
lazyvim lock
edheltzel Feb 2, 2024
3243cad
warp key bindings
edheltzel Feb 2, 2024
3003ddc
minor changes to fish
edheltzel Feb 2, 2024
838fcaa
like warp but iterm is just better
edheltzel Feb 2, 2024
f54e46a
saves window arrangement
edheltzel Feb 2, 2024
9910258
giving iterm some love and configuring windows and setting up hotkeys
edheltzel Feb 2, 2024
8dced3a
adds vscode setting and keymaps
edheltzel Feb 3, 2024
82163a0
comment
edheltzel Feb 3, 2024
6c9249d
iterm2 settings
edheltzel Feb 3, 2024
e5c9fd3
todo tree update
edheltzel Feb 3, 2024
92e6dda
Update README
edheltzel Feb 3, 2024
187b648
fixed typo
edheltzel Feb 3, 2024
63c3b17
adding vscode to stow packages in makefile
edheltzel Feb 3, 2024
eb98dcb
Update README.md with new customizations and settings
edheltzel Feb 3, 2024
21b7b2b
Add GNU Stow and makefile for managing dotfiles
edheltzel Feb 3, 2024
4cea94b
stow ignore update
edheltzel Feb 3, 2024
48821a4
updating readme
edheltzel Feb 3, 2024
8deca20
lazyvim update and iterm2 settings
edheltzel Feb 3, 2024
06bf8b0
Update Brewfile with new dependencies
edheltzel Feb 3, 2024
260cc29
removes duplicate settings in vscode
edheltzel Feb 3, 2024
a49fac1
adds `.config/wallpapers`
edheltzel Feb 3, 2024
868cea1
includes abbrivation for `~/.local/`
edheltzel Feb 4, 2024
7ff61c3
tweaks iterm2 settings and profiles
edheltzel Feb 4, 2024
7e942b9
includes new git alias `git addi` that uses fzf
edheltzel Feb 4, 2024
6734dc1
add todo about plug.fish
edheltzel Feb 4, 2024
d2e62dd
removes tabtab completions from fish
edheltzel Feb 4, 2024
262d42b
removes titles from iterm2 split panes for more minimal look
edheltzel Feb 4, 2024
2c2ab87
update make help language
edheltzel Feb 4, 2024
77b511e
dropping support for Fisher - migration to Plug.fish
edheltzel Feb 4, 2024
66c8c8e
update readme and xdg support
edheltzel Feb 4, 2024
dfda09d
update readme and remove gitnow keybindings - rarely use them
edheltzel Feb 4, 2024
c232aba
fisher plugins file
edheltzel Feb 4, 2024
b60620c
adding only my completions
edheltzel Feb 4, 2024
c528f36
raycast backup
edheltzel Feb 4, 2024
cda5598
cleaning up only my custom fish files
edheltzel Feb 4, 2024
3bac99e
update iterm directory to iterm2
edheltzel Feb 4, 2024
deb7bb4
update todos
edheltzel Feb 4, 2024
b75164a
Update XDG Base Directory Specification paths
edheltzel Feb 5, 2024
f27ed1c
fix typo
edheltzel Feb 5, 2024
7891526
Add color codes and improve Makefile
edheltzel Feb 5, 2024
f2efc3c
Add makefile for managing dotfiles with Stow
edheltzel Feb 5, 2024
a6d044c
changed first task from `all` to `default`
edheltzel Feb 5, 2024
e506aa2
add some gh aliases for faster assignment of issues and workflow
edheltzel Feb 5, 2024
4beb1bc
update lazyvim
edheltzel Feb 5, 2024
a32f4b3
iterm2 window alignment update
edheltzel Feb 5, 2024
87c33af
match language from README
edheltzel Feb 5, 2024
4fe55ec
cspell dictionary update
edheltzel Feb 5, 2024
0bc8687
move images to misc/__images
edheltzel Feb 5, 2024
da1f6a7
update packages script
edheltzel Feb 5, 2024
39f991c
Updates Git Project Manager base folders to include ~/.dotfiles
edheltzel Feb 5, 2024
d9a2f44
private ;)
edheltzel Feb 5, 2024
2b79748
update to readme
edheltzel Feb 5, 2024
bbcc08b
Update Makefile and remove wallpapers
edheltzel Feb 6, 2024
d5bd7a6
updates stow packages to includes local
edheltzel Feb 6, 2024
a7dd5f3
move wallpaper to live in ~/.local/share/wallpapers
edheltzel Feb 6, 2024
1112aee
adding zed and updating comments
edheltzel Feb 6, 2024
3867ef4
update lazyvim
edheltzel Feb 6, 2024
8936e6d
Update Brewfile with new default description for Visual Studio Code I…
edheltzel Feb 6, 2024
5cdb8d1
trying to stay true to XDG standards
edheltzel Feb 6, 2024
d9aa72c
Update local directory description
edheltzel Feb 6, 2024
3ad096e
Update vscode sync settings feature
edheltzel Feb 6, 2024
0364afb
Add system provisioning and installation functions***
edheltzel Feb 6, 2024
1afcf61
iterm2 profile update
edheltzel Feb 6, 2024
0742d7e
bootstrap is now install for remote
edheltzel Feb 6, 2024
fb5a1da
Update Makefile and install.sh scripts
edheltzel Feb 6, 2024
126a6d5
update iterm window styling
edheltzel Feb 6, 2024
c9e0556
Update bootstrap script and installation instructions
edheltzel Feb 6, 2024
7ba0c90
Fix indentation in Makefile
edheltzel Feb 6, 2024
1f2b5c5
fix duplication with ghpr
edheltzel Feb 6, 2024
6ce8dfa
Merge pull request #33 from edheltzel/feature/xdg
edheltzel Feb 6, 2024
8a7be50
fix duplication with ghpr
edheltzel Feb 6, 2024
cb2f7d8
Merge pull request #34 from edheltzel/feature/xdg
edheltzel Feb 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
setting fish for stow
  • Loading branch information
edheltzel committed Jan 29, 2024
commit 9158b191727a2990acbab349244f8d0382326b5a
1 change: 1 addition & 0 deletions fish/.config/fish/completions/alacritty.fish
14 changes: 14 additions & 0 deletions fish/.config/fish/completions/artisan.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
complete -c artisan -s h -l help -d 'Display this help message' -f
complete -c artisan -s q -l quiet -d 'Do not output any message' -f
complete -c artisan -s V -l version -d 'Display this application version' -f
complete -c artisan -s n -l no-interaction -d 'Do not ask any interactive question' -f
complete -c artisan -s v -l verbose -d 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug' -f
complete -c artisan -l ansi -d 'Force ANSI output' -f
complete -c artisan -l no-ansi -d 'Disable ANSI output' -f
complete -c artisan -l env -d 'The environment the command should run under' -f

function __artisan_entries
php artisan --no-ansi | sed "1,/Available commands/d" | string match -i -r '\s+.+?\s+' | string trim
end

complete -f -c artisan -a '(__artisan_entries)'
1 change: 1 addition & 0 deletions fish/.config/fish/completions/bun.fish
7 changes: 7 additions & 0 deletions fish/.config/fish/completions/fisher.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
complete --command fisher --exclusive --long help --description "Print help"
complete --command fisher --exclusive --long version --description "Print version"
complete --command fisher --exclusive --condition __fish_use_subcommand --arguments install --description "Install plugins"
complete --command fisher --exclusive --condition __fish_use_subcommand --arguments update --description "Update installed plugins"
complete --command fisher --exclusive --condition __fish_use_subcommand --arguments remove --description "Remove installed plugins"
complete --command fisher --exclusive --condition __fish_use_subcommand --arguments list --description "List installed plugins matching regex"
complete --command fisher --exclusive --condition "__fish_seen_subcommand_from update remove" --arguments "(fisher list)"
8 changes: 8 additions & 0 deletions fish/.config/fish/completions/fzf_configure_bindings.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
complete fzf_configure_bindings --no-files
complete fzf_configure_bindings --long help --short h --description "Print help" --condition "not __fish_seen_argument --help -h"
complete fzf_configure_bindings --long directory --description "Change the key binding for Search Directory" --condition "not __fish_seen_argument --directory"
complete fzf_configure_bindings --long git_log --description "Change the key binding for Search Git Log" --condition "not __fish_seen_argument --git_log"
complete fzf_configure_bindings --long git_status --description "Change the key binding for Search Git Status" --condition "not __fish_seen_argument --git_status"
complete fzf_configure_bindings --long history --description "Change the key binding for Search History" --condition "not __fish_seen_argument --history"
complete fzf_configure_bindings --long processes --description "Change the key binding for Search Processes" --condition "not __fish_seen_argument --processes"
complete fzf_configure_bindings --long variables --description "Change the key binding for Search Variables" --condition "not __fish_seen_argument --variables"
1 change: 1 addition & 0 deletions fish/.config/fish/completions/gh.fish
1 change: 1 addition & 0 deletions fish/.config/fish/completions/gt.fish
20 changes: 20 additions & 0 deletions fish/.config/fish/completions/merge.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# GitNow — Speed up your Git workflow. 🐠
# https://github.com/joseluisq/gitnow

# Merge command

__gitnow_load_git_functions

complete -f -x -c merge -a '(__fish_git_branches)'

complete -f -x -c merge \
-s h -l help \
-d "Show information about the options for this command"

complete -f -x -c merge \
-s a -l abort \
-d "Abort conflicted merge"

complete -f -x -c merge \
-s c -l continue \
-d "Continue merge"
26 changes: 26 additions & 0 deletions fish/.config/fish/completions/move.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# GitNow — Speed up your Git workflow. 🐠
# https://github.com/joseluisq/gitnow

# Move command

__gitnow_load_git_functions

complete -f -x -c move -a '(__fish_git_branches)'

complete -f -x -c move \
-s h -l help \
-d "Show information about the options for this command"

complete -f -x -c move \
-s p -l prev \
-d "Switch to a previous branch using the `--no-apply-stash` option (equivalent to \"move -\")"

complete -f -x -c move \
-s n -l no-apply-stash \
-a '(__fish_git_branches)' \
-d "Switch to a local branch but without applying current stash"

complete -f -x -c move \
-s u -l upstream \
-a '(__fish_git_branches)' \
-d "Fetch a remote branch and switch to it applying current stash"
1 change: 1 addition & 0 deletions fish/.config/fish/completions/rbenv.fish
31 changes: 31 additions & 0 deletions fish/.config/fish/completions/tag.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# GitNow — Speed up your Git workflow. 🐠
# https://github.com/joseluisq/gitnow

# Tag command

__gitnow_load_git_functions

complete -f -x -c tag \
-d "List all tags in a lexicographic order and treating tag names as versions"

complete -f -x -c tag -a '(__fish_git_tags)'

complete -f -x -c tag \
-s h -l help \
-d "Show information about the options for this command"

complete -f -x -c tag \
-s l -l latest \
-d "Show only the latest Semver release tag version (no suffixed ones or others)"

complete -f -x -c tag \
-s x -l major \
-d "Tag auto-incrementing a major version number"

complete -f -x -c tag \
-s y -l minor \
-d "Tag auto-incrementing a minor version number"

complete -f -x -c tag \
-s z -l patch \
-d "Tag auto-incrementing a patch version number"
40 changes: 40 additions & 0 deletions fish/.config/fish/conf.d/.gitnow
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[ options ]

# Read text from system clipboard or from the standard input
# only when using Gitflow keybindings
clipboard = false

[ keybindings ]

# Alt + S
state = \es

# Alt + E
stage = \ee

# Ctrl + E
unstage = \ce

# Alt + M
show = \em

# Alt + C
commit-all = \ec

# Alt + D
pull = \ed

# Alt + P
push = \ep

# Alt + U
upstream = \eu

# Alt + L
logs = \el

# Alt + F
feature = \ef

# Alt + H
hotfix = \eh
1 change: 1 addition & 0 deletions fish/.config/fish/conf.d/abbr.fish
16 changes: 16 additions & 0 deletions fish/.config/fish/conf.d/brew.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
set -l brew_paths /opt/homebrew/bin /usr/local/bin /usr/bin /bin /opt/homebrew/sbin /usr/local/sbin /usr/sbin /sbin /home/linuxbrew/.linuxbrew/bin

for brew_path in $brew_paths
if contains $brew_path $PATH
continue
end

if test -f $brew_path/brew
set PATH $brew_path $PATH
break
end
end

if not type -q brew
echo "Please install 'brew' first!"
end
1 change: 1 addition & 0 deletions fish/.config/fish/conf.d/colors.fish
1 change: 1 addition & 0 deletions fish/.config/fish/conf.d/exports.fish
7 changes: 7 additions & 0 deletions fish/.config/fish/conf.d/fish-ssh-agent.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
if test -z "$SSH_ENV"
set -xg SSH_ENV $HOME/.ssh/environment
end

if not __ssh_agent_is_started
__ssh_agent_start
end
1 change: 1 addition & 0 deletions fish/.config/fish/conf.d/fnm.fish
28 changes: 28 additions & 0 deletions fish/.config/fish/conf.d/fzf.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# fzf.fish is only meant to be used in interactive mode. If not in interactive mode and not in CI, skip the config to speed up shell startup
if not status is-interactive && test "$CI" != true
exit
end

# Because of scoping rules, to capture the shell variables exactly as they are, we must read
# them before even executing _fzf_search_variables. We use psub to store the
# variables' info in temporary files and pass in the filenames as arguments.
# This variable is global so that it can be referenced by fzf_configure_bindings and in tests
set --global _fzf_search_vars_command '_fzf_search_variables (set --show | psub) (set --names | psub)'


# Install the default bindings, which are mnemonic and minimally conflict with fish's preset bindings
fzf_configure_bindings

# Doesn't erase autoloaded _fzf_* functions because they are not easily accessible once key bindings are erased
function _fzf_uninstall --on-event fzf_uninstall
_fzf_uninstall_bindings

set --erase _fzf_search_vars_command
functions --erase _fzf_uninstall _fzf_migration_message _fzf_uninstall_bindings fzf_configure_bindings
complete --erase fzf_configure_bindings

set_color cyan
echo "fzf.fish uninstalled."
echo "You may need to manually remove fzf_configure_bindings from your config.fish if you were using custom key bindings."
set_color normal
end
62 changes: 62 additions & 0 deletions fish/.config/fish/conf.d/github-copilot-cli.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
function __fish_add_history
set -l cmd (string replace -- \n \\n (string join ' ' $argv) | string replace \\ \\\\)
if test -z $cmd
return
end
begin
echo -- '- cmd:' $cmd
and date +' when: %s'
end >>$__fish_user_data_dir/fish_history
and history merge
end

function __copilot_what-the-shell
set TMPFILE (mktemp)
trap 'rm -f $TMPFILE' EXIT
if github-copilot-cli what-the-shell $argv --shellout $TMPFILE
if test -e $TMPFILE
set FIXED_CMD (cat $TMPFILE)
__fish_add_history $FIXED_CMD
eval $FIXED_CMD
else
echo "Apologies! Extracting command failed"
end
else
return 1
end
end
alias '!!'='__copilot_what-the-shell'

function __copilot_git-assist
set TMPFILE (mktemp)
trap 'rm -f $TMPFILE' EXIT
if github-copilot-cli git-assist $argv --shellout $TMPFILE
if test -e $TMPFILE
set FIXED_CMD (cat $TMPFILE)
__fish_add_history $FIXED_CMD
eval $FIXED_CMD
else
echo "Apologies! Extracting command failed"
end
else
return 1
end
end
alias 'git!'='__copilot_git-assist'

function __copilot_gh-assist
set TMPFILE (mktemp)
trap 'rm -f $TMPFILE' EXIT
if github-copilot-cli gh-assist $argv --shellout $TMPFILE
if test -e $TMPFILE
set FIXED_CMD (cat $TMPFILE)
__fish_add_history $FIXED_CMD
eval $FIXED_CMD
else
echo "Apologies! Extracting command failed"
end
else
return 1
end
end
alias 'gh!'='__copilot_gh-assist'
Loading