Add editorconfig

This commit also purges .gitignore, since the files mentioned in it
should be handled by global ignore file.

Fixes #4378.
This commit is contained in:
Kirill Chibisov 2020-11-06 05:12:29 +03:00 committed by GitHub
parent ec42b42ce6
commit 812c8bc14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 39 deletions

18
.editorconfig Normal file
View File

@ -0,0 +1,18 @@
root = true
[*]
charset = utf-8
end_of_line = lf
trim_trailing-whitespace = true
insert_final_newline = true
[*.{glsl,rs,toml}]
indent_style = space
indent_size = 4
[*.yml]
indent_style = space
indent_size = 2
[Makefile]
indent_style = tab

37
.gitignore vendored
View File

@ -1,36 +1 @@
# Rust build directory
**/target
# Rust subcrate lockfiles
*/Cargo.lock
# Temp files
.idea
.vscode
*.iml
*~
# vim temporary files
*.swp
# other ignores
*.DS_Store
=======
# Snapcraft files
stage
prime
parts
*.snap
*.pyc
alacritty_*_source.tar.bz2
# WiX files
/Wix.3.11.1
*.msi
*.wixobj
*.wixpdb
# Perf tools
perf.data*
flamegraph.svg
target

View File

@ -6,14 +6,14 @@ MANPAGE = $(ASSETS_DIR)/alacritty.man
TERMINFO = $(ASSETS_DIR)/alacritty.info
COMPLETIONS_DIR = $(ASSETS_DIR)/completions
COMPLETIONS = $(COMPLETIONS_DIR)/_alacritty \
$(COMPLETIONS_DIR)/alacritty.bash \
$(COMPLETIONS_DIR)/alacritty.fish
$(COMPLETIONS_DIR)/alacritty.bash \
$(COMPLETIONS_DIR)/alacritty.fish
APP_NAME = Alacritty.app
APP_TEMPLATE = $(ASSETS_DIR)/osx/$(APP_NAME)
APP_DIR = $(RELEASE_DIR)/osx
APP_BINARY = $(RELEASE_DIR)/$(TARGET)
APP_BINARY_DIR = $(APP_DIR)/$(APP_NAME)/Contents/MacOS
APP_BINARY_DIR = $(APP_DIR)/$(APP_NAME)/Contents/MacOS
APP_EXTRAS_DIR = $(APP_DIR)/$(APP_NAME)/Contents/Resources
APP_COMPLETIONS_DIR = $(APP_EXTRAS_DIR)/completions