Skip to content

Commit 51a20c0

Browse files
committed
Fix issues detected by pre-commit.com hooks
1 parent 1d62600 commit 51a20c0

18 files changed

+76
-70
lines changed

README.md

+31-27
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,48 @@
11
# .dotfiles
2+
23
A collection of my `.dotfiles` and `.*rc` files
34

45
All of these files were tested to work on macOS Big Sur
56

6-
# Installation
7+
## Installation
8+
9+
### Automatic
710

8-
## Automatic
911
Hardlinks can be configured by running `./install.sh`
1012

1113
```
1214
Read the contents of that file carefully before running it
1315
```
1416

15-
## Manual
17+
### Manual
18+
1619
Programs to install:
17-
* xcode devtools
18-
* macvim
19-
* oh-my-zsh and Power10k
20-
* ffmpeg
21-
* youtube-dl
22-
* Python
23-
* docker & docker mysql container
24-
* Chrome Beta
25-
* OBS
26-
* TeamViewer
27-
* PyCharm
28-
* Davinchi Resolve
29-
* Adobe Photoshop
30-
* VLC
31-
* Android File Transfer
32-
* OpenVPN Connect
33-
* Specify 6
20+
21+
* xcode devtools
22+
* macvim
23+
* oh-my-zsh and Power10k
24+
* ffmpeg
25+
* youtube-dl
26+
* Python
27+
* docker & docker mysql container
28+
* Chrome Beta
29+
* OBS
30+
* TeamViewer
31+
* PyCharm
32+
* Davinchi Resolve
33+
* Adobe Photoshop
34+
* VLC
35+
* Android File Transfer
36+
* OpenVPN Connect
37+
* Specify 6
3438

3539
Other tasks:
36-
* Backup Google Chrome custom flags along with Stylebot's and
40+
41+
* Backup Google Chrome custom flags along with Stylebot's and
3742
Tampermonkey's settings
38-
* Terminal's custom key bindings
39-
* Backup files not in git (Downloads, Desktop, ~/, etc)
40-
* Check that checked out repositories have clean trees, no unpushed
43+
* Terminal's custom key bindings
44+
* Backup files not in git (Downloads, Desktop, ~/, etc)
45+
* Check that checked out repositories have clean trees, no unpushed
4146
commits and no stashed code. Also check files ignored by Git
42-
* Check the content of docker containers
43-
* Identify local files with no clound backup
44-
47+
* Check the content of docker containers
48+
* Identify local files with no clound backup

common_plaintext_files/README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# List of common plain text file extensions
2+
23
Use this list to bulk-associate these extensions with your favorite
34
text editor.
45

56
## Usage
7+
68
These instructions are designed for macOS:
9+
710
* Select the files from this folder you want to associate (or all of
8-
them)
11+
them)
912
* Press option+command+I
1013
* Under `Open With` select your text editor
1114
* Press `Change All`
1215
* Confirm when prompted
13-

common_plaintext_files/d.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

common_plaintext_files/d.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""Test."""

git/.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
.* filter=t2s
2-

git/.gitconfig

-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,3 @@
6262
prereleaseSuffix = .rc
6363
[filter "t2s"]
6464
clean = expand -t 2
65-

install.sh

+10-11
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ ln ./zsh/.oh-my-zsh/dirhistory.plugin.zsh "${USER}/.oh-my-zsh/custom/"
4848

4949
# Clonning git repos
5050
(
51-
cd "${USER}/site/python" &&
52-
git clone https://github.com/specify/specify7
51+
cd "${USER}/site/python" &&
52+
git clone https://github.com/specify/specify7
5353
)
5454
(
55-
cd "${USER}/site/git/" &&
56-
git clone https://github.com/specify/specify6 &&
57-
git clone https://github.com/specify/specify_tools &&
58-
git clone https://github.com/maxxxxxdlp/code_share &&
59-
git clone https://github.com/maxxxxxdlp/TTS_King &&
60-
# this is a private repository, so you should probably comment out
61-
# this line:
62-
git clone https://github.com/maxxxxxdlp/private-dotfiles
55+
cd "${USER}/site/git/" &&
56+
git clone https://github.com/specify/specify6 &&
57+
git clone https://github.com/specify/specify_tools &&
58+
git clone https://github.com/maxxxxxdlp/code_share &&
59+
git clone https://github.com/maxxxxxdlp/TTS_King &&
60+
# this is a private repository, so you should probably comment out
61+
# this line:
62+
git clone https://github.com/maxxxxxdlp/private-dotfiles
6363
)
6464

6565
# Hardlink common files from `code_share`
@@ -71,4 +71,3 @@ ln "${USER}/site/git/code_share/Images/logos/maksym_patiiuk.jpg" "${USER}/Docume
7171
# out
7272
# Running the install script for `private-dotfiles`
7373
../private-dotfiles/install.sh
74-

javascript/.jshintrc

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
"expr": true,
88
"browserify": true
99
}
10-

javascript/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# JavaScript
2+
23
Files that help with JavaScript development

python/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Python
2+
23
Files that help with Python development

requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
pre-commit
22
termcolor
3-

vim/.vimrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set colorcolumn=72
3030
set textwidth=72
3131

3232
" set the directory of the current file as path
33-
autocmd BufEnter * lcd %:p:h
33+
autocmd BufEnter * lcd %:p:h
3434

3535
" change the swap files location
3636
set directory^=$HOME/.vim/tmp//

vim/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Vim
2+
23
My macVim setup
34

45
I used `Plug` for plugin management

zsh/.oh-my-zsh/README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# oh-my-zsh config files
2+
23
These files should be placed into `~/.oh-my-zsh/custom/`
34

45
Addiitiona plugins I have installed:
5-
- `zsh-vi-mode`
6+
7+
- `zsh-vi-mode`
68

79
`dirhistory.plugin.zsh` and `osx.zsh` were modified by me but were not
810
originally created by me

zsh/.oh-my-zsh/dirhistory.plugin.zsh

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
##
2-
# Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories
1+
##
2+
# Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories
33
# that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
4-
#
4+
#
55
# Navigate directory hierarchy using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented)
66
# ALT-UP moves to higher hierarchy (cd ..)
77
# ALT-DOWN moves into the first directory found in alphabetical order
@@ -14,8 +14,8 @@ export dirhistory_future
1414

1515
export DIRHISTORY_SIZE=30
1616

17-
# Pop the last element of dirhistory_past.
18-
# Pass the name of the variable to return the result in.
17+
# Pop the last element of dirhistory_past.
18+
# Pass the name of the variable to return the result in.
1919
# Returns the element if the array was not empty,
2020
# otherwise returns empty string.
2121
function pop_past() {
@@ -32,7 +32,7 @@ function pop_future() {
3232
fi
3333
}
3434

35-
# Push a new element onto the end of dirhistory_past. If the size of the array
35+
# Push a new element onto the end of dirhistory_past. If the size of the array
3636
# is >= DIRHISTORY_SIZE, the array is shifted
3737
function push_past() {
3838
if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then
@@ -76,7 +76,7 @@ function dirhistory_back() {
7676
local d=""
7777
# Last element in dirhistory_past is the cwd.
7878

79-
pop_past cw
79+
pop_past cw
8080
if [[ "" == "$cw" ]]; then
8181
# Someone overwrote our variable. Recover it.
8282
dirhistory_past=($PWD)
@@ -109,7 +109,7 @@ function dirhistory_forward() {
109109
function dirhistory_zle_dirhistory_back() {
110110
# Erase current line in buffer
111111
zle kill-buffer
112-
dirhistory_back
112+
dirhistory_back
113113
zle accept-line
114114
}
115115

@@ -127,9 +127,9 @@ zle -N dirhistory_zle_dirhistory_future
127127
bindkey "^[[1;2A" dirhistory_zle_dirhistory_future
128128

129129

130-
#
130+
#
131131
# HIERARCHY Implemented in this section, in case someone wants to split it to another plugin if it clashes bindings
132-
#
132+
#
133133

134134
# Move up in hierarchy
135135
function dirhistory_up() {

zsh/.oh-my-zsh/misc.zsh

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ alias l="ls -GahlFT%"
1010

1111
### cd && l/ls
1212
function cl {
13-
DIR="$*";
14-
# if no DIR given, go home
15-
if [ $# -lt 1 ]; then
16-
DIR=$HOME;
17-
fi;
18-
builtin cd "${DIR}" && l
13+
DIR="$*";
14+
# if no DIR given, go home
15+
if [ $# -lt 1 ]; then
16+
DIR=$HOME;
17+
fi;
18+
builtin cd "${DIR}" && l
1919
}
2020
function cls {
21-
DIR="$*";
22-
# if no DIR given, go home
23-
if [ $# -lt 1 ]; then
24-
DIR=$HOME;
25-
fi;
26-
builtin cd "${DIR}" && ls
21+
DIR="$*";
22+
# if no DIR given, go home
23+
if [ $# -lt 1 ]; then
24+
DIR=$HOME;
25+
fi;
26+
builtin cd "${DIR}" && ls
2727
}
2828

2929

zsh/.oh-my-zsh/osx.zsh

-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ function cdf() {
1919
function preview() {
2020
(( $# > 0 )) && qlmanage -p $* &>/dev/null &
2121
}
22-

zsh/.oh-my-zsh/programs.zsh

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ alias clipboard="python3 ~/site/git/code_share/Python/clipboard/clip_board.py"
33
alias tts="python3 ~/site/python/tts/run.py"
44
alias yt="youtube-dl --exec \"afplay /System/Library/Sounds/Funk.aiff #\""
55
alias g="python3 ~/site/git/code_share/Python/github/github.py"
6-

0 commit comments

Comments
 (0)