From 905d4d7020132c6467f4ae02aa5c5596807fc39f Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Tue, 11 Oct 2016 09:09:56 -0400 Subject: [PATCH] Make monokai the default colorscheme Monokai is a better default colorscheme because it has a better 16 color approximation than zenburn. On 16 color terminals, it looks like zenburn is not syntax highlighting anything. --- cmd/micro/runtime.go | 2 +- cmd/micro/settings.go | 2 +- runtime/colorschemes/default.micro | 41 +++++++++++++++--------------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/cmd/micro/runtime.go b/cmd/micro/runtime.go index ef173a8d..d29fea05 100644 --- a/cmd/micro/runtime.go +++ b/cmd/micro/runtime.go @@ -240,7 +240,7 @@ func runtimeColorschemesBubblegumMicro() (*asset, error) { return a, nil } -var _runtimeColorschemesDefaultMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x74\x91\xd1\x6e\xc3\x20\x0c\x45\xdf\xfb\x15\x88\xe7\x64\x1a\xa4\x0d\xf9\x1d\x1a\xdc\x0e\x8d\x98\xc8\x31\x9a\xf6\xf7\x93\xd3\x69\x5a\x0b\x79\x8b\x74\xae\xed\xc3\xcd\x9c\x53\xa6\x3e\x45\xfc\x54\x01\x6e\xbe\x24\x56\xda\x4c\x53\x67\x07\xa7\x4f\xff\xe0\x9c\x97\x05\x50\xe0\x7b\x0b\xe2\xc6\x1e\xf9\x6d\x63\x8a\x78\x57\xda\xb8\xf3\x71\x08\xcb\x72\x05\x52\xda\x98\xf1\x30\x24\x12\xa6\xa2\x31\x00\x72\xbc\x45\x99\xb6\x76\xa8\xf8\xc6\x9e\xe1\xa1\xd9\xc2\x2b\xc1\x4a\x79\x6e\x43\xfe\x5e\x41\xae\xba\x7a\xeb\x0a\x73\xf4\xa9\xad\x54\x30\x00\xa5\x88\x10\xda\xbd\x01\x51\xde\xdf\x7a\xe9\xec\x30\x3e\x5f\xcc\x21\x2b\x7d\xcd\x29\x28\x7b\xa9\xfb\x92\xc7\x94\x4d\x56\xcb\xe6\xb1\x1a\x8f\x28\x6d\xf4\xf3\x87\x97\x36\x86\xfa\xb4\x8c\xf6\x7f\x65\xef\x6e\xd3\x53\xe0\x5e\x98\x81\xfa\x5f\x45\x3b\xb8\xce\xb8\x73\x2b\xf1\xe5\x09\x8f\xff\x6b\xa1\xed\xf1\x0d\xbb\xc7\x2b\x24\xb1\x6c\xb8\x38\x7d\xfa\x09\x00\x00\xff\xff\x9c\x89\x71\xe8\x7d\x02\x00\x00") +var _runtimeColorschemesDefaultMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x84\x92\x41\x6e\xc3\x20\x10\x45\xf7\x3d\xc5\x08\xb6\x71\xd5\x38\x09\x76\x96\x49\x6d\x9f\xa0\x17\x20\x78\x12\xa3\x60\xb0\x06\x50\xd5\xdb\x57\xb8\xae\x94\x48\xd4\xf5\x6c\x46\xf2\xe3\xf3\x67\x3e\x1c\x3e\x06\xed\x41\x7b\x08\x03\xc2\xe8\xac\xbb\x4b\x0d\xca\x19\x47\x5e\x0d\x38\xe2\xcb\xdc\x17\x46\xdb\x3b\xf4\x78\x95\xd1\x04\x60\xbc\xab\xbb\xba\x2b\x37\xbc\xac\x53\xb1\x47\x48\xb9\x71\x44\x9b\xa0\xea\x50\x6d\x0f\x6d\x16\xd2\x3d\xda\xa0\xaf\x1a\x09\x18\x17\xa2\x39\xb6\xdd\x1f\x62\xd6\x07\x39\xab\x9d\xda\x7a\xdb\xad\x53\xaf\x3e\x90\xb6\x37\x60\xbc\x15\xcd\xb9\xda\x67\x61\x1f\x64\xc0\xc5\x61\x77\x2c\x45\x95\x1f\x63\x22\x9c\xc8\x29\x60\xfc\xfd\xbc\x3f\x6f\x45\x16\x0a\x5f\x13\xae\x0f\xe0\x27\x54\x5a\x9a\xe4\x5f\xb4\x65\x99\xdf\x46\xb4\x3d\x92\xd1\x16\x7b\x60\xbc\xd9\xed\x44\x9d\xf7\x84\x44\x8e\x80\x5d\x9c\xe9\x61\xd5\x96\xeb\xdd\x2f\xb6\x22\x97\x36\x11\x7d\xba\x17\xd8\xf2\x7f\xb3\x24\xfb\x1c\x96\x4d\x69\x15\x6a\x90\x29\xad\xc3\x5b\xaa\xac\x60\x92\x2a\x6c\x1c\x2f\x73\xac\xa7\xf9\xdb\xf0\x5d\x99\xea\x39\xb0\x48\x94\x24\xf3\x07\x32\xca\xb7\x18\x02\x52\xb1\x2c\x60\x6d\xf6\x85\xfc\x94\x64\xff\x7d\x0a\x2a\x92\xff\xe9\xd3\x06\x72\x3e\xe7\x56\x39\x13\x47\xfb\x40\x7c\x07\x00\x00\xff\xff\xff\x82\x0d\x5a\x35\x03\x00\x00") func runtimeColorschemesDefaultMicroBytes() ([]byte, error) { return bindataRead( diff --git a/cmd/micro/settings.go b/cmd/micro/settings.go index f25138bd..23ede68e 100644 --- a/cmd/micro/settings.go +++ b/cmd/micro/settings.go @@ -178,7 +178,7 @@ func DefaultGlobalSettings() map[string]interface{} { "autoindent": true, "autosave": false, "colorcolumn": float64(0), - "colorscheme": "zenburn", + "colorscheme": "default", "cursorline": true, "ignorecase": false, "indentchar": " ", diff --git a/runtime/colorschemes/default.micro b/runtime/colorschemes/default.micro index 8f282bc2..49f67e1e 100644 --- a/runtime/colorschemes/default.micro +++ b/runtime/colorschemes/default.micro @@ -1,20 +1,21 @@ -color-link default "188,237" -color-link comment "108,237" -color-link constant.string "174,237" -color-link constant.number "116,237" -color-link constant "181,237" -color-link identifier "223,237" -color-link statement "223,237" -color-link preproc "223,237" -color-link type "187,237" -color-link special "181,237" -color-link underlined "188,237" -color-link error "115,236" -color-link todo "bold 254,237" -color-link statusline "186,236" -color-link indent-char "238,237" -color-link line-number "188,238" -color-link gutter-error "237,174" -color-link gutter-warning "174,237" -color-link cursor-line "238" -color-link current-line-number "188,237" +# This is the monokai colorscheme +color-link default "#F8F8F2,#282828" +color-link comment "#75715E,#282828" +color-link identifier "#66D9EF,#282828" +color-link constant "#AE81FF,#282828" +color-link constant.string "#E6DB74,#282828" +color-link statement "#F92672,#282828" +color-link preproc "#CB4B16,#282828" +color-link type "#66D9EF,#282828" +color-link special "#A6E22E,#282828" +color-link underlined "#D33682,#282828" +color-link error "bold #CB4B16,#282828" +color-link todo "bold #D33682,#282828" +color-link statusline "#282828,#F8F8F2" +color-link indent-char "#505050,#282828" +color-link line-number "#AAAAAA,#323232" +color-link current-line-number "#AAAAAA,#282828" +color-link gutter-error "#CB4B16,#282828" +color-link gutter-warning "#E6DB74,#282828" +color-link cursor-line "#323232" +color-link color-column "#323232"