Commit Graph

14 Commits

Author SHA1 Message Date
Alicia Sykes
7fb8fc834e Merge branch 'master' of github.com:Lissy93/dotfiles
# Conflicts:
#	installs/arch.sh
2022-10-11 17:21:26 +01:00
Alicia Sykes
38b5f0f415 Fix .gitconfig conflict 2022-09-24 15:44:39 +01:00
Alicia Sykes
3c4111c2f0 Moves MacOS configs to sub-dir 2022-09-19 19:13:14 +01:00
Alicia Sykes
14af202030 Adds link to .gitconfigglobal 2022-09-18 17:11:35 +01:00
Alicia Sykes
71c7598821 Removes mac-specific files from root 2022-09-12 17:48:02 +01:00
Alicia Sykes
13e844a103 Moves MacOS files into dedicated directory 2022-09-06 19:39:04 +01:00
Alicia Sykes
88ecd14354 Adds .wgetrc config 2022-08-14 23:22:02 +01:00
Alicia Sykes
1de6755dbe Adds .curlrc config 2022-08-14 23:21:47 +01:00
Alicia Sykes
33ca0489a2 Updates dock items in .macos 2022-08-14 23:19:30 +01:00
Alicia Sykes
1ab193b238 Updates git configuration 2022-08-12 12:22:26 +01:00
Alicia Sykes
36f1b4bbbb Updates dotfiles for MacOS 2022-08-11 10:22:22 +01:00
Alicia Sykes
8b90d2cc99 Refactors install script, and adds MacOS-specific symlinks 2022-08-10 12:07:57 +01:00
Alicia Sykes
b924223056 Sets default merge strategy in .gitconfig 2022-08-09 16:28:51 +01:00
Alicia Sykes
577a69ade9 Moves loose files to own directory, configs 2022-08-07 17:00:06 +01:00