9 Commits

Author	SHA1	Message	Date
Alicia Sykes	3d1a41f3db	Import cargo if present, removed duplicate code	2023-06-11 11:47:14 +01:00
Alicia Sykes	b45aa7c95a	Merge master into working tree	2023-02-21 11:17:41 +00:00
Alicia Sykes	68c7f32d18	mac stuff	2023-02-21 11:14:03 +00:00
Alicia Sykes	5accb2bf44	Resolves conflicts	2022-12-24 18:27:55 +00:00
Alicia Sykes	15b893a279	Executes zoxide if needed	2022-12-24 18:23:24 +00:00
Alicia Sykes	237a3de3af	Rebase new changes, and fish conf	2022-11-30 11:41:42 +00:00
Alicia Sykes	5fdf94386a	If iterm integration tools availible, import them	2022-11-11 18:38:41 +00:00
Alicia Sykes	3a66be5bb6	Move ZSH app imports to .zshrc, not .zshenv	2022-11-06 23:59:18 +00:00
Alicia Sykes	c02a492972	Reorganised ZSH, Tmux and Vim into Configs directory	2022-11-06 23:02:32 +00:00