From 38088a34e3cdbac23169c9613ce71f190e710f08 Mon Sep 17 00:00:00 2001 From: Ota Mares Date: Mon, 10 Dec 2018 10:22:59 +0100 Subject: [PATCH] Remove oni, small fixup --- .dotfiles/tag-smu/config/oni/config.js | 30 ----------------------- .dotfiles/tag-smu/modules/editor/brewfile | 1 - .dotfiles/tag-smu/zsh/smu.zsh | 3 +++ README.md | 6 ++--- 4 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 .dotfiles/tag-smu/config/oni/config.js diff --git a/.dotfiles/tag-smu/config/oni/config.js b/.dotfiles/tag-smu/config/oni/config.js deleted file mode 100644 index 631e3d901..000000000 --- a/.dotfiles/tag-smu/config/oni/config.js +++ /dev/null @@ -1,30 +0,0 @@ -"use strict"; -exports.__esModule = true; -exports.activate = function (oni) { - console.log("config activated"); - // Input - // - // Add input bindings here: - // - oni.input.bind("", function () { return console.log("Control+Enter was pressed"); }); - // - // Or remove the default bindings here by uncommenting the below line: - // - // oni.input.unbind("") -}; -exports.deactivate = function (oni) { - console.log("config deactivated"); -}; -exports.configuration = { - //add custom config here, such as - "ui.colorscheme": "nord", - //"oni.useDefaultConfig": true, - //"oni.bookmarks": ["~/Documents"], - "oni.loadInitVim": true, - "editor.fontSize": "12px", - "ui.fontSize": "12px", - // UI customizations - "ui.animations.enabled": true, - "ui.fontSmoothing": "auto", - "statusbar.enabled": true -}; diff --git a/.dotfiles/tag-smu/modules/editor/brewfile b/.dotfiles/tag-smu/modules/editor/brewfile index fd0a75f5a..9f64f8858 100644 --- a/.dotfiles/tag-smu/modules/editor/brewfile +++ b/.dotfiles/tag-smu/modules/editor/brewfile @@ -9,7 +9,6 @@ brew "neovim" cask "intellij-idea" cask "sublime-text" cask "macdown" -cask "oni" # diff cask "p4v" diff --git a/.dotfiles/tag-smu/zsh/smu.zsh b/.dotfiles/tag-smu/zsh/smu.zsh index fe3b36264..9dacbc0e8 100644 --- a/.dotfiles/tag-smu/zsh/smu.zsh +++ b/.dotfiles/tag-smu/zsh/smu.zsh @@ -6,6 +6,9 @@ export LANG=de_DE.UTF-8 export SMU_ZSH_DIR=${ZDOTDIR:-${HOME}}/.zsh export ZSH_CACHE_DIR=${SMU_ZSH_DIR}/cache +# english please +alias git='LANG=en_GB git' + # use nvim alias vi="nvim" diff --git a/README.md b/README.md index f06b4e0ba..7650479b2 100644 --- a/README.md +++ b/README.md @@ -93,13 +93,13 @@ You can use `smu --lsrc` command to show which files will be symlinked to your h #### [editor](.dotfiles/tag-smu/modules/editor) -The editor module comes with [neovim](https://neovim.io/) and [vim](https://www.vim.org/), although neovim is considered to be used over vim. Should you enjoy using vi outside your terminal you can use [oni](https://www.onivim.io/). [SpaceVim](https://spacevim.org/) provides a good configuration base and is referenced in all three vi editors. +The editor module comes with [neovim](https://neovim.io/) and [vim](https://www.vim.org/), although neovim is considered to be used over vim. [SpaceVim](https://spacevim.org/) provides a good configuration base and is referenced in all three vi editors. For tasks you don't want to solve in vi you can use [Intellij IDEA ultimate](https://www.jetbrains.com/idea/) or [Sublime3](https://www.sublimetext.com/). The Sublime configuration comes with a few [useful plugins](.dotfiles/tag-smu/modules/editor/editor.sh#L8-L19) that are managed via [Package Control](https://packagecontrol.io/). [Macdown](https://macdown.uranusjr.com/) for Markdown editing, [p4merge](https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge) for merging/diffing and [diff-so-fancy](https://github.com/so-fancy/diff-so-fancy) as default git difftool are also part of the editor module. -Apart from theme and font all editors come preconfigured, except Intellij. ([SpaceVim](.dotfiles/tag-smu/SpaceVim.d), [Oni](.dotfiles/tag-smu/config/oni), [Sublime](.dotfiles/tag-smu/modules/editor/sublime)). To synchronize your Intellij configuration i recommend using the official [Settings Sync plugin](https://www.jetbrains.com/help/idea/sharing-your-ide-settings.html#IDE_settings_sync) +Apart from theme and font all editors come preconfigured, except Intellij. ([SpaceVim](.dotfiles/tag-smu/SpaceVim.d), [Sublime](.dotfiles/tag-smu/modules/editor/sublime)). To synchronize your Intellij configuration i recommend using the official [Settings Sync plugin](https://www.jetbrains.com/help/idea/sharing-your-ide-settings.html#IDE_settings_sync) Why no atom or Visual Studio Code? The above editors fulfil my daily needs and neither atom or Visual Studio Code were able to handle **large** files in multiple attempts. Not having an incentive to switch i continue using Sublime. @@ -175,8 +175,6 @@ The [base16 material-darker theme](http://chriskempson.com/projects/base16/) and In case you are using the [SMU terminal module](#terminal), [Spaceship ZSH prompt](https://github.com/denysdovhan/spaceship-prompt) will be enabled with a [custom configuration](.dotfiles/tag-smu/modules/theme/spaceship.plugin.zsh) that tries to not be in your way. -Oni is not included as its configuration is blended within a JavaScript file. - A few screenshots: 1. Terminal