From 7eaf862eaddc7ab23622d61bc1e04231b5d2aea6 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Thu, 27 Oct 2022 15:42:05 +0100 Subject: [PATCH] Re-organise files, to be more organised --- configs/.curlrc | 8 -- configs/.gitconfig | 276 -------------------------------------- configs/.gitignore_global | 37 ----- configs/.wgetrc | 35 ----- 4 files changed, 356 deletions(-) delete mode 100644 configs/.curlrc delete mode 100644 configs/.gitconfig delete mode 100644 configs/.gitignore_global delete mode 100644 configs/.wgetrc diff --git a/configs/.curlrc b/configs/.curlrc deleted file mode 100644 index ec19c00..0000000 --- a/configs/.curlrc +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration for curl -# For more info, see: https://everything.curl.dev/ - -# When following a redirect, automatically set the previous URL as referrer -referer = ";auto" - -# Wait 60 seconds before timing out -connect-timeout = 60 diff --git a/configs/.gitconfig b/configs/.gitconfig deleted file mode 100644 index 264a97d..0000000 --- a/configs/.gitconfig +++ /dev/null @@ -1,276 +0,0 @@ -# Global Git Configuration - -[user] - name = Alicia Sykes - email = alicia@omg.lol - username = lissy93 -[init] - defaultBranch = master -[pull] - rebase = false -[core] - editor = nvim - whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol - pager = delta - excludesfile = /Users/alicia/.config/.gitignore_global -[web] - browser = firefox -[instaweb] - httpd = apache2 -f -[rerere] - enabled = 1 - autoupdate = 1 -[color] - ui = auto -[color "branch"] - current = yellow bold - local = purple bold - remote = cyan bold -[color "diff"] - meta = yellow bold - frag = magenta bold - old = red bold - new = green bold - whitespace = red reverse -[color "status"] - added = green bold - changed = yellow bold - untracked = red bold -[diff] - tool = vimdiff -[difftool] - prompt = false -[delta] - features = line-numbers decorations - line-numbers = true -[delta "decorations"] - minus-style = red bold normal - plus-style = green bold normal - minus-emph-style = white bold red - minus-non-emph-style = red bold normal - plus-emph-style = white bold green - plus-non-emph-style = green bold normal - file-style = yellow bold none - file-decoration-style = yellow box - hunk-header-style = magenta bold - hunk-header-decoration-style = magenta box - minus-empty-line-marker-style = normal normal - plus-empty-line-marker-style = normal normal - line-numbers-right-format = "{np:^4}│ " -# [github] - # user = lissy93 - # token = token -[gitflow "prefix"] - versiontag = v -[sequence] - editor = interactive-rebase-tool -[alias] - a = add --all - ai = add -i - ############# - ap = apply - as = apply --stat - ac = apply --check - ############# - ama = am --abort - amr = am --resolved - ams = am --skip - ############# - b = branch - ba = branch -a - bd = branch -d - bdd = branch -D - br = branch -r - bc = rev-parse --abbrev-ref HEAD - bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}" - bs = !git-branch-status - ############# - c = commit - ca = commit -a - cm = commit -m - cam = commit -am - cem = commit --allow-empty -m - cd = commit --amend - cad = commit -a --amend - ced = commit --allow-empty --amend - ############# - cl = clone - cld = clone --depth 1 - clg = !sh -c 'git clone git://github.com/$1 $(basename $1)' - - clgp = !sh -c 'git clone git@github.com:$1 $(basename $1)' - - clgu = !sh -c 'git clone git@github.com:$(git config --get user.username)/$1 $1' - - ############# - cp = cherry-pick - cpa = cherry-pick --abort - cpc = cherry-pick --continue - ############# - d = diff - dp = diff --patience - dc = diff --cached - dk = diff --check - dck = diff --cached --check - dt = difftool - dct = difftool --cached - ############# - f = fetch - fo = fetch origin - fu = fetch upstream - ############# - fp = format-patch - ############# - fk = fsck - ############# - g = grep -p - ############# - l = log --oneline - lg = log --oneline --graph --decorate - ############# - ls = ls-files - lsf = !git ls-files | grep -i - ############# - m = merge - ma = merge --abort - mc = merge --continue - ms = merge --skip - ############# - o = checkout - om = checkout master - ob = checkout -b - opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1' - ############# - pr = prune -v - ############# - ps = push - psf = push -f - psu = push -u - pst = push --tags - ############# - pso = push origin - psao = push --all origin - psfo = push -f origin - psuo = push -u origin - ############# - psom = push origin master - psaom = push --all origin master - psfom = push -f origin master - psuom = push -u origin master - psoc = !git push origin $(git bc) - psaoc = !git push --all origin $(git bc) - psfoc = !git push -f origin $(git bc) - psuoc = !git push -u origin $(git bc) - psdc = !git push origin :$(git bc) - ############# - pl = pull - pb = pull --rebase - ############# - plo = pull origin - pbo = pull --rebase origin - plom = pull origin master - ploc = !git pull origin $(git bc) - pbom = pull --rebase origin master - pboc = !git pull --rebase origin $(git bc) - ############# - plu = pull upstream - plum = pull upstream master - pluc = !git pull upstream $(git bc) - pbum = pull --rebase upstream master - pbuc = !git pull --rebase upstream $(git bc) - ############# - rb = rebase - rba = rebase --abort - rbc = rebase --continue - rbi = rebase --interactive - rbs = rebase --skip - ############# - re = reset - rh = reset HEAD - reh = reset --hard - rem = reset --mixed - res = reset --soft - rehh = reset --hard HEAD - remh = reset --mixed HEAD - resh = reset --soft HEAD - rehom = reset --hard origin/master - ############# - r = remote - ra = remote add - rr = remote rm - rv = remote -v - rn = remote rename - rp = remote prune - rs = remote show - rao = remote add origin - rau = remote add upstream - rro = remote remove origin - rru = remote remove upstream - rso = remote show origin - rsu = remote show upstream - rpo = remote prune origin - rpu = remote prune upstream - ############# - rmf = rm -f - rmrf = rm -r -f - ############# - s = status - sb = status -s -b - ############# - sa = stash apply - sc = stash clear - sd = stash drop - sl = stash list - sp = stash pop - ss = stash save - ssk = stash save -k - sw = stash show - st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*' - ############# - t = tag - td = tag -d - ############# - w = show - wp = show -p - wr = show -p --no-color - ############# - svnr = svn rebase - svnd = svn dcommit - svnl = svn log --oneline --show-commit - ############# - subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' - - subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' - - subup = submodule update --init --recursive - subpull = !git submodule foreach git pull --tags -f origin master - ############# - assume = update-index --assume-unchanged - unassume = update-index --no-assume-unchanged - assumed = !git ls -v | grep ^h | cut -c 3- - unassumeall = !git assumed | xargs git unassume - assumeall = !git status -s | awk {'print $2'} | xargs git assume - ############# - bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' - - release = !sh -c 'git tag v$1 && git pst' - - unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' - - merged = !sh -c 'git o master && git plom && git bd $1 && git rpo' - - aliases = !git config -l | grep alias | cut -c 7- - snap = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}' - bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' - - whois = !sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' - - serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git - ############# - behind = !git rev-list --left-only --count $(git bu)...HEAD - ahead = !git rev-list --right-only --count $(git bu)...HEAD - ############# - ours = "!f() { git checkout --ours $@ && git add $@; }; f" - theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" - subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' - - human = name-rev --name-only --refs=refs/heads/* -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true -[difftool "sourcetree"] - cmd = opendiff \"$LOCAL\" \"$REMOTE\" - path = -[mergetool "sourcetree"] - cmd = /Users/alicia/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" - trustExitCode = true diff --git a/configs/.gitignore_global b/configs/.gitignore_global deleted file mode 100644 index 560df01..0000000 --- a/configs/.gitignore_global +++ /dev/null @@ -1,37 +0,0 @@ - -# Linux -*~ -.fuse_hidden* -.directory -.Trash-* -.nfs* - -# MacOS -.DS_Store -.AppleDouble -.LSOverride -Icon -._* -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk -*.icloud - -# Windows -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db -*.stackdump -[Dd]esktop.ini -$RECYCLE.BIN/ -*.lnk diff --git a/configs/.wgetrc b/configs/.wgetrc deleted file mode 100644 index 98a8c54..0000000 --- a/configs/.wgetrc +++ /dev/null @@ -1,35 +0,0 @@ -# Use the server-provided last modification date, if available -timestamping = on - -# Do not go up in the directory structure when downloading recursively -no_parent = on - -# Wait 60 seconds before timing out (DNS, connect and read) -timeout = 60 - -# Retry a few times when a download fails, but don’t overdo it -tries = 3 - -# Retry even when the connection was refused -retry_connrefused = on - -# Use the last component of a redirection URL for the local file name -trust_server_names = on - -# Follow FTP links from HTML documents by default -follow_ftp = on - -# Add extensions when missing, based on header type (e.g. text/html --> .html) -adjust_extension = on - -# Use UTF-8 as the default system encoding -#local_encoding = UTF-8 - -# Ignore `robots.txt` and `` -robots = off - -# Print the HTTP and FTP server responses -server_response = on - -# Disguise as IE 9 on Windows 7 -user_agent = Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)