Skip to content

Commit c2ee701

Browse files
committed
✨ git
1 parent 8f4b253 commit c2ee701

File tree

6 files changed

+209
-0
lines changed

6 files changed

+209
-0
lines changed

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,19 @@ https://github.com/juftin/dotfiles/assets/49741340/569d7e27-114b-4378-9157-f7f9e
8787
ln -s ~/.dotfiles/bootstrap/oh-my-bash ~/.oh-my-bash
8888
ln -s ~/.dotfiles/shell/.zshrc ~/.zshrc
8989
ln -s ~/.dotfiles/shell/.bashrc ~/.bashrc
90+
ln -s ~/.dotfiles/shell/.profile ~/.profile
9091
ln -s ~/.dotfiles/shell/.p10k.zsh ~/.p10k.zsh
9192
ln -s ~/.dotfiles/shell/.shell_aliases ~/.shell_aliases
9293
ln -s ~/.dotfiles/shell/.mac_aliases ~/.mac_aliases
94+
ln -s ~/.dotfiles/bootstrap/pyenv ~/.pyenv
95+
ln -s ~/.dotfiles/git/.gitconfig ~/.gitconfig
96+
ln -s ~/.dotfiles/git/.gitignore ~/.gitignore
9397
```
98+
99+
## Customization
100+
101+
Customizing this repo for yourself requires editing a few key
102+
files:
103+
104+
- `~/.gitconfig`
105+
- Update the `[user]` section with your own name and email

bootstrap/bootstrap.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ function symlink_dotfiles() {
284284
symlink_item "${DOTFILES_DIR}/shell/.mac_aliases" "${HOME}/.mac_aliases"
285285
# PyEnv
286286
symlink_item "${DOTFILES_DIR}/bootstrap/pyenv" "${HOME}/.pyenv"
287+
# Git
288+
symlink_item "${DOTFILES_DIR}/git/.gitconfig" "${HOME}/.gitconfig"
289+
symlink_item "${DOTFILES_DIR}/git/.gitignore" "${HOME}/.gitignore"
287290
}
288291

289292
##########################################################

git/.gitconfig

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[user]
2+
name = juftin
3+
email = juftin@juftin.com
4+
[init]
5+
defaultBranch = main
6+
[pull]
7+
rebase = false
8+
[push]
9+
autoSetupRemote = true
10+
[core]
11+
excludesfile = ~/.gitignore
12+
[alias]
13+
dunk = !git diff HEAD | dunk | less -R
14+
[filter "lfs"]
15+
smudge = git-lfs smudge -- %f
16+
process = git-lfs filter-process
17+
required = true
18+
clean = git-lfs clean -- %f
19+
[credential "https://github.com"]
20+
helper =
21+
helper = !gh auth git-credential
22+
[credential "https://gist.github.com"]
23+
helper =
24+
helper = !gh auth git-credential

git/.gitignore

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
#################################################################################
2+
# https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
3+
#################################################################################
4+
5+
# General
6+
.DS_Store
7+
.AppleDouble
8+
.LSOverride
9+
10+
# Icon must end with two \r
11+
Icon
12+
13+
# Thumbnails
14+
._*
15+
16+
# Files that might appear in the root of a volume
17+
.DocumentRevisions-V100
18+
.fseventsd
19+
.Spotlight-V100
20+
.TemporaryItems
21+
.Trashes
22+
.VolumeIcon.icns
23+
.com.apple.timemachine.donotpresent
24+
25+
# Directories potentially created on remote AFP share
26+
.AppleDB
27+
.AppleDesktop
28+
Network Trash Folder
29+
Temporary Items
30+
.apdisk
31+
32+
#################################################################################
33+
# https://github.com/github/gitignore/blob/main/Global/Linux.gitignore
34+
#################################################################################
35+
36+
*~
37+
38+
# temporary files which can be created if a process still has a handle open of a deleted file
39+
.fuse_hidden*
40+
41+
# KDE directory preferences
42+
.directory
43+
44+
# Linux trash folder which might appear on any partition or disk
45+
.Trash-*
46+
47+
# .nfs files are created when an open file is removed but is still being accessed
48+
.nfs*
49+
50+
#################################################################################
51+
# https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
52+
#################################################################################
53+
54+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
55+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
56+
57+
# Non-default ignores
58+
.idea/*.iml
59+
.idea/*.xml
60+
.idea/.gitignore
61+
62+
# User-specific stuff
63+
.idea/**/workspace.xml
64+
.idea/**/tasks.xml
65+
.idea/**/usage.statistics.xml
66+
.idea/**/dictionaries
67+
.idea/**/shelf
68+
69+
# AWS User-specific
70+
.idea/**/aws.xml
71+
72+
# Generated files
73+
.idea/**/contentModel.xml
74+
75+
# Sensitive or high-churn files
76+
.idea/**/dataSources/
77+
.idea/**/dataSources.ids
78+
.idea/**/dataSources.local.xml
79+
.idea/**/sqlDataSources.xml
80+
.idea/**/dynamic.xml
81+
.idea/**/uiDesigner.xml
82+
.idea/**/dbnavigator.xml
83+
84+
# Gradle
85+
.idea/**/gradle.xml
86+
.idea/**/libraries
87+
88+
# Gradle and Maven with auto-import
89+
# When using Gradle or Maven with auto-import, you should exclude module files,
90+
# since they will be recreated, and may cause churn. Uncomment if using
91+
# auto-import.
92+
# .idea/artifacts
93+
# .idea/compiler.xml
94+
# .idea/jarRepositories.xml
95+
# .idea/modules.xml
96+
# .idea/*.iml
97+
# .idea/modules
98+
# *.iml
99+
# *.ipr
100+
101+
# CMake
102+
cmake-build-*/
103+
104+
# Mongo Explorer plugin
105+
.idea/**/mongoSettings.xml
106+
107+
# File-based project format
108+
*.iws
109+
110+
# IntelliJ
111+
out/
112+
113+
# mpeltonen/sbt-idea plugin
114+
.idea_modules/
115+
116+
# JIRA plugin
117+
atlassian-ide-plugin.xml
118+
119+
# Cursive Clojure plugin
120+
.idea/replstate.xml
121+
122+
# SonarLint plugin
123+
.idea/sonarlint/
124+
125+
# Crashlytics plugin (for Android Studio and IntelliJ)
126+
com_crashlytics_export_strings.xml
127+
crashlytics.properties
128+
crashlytics-build.properties
129+
fabric.properties
130+
131+
# Editor-based Rest Client
132+
.idea/httpRequests
133+
134+
# Android studio 3.1+ serialized cache file
135+
.idea/caches/build_file_checksums.ser
136+
137+
#################################################################################
138+
# https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
139+
#################################################################################
140+
141+
.vscode/*
142+
!.vscode/settings.json
143+
!.vscode/tasks.json
144+
!.vscode/launch.json
145+
!.vscode/extensions.json
146+
!.vscode/*.code-snippets
147+
148+
# Local History for Visual Studio Code
149+
.history/
150+
151+
# Built Visual Studio Code Extensions
152+
*.vsix

git/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# git
2+
3+
This directory contains git configuration files.
4+
5+
`.gitconfig` is a global git configuration file. It contains aliases and
6+
settings that are not specific to a single repository.
7+
8+
`.gitingore` is a global git ignore file sourced from
9+
[github/gitignore](https://github.com/github/gitignore).
10+
`.gitignore` contains links to the more specific `.gitignore`
11+
files:
12+
13+
- `Linux.gitignore`
14+
- `macOS.gitignore`
15+
- `JetBrains.gitignore`

shell/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# shell
2+
3+
The `shell` directory contains shell configuration files for `bash` and `zsh`.

0 commit comments

Comments
 (0)