Răsfoiți Sursa

Compact powerline, vim file-specific settings

Powerline date does not really need a seperate segment by itself, vim
file-specific settings don't really need individual files for each type.

On the theme of compacting, the setup script's `linkup()` function is
compacted to 1 line, so that linking will not be done if backup fails.
Weiyi Lou 10 ani în urmă
părinte
comite
9b08739f8c

+ 1 - 5
powerline/config/themes/tmux/cinaeco.json

@@ -9,14 +9,10 @@
       }
     ],
     "right": [
-      {
-        "function": "powerline.segments.common.time.date"
-      },
       {
         "function": "powerline.segments.common.time.date",
-        "name": "time",
         "args": {
-          "format": "%H:%M",
+          "format": "%H:%M %d/%m/%y",
           "istime": true
         }
       }

+ 1 - 2
setup.sh

@@ -20,8 +20,7 @@ backup() {
 
 # Create links after backing up.
 linkup() {
-  backup "$2"
-  ln -sf "$1" "$2"
+  backup "$2" && ln -sf "$1" "$2"
 }
 
 # Run vim-plug's install process.

+ 0 - 6
vim/settings/coffee-script.vim

@@ -1,6 +0,0 @@
-" Coffee Compile and Watch should open vertical splits by default
-let coffee_compile_vert = 1
-let coffee_watch_vert = 1
-
-" Load coffee script plugin for literate coffeescript files as well
-autocmd FileType litcoffee runtime ftplugin/coffee.vim

+ 0 - 0
vim/settings/nerdcommenter.vim → vim/settings/commenting.vim


+ 14 - 0
vim/settings/filetype-specifics.vim

@@ -0,0 +1,14 @@
+" Formatting for json files
+au FileType json setlocal equalprg=python\ -m\ json.tool
+
+" yaml highlighting
+au BufNewFile,BufRead *.yaml,*.yml so ~/.vim/plugged/yaml.vim/colors/yaml.vim
+
+" `.conf` and `.ini` files should not force text to the next line.
+au BufEnter *.conf *.ini setlocal textwidth=0
+
+" Load coffee script plugin for literate coffeescript files as well
+autocmd FileType litcoffee runtime ftplugin/coffee.vim
+" Compile and Watch should open vertical splits by default
+let coffee_compile_vert = 1
+let coffee_watch_vert = 1

+ 0 - 2
vim/settings/json.vim

@@ -1,2 +0,0 @@
-" Formatting for JSON files
-au FileType json setlocal equalprg=python\ -m\ json.tool

+ 0 - 2
vim/settings/yaml.vim

@@ -1,2 +0,0 @@
-" yaml highlighting
-au BufNewFile,BufRead *.yaml,*.yml so ~/.vim/plugged/yaml.vim/colors/yaml.vim