Răsfoiți Sursa

Remove screenrc, standardise vim modelines

We no longer use screen in any setting.

Modelines now use short names all the way (and there is very little need
to spell check config files).
Weiyi Lou 10 ani în urmă
părinte
comite
42f56c0a9a
4 a modificat fișierele cu 9 adăugiri și 193 ștergeri
  1. 0 184
      screen/screenrc
  2. 1 1
      setup.sh
  3. 7 7
      vim/plugins.vim
  4. 1 1
      vim/vimrc

+ 0 - 184
screen/screenrc

@@ -1,184 +0,0 @@
-# For a complete list of available commands, see http://bit.ly/jLtj
-
-# Set the default program for new windows.
-shell                 zsh
-
-# Set default lines of scrollback.
-defscrollback         5000            # default: 100
-
-# Detach session on hangup instead of terminating screen completely.
-autodetach            on              # default: on
-
-# Select line break behavior for copying.
-crlf                  off             # default: off
-
-# Select default utmp logging behavior.
-#deflogin              off             # default: on
-
-# If set to 'on', screen will append to the 'hardcopy.n' files created by the
-# command hardcopy; otherwise, these files are overwritten each time.
-hardcopy_append       on              # default: off
-
-# Set message displayed on pow_detach (when HUP is sent to screen's parent
-# process).
-pow_detach_msg        "BYE"
-
-# Default timeout to trigger an inactivity notify.
-silencewait           30              # default: 30
-
-# Change text highlighting. See http://bit.ly/11RDGZ
-sorendition           gK
-
-# Do NOT display copyright notice on startup.
-startup_message       off             # default: on
-
-# Set $TERM for new windows. I have more luck with 'linux' than Terminal's
-# default 'xterm-color' (^H problems). Comment out to use the default.
-term                  linux
-
-# Tweak termcap, terminfo, and termcapinfo  entries for best performance.
-termcap               linux           'AF=\E[3%dm:AB=\E[4%dm'
-termcap               xterm*          'AF=\E[3%dm:AB=\E[4%dm'
-terminfo              linux           'AF=\E[3%p1%dm:AB=\E[4%p1%dm'
-terminfo              xterm*          'AF=\E[3%p1%dm:AB=\E[4%p1%dm'
-
-# Allow xterm / Terminal scrollbars to access the scrollback buffer. This
-# enables the behavior you'd expect, instead of losing the content that scrolls
-# out of the window.
-termcapinfo           linux           ti@:te@
-termcapinfo           xterm*          ti@:te@
-
-# Use visual bell instead of audio bell.
-vbell                 off              # default: ???
-
-# Message to be displayed when the visual bell is triggered.
-#vbell_msg             " *beep* "
-
-# Get rid of screen 0
-# http://www.linuxquestions.org/questions/linux-software-2/gnu-screen-start-window-numbering-at-1-keep-window-number-0-from-ever-being-used-772580/
-bind c screen 1
-bind 0 select 10
-
-##################################
-# Captions
-#
-# Control the display of the window captions.
-# Without the `always` option, captions will only show when there are multiple
-# windows.
-#
-# String Escapes, especially some Hard-to-Discover escapes, are described below.
-# For an age-old tool, screen documentation is not great.
-#
-# Great thanks to:
-# http://blog.quixey.com/2011/07/29/make-your-life-easier-with-gnu-screen/
-# http://aperiodic.net/screen/man:string_escapes
-# http://superuser.com/questions/212392/how-to-include-screens-session-name-in-hardstatus
-# http://superuser.com/questions/209585/adding-conditional-formatting-to-the-status-line-in-gnu-screen
-#
-# %{= kw} - clear existing format, set color to black/white background/foreground
-# %= - pad line with spaces to fill display width. In this case, centering can be
-#      done by having `%=` on both the left and and right, as screen will
-#      automatically make both paddings the same length. 
-#      More spacing and padding can be seen here:
-#
-#      http://aperiodic.net/screen/truncation_padding_escapes
-#
-#      I did not bother reading it.
-#
-# %-w - show windows smaller in number than the current
-# %+w - show windows greater in number than the current
-#
-#       --- Note about the `L` flag ---
-#       This was hard to catch in the docs.
-#       Some screen escapes can be prefixed with 'L'.
-#       For `%-Lw`, window flags are added to the window names,
-#       For `%LD` and `%LM`, longer name are used
-#
-# %{+b} - add the bold attribute to the text
-# %n - window number
-# %t - window title
-# %f - window flags (for various states)
-# %?...%? - IF statement. Contents will only display if any ESCAPES produce at
-#           least one char So, if `%f` resolves to nothing (i.e. there are no
-#           other flags for this window), then nothing will be displayed.
-#
-#           There is also an else, using `%:`, but I don't know how to use that.
-#
-caption               always          "%{= kw} %=%-Lw%{g}[%n* %t%? %f%?]%{= kw}%+Lw%="
-
-
-##################################
-# Hardstatus Line
-#
-# Configure the use and emulation of the terminal's hardstatus line.
-# `lastline` will reserve the last line of the display for the hardstatus.
-# Prepending the word 'always' will force screen to use the type even if the
-# terminal supports a hardstatus line.
-#
-# Explanation of escapes
-#
-# %{k.} - change the background color. The `.` in place of the foreground
-#         leaves the colour unchanged.
-#         `%{.r}` would be redundant: single colours specified without other
-#         modifiers are assumed to be foreground colour changes.
-#
-#         Notice a space after this formatting - this is to force the following
-#         padding escape to take the formatting. Otherwise, formatting will only
-#         start from the next displayed character (the 'H' in 'Host:').
-#
-# %{+b r} - add bold, foreground red.
-# %{-} - special formatting escape saying, revert the last change to formatting
-#        (in the first case, the adding of bold and red foreground)
-# %{y} - yellow foreground
-# %{m} - magenta foreground
-# %{b} - blue foreground
-# %H - Hostname
-# %1` - run `backtick` command with id = 1 (refer to below)
-# %u - other users in this window (surrounded by brackets)
-# %c - 24hr time
-# %LD - Long Day name (refer to L note above)
-# %d - day number
-# %m - month number
-# %Y - full year number
-#
-hardstatus            alwayslastline  "%{k.}%{y}Session: %{-}%{+b r}%?[%1`]%:[NoName]%? %{-}on %H%=%?%{-}Users: (%u)%?%=%{b}%c, %LD, %d.%m.%Y"
-msgwait               15
-
-
-##################################
-# Backtick Commands
-#
-# Commands to call using the %` substitutions (e.g. in hardstatus line)
-# Potentially Very Powerful!
-# Note that any commands in backtick are expected to return only ONE line of
-# output (no idea what happens if there's more than that).
-#
-# Syntax:
-#     backtick id lifespan autorefresh command [args...]
-#
-# id - number to use in substitution e.g. %2` would call backtick with id = 2
-#      id = 0 is called simply with %`
-# lifespan - seconds to run command again
-# autorefresh - seconds to refresh caption and hardstatus text
-#
-# if both lifespan and autorefresh are 0, it is expected the command will
-# periodically produce a line of output. Once output is detected, hardstatus and
-# captions will refresh if necessary e.g. if command is a `tail -F`
-
-# get the sessionname that has been set by `C-a :sessionname` or by
-# `screen -S [name]`
-#
-backtick 1 30 30 sh -c 'screen -ls | grep --color=no -o "$PPID\.[^[:space:]]*" | sed s/$PPID\.// | sed s/ttys.*// | sed s/pts-.*//'
-
-
-##################################
-# Default Windows
-#
-# In theory, you could use `chdir` before a `screen -t` to automate the changing
-# of directories, but I have found this troublesome if you just want screen for
-# other purposes (like performing Ubuntu release upgrades).
-#
-# Is there a way of toggling default windows on/off based on how we start
-# screen?
-#
-screen -t "home" 1

+ 1 - 1
setup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# vim: set sw=2 ts=2 sts=2 et tw=78 foldmarker={{{,}}} foldlevel=0 foldmethod=marker spell:
+# vim: set sw=2 ts=2 sts=2 et tw=80 fmr={{{,}}} fdl=0 fdm=marker:
 set -euo pipefail
 IFS=$'\n\t'
 

+ 7 - 7
vim/plugins.vim

@@ -1,12 +1,12 @@
-" Plugins {{{
-" vim: set sw=2 ts=2 sts=2 et tw=78 foldmarker={{{,}}} foldlevel=1 foldmethod=marker spell:
+" vim: set sw=2 ts=2 sts=2 et tw=80 fmr={{{,}}} fdl=0 fdm=marker:
 "
-"   Vim Plugin Setup Script
+" The Plugin List
+"
+" This file is used from 2 places:
+"
+" - vimrc
+" - setup.sh
 "
-"   This file is used from 2 places:
-"    - vimrc
-"    - setup.sh
-" }}}
 
 call plug#begin('~/.vim/plugged')
 

+ 1 - 1
vim/vimrc

@@ -1,4 +1,4 @@
-" vim: set sw=2 ts=2 sts=2 et tw=80 foldmarker={{{,}}} foldlevel=0 fdm=marker:
+" vim: set sw=2 ts=2 sts=2 et tw=80 fmr={{{,}}} fdl=0 fdm=marker:
 "
 " The Main VIMRC
 "