diff options
| author | Kirill Chibisov <contact@kchibisov.com> | 2020-11-06 05:12:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 05:12:29 +0300 |
| commit | 812c8bc14a4214e9d0970e7a333be72e745137b2 (patch) | |
| tree | 45ad40df49ac4c616280c889f2f8dbaae3e3e1ad | |
| parent | ec42b42ce601808070462111c0c28edb0e89babb (diff) | |
Add editorconfig
This commit also purges .gitignore, since the files mentioned in it
should be handled by global ignore file.
Fixes #4378.
| -rw-r--r-- | .editorconfig | 18 | ||||
| -rw-r--r-- | .gitignore | 37 | ||||
| -rw-r--r-- | Makefile | 6 |
3 files changed, 22 insertions, 39 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..303e9296 --- /dev/null +++ b/.editorconfig @@ -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 @@ -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 @@ -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 |