diff options
| -rw-r--r-- | %HOME%/.bash_utils/cxx.sh | 8 | ||||
| -rw-r--r-- | %HOME%/.bash_utils/os.sh | 21 | ||||
| -rw-r--r-- | %HOME%/.bashrc | 13 | ||||
| -rw-r--r-- | %HOME%/.config/tmux/cygwin.conf | 7 | ||||
| -rw-r--r-- | %HOME%/.gitconfig | 4 | ||||
| -rw-r--r-- | %HOME%/.tmux.conf | 1 |
6 files changed, 4 insertions, 50 deletions
diff --git a/%HOME%/.bash_utils/cxx.sh b/%HOME%/.bash_utils/cxx.sh index 368ff2d..81e75fa 100644 --- a/%HOME%/.bash_utils/cxx.sh +++ b/%HOME%/.bash_utils/cxx.sh @@ -5,14 +5,6 @@ # For details, see https://github.com/egor-tensin/linux-home. # Distributed under the MIT License. -_runc_os_is_cygwin() { - test "$OSTYPE" = cygwin -} - -if _runc_os_is_cygwin; then - _runc_exe_ext='.exe' -fi - runc_use_gcc() { runc_compiler=gcc runcxx_compiler=g++ diff --git a/%HOME%/.bash_utils/os.sh b/%HOME%/.bash_utils/os.sh index 6655ab1..ece43f6 100644 --- a/%HOME%/.bash_utils/os.sh +++ b/%HOME%/.bash_utils/os.sh @@ -7,7 +7,6 @@ _os='' -_CYGWIN='Cygwin' _MACOS='macOS' _UBUNTU='Ubuntu' _DEBIAN='Debian GNU/Linux' @@ -18,10 +17,6 @@ _FEDORA='Fedora' os_detect() { case "$OSTYPE" in - cygwin) - _os="$_CYGWIN" - return 0 - ;; darwin*) _os="$_MACOS" return 0 @@ -49,7 +44,6 @@ os_detect os_detected() { test -n "$_os" ; } -os_is_cygwin() { test "$_os" == "$_CYGWIN" ; } os_is_macos() { test "$_os" == "$_MACOS" ; } os_is_ubuntu() { test "$_os" == "$_UBUNTU" ; } @@ -61,17 +55,6 @@ os_is_fedora() { test "$_os" == "$_FEDORA" ; } os_is_ubuntu_like() { os_is_ubuntu || os_is_debian || os_is_mint ; } os_is_linux() { os_is_ubuntu_like || os_is_arch || os_is_fedora ; } -# Cygwin - -pkg_list_cygwin() ( - set -o errexit -o nounset -o pipefail - shopt -s inherit_errexit 2> /dev/null || true - - cygcheck --check-setup --dump-only \ - | tail -n +3 \ - | cut -d ' ' -f 1 -) - # Ubuntu-likes setup_pkg_list_ubuntu() ( @@ -161,9 +144,7 @@ pkg_list() ( set -o errexit -o nounset -o pipefail shopt -s inherit_errexit 2> /dev/null || true - if os_is_cygwin; then - pkg_list_cygwin - elif os_is_ubuntu_like; then + if os_is_ubuntu_like; then pkg_list_ubuntu elif os_is_arch; then pkg_list_arch diff --git a/%HOME%/.bashrc b/%HOME%/.bashrc index e077091..8b5d7c2 100644 --- a/%HOME%/.bashrc +++ b/%HOME%/.bashrc @@ -54,8 +54,7 @@ shopt -s histappend shopt -s nullglob shopt -s nocaseglob -os_is_cygwin && set -o igncr -os_is_cygwin || complete -r +complete -r # I'm sick and tired of third-party scripts breaking b/c of a random shell # option I use (configure scripts in particular), so I'm commenting this out. @@ -64,8 +63,7 @@ os_is_cygwin || complete -r # I've bumped into this on Linux Mint: Ctrl+S causes my terminal to freeze # completely (Ctrl+Q is a temporary escape, stty is the cure). -os_is_cygwin \ - || command -v stty > /dev/null 2>&1 \ +command -v stty > /dev/null 2>&1 \ && stty -ixon # ----------------------------------------------------------------------------- @@ -99,8 +97,6 @@ alias sed='sed --follow-symlinks' # command | copy if os_is_linux; then alias copy='xclip -sel clip' -elif os_is_cygwin; then - alias copy='cat > /dev/clipboard' elif os_is_macos; then alias copy='pbcopy' fi @@ -183,10 +179,7 @@ fi # tmux: start automatically. # https://unix.stackexchange.com/a/113768 -if os_is_cygwin && local_terminal; then - # Skip, as it's too slow for some reason. - true -elif multiplexed; then +if multiplexed; then # Skip, we're already running a multiplexer. true elif command -v tmux &> /dev/null; then diff --git a/%HOME%/.config/tmux/cygwin.conf b/%HOME%/.config/tmux/cygwin.conf deleted file mode 100644 index 3c9f14a..0000000 --- a/%HOME%/.config/tmux/cygwin.conf +++ /dev/null @@ -1,7 +0,0 @@ -bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'cat > /dev/clipboard' -bind-key -T copy-mode-vi Y send-keys -X copy-pipe-and-cancel 'tmux paste-buffer' -bind-key -T copy-mode-vi M-y send-keys -X copy-pipe-and-cancel 'cat > /dev/clipboard; tmux paste-buffer' -bind-key -T copy-mode-vi '!' send-keys -X copy-pipe-and-cancel "tr -d '\n' > /dev/clipboard" -bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'cat > /dev/clipboard' -bind-key -T root MouseDown2Pane run 'cat /dev/clipboard | tmux load-buffer - && tmux paste-buffer' -bind-key ] run 'cat /dev/clipboard | tmux load-buffer - && tmux paste-buffer' diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig index 9942521..39888c8 100644 --- a/%HOME%/.gitconfig +++ b/%HOME%/.gitconfig @@ -71,10 +71,6 @@ ll = log --graph --full-history --all --pretty=format:"%h%x09%d%x20%s" lll = log --graph --full-history --all --color --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m" - # I think this is only usable on Cygwin, given all the file permission - # madness there: - xx = update-index --add --chmod=+x - hide = update-index --skip-worktree unhide = update-index --no-skip-worktree hidden = !git ls-files -v | grep --basic-regexp \"^\\([[:lower:]]\\|S\\)\" diff --git a/%HOME%/.tmux.conf b/%HOME%/.tmux.conf index d6a3973..208768c 100644 --- a/%HOME%/.tmux.conf +++ b/%HOME%/.tmux.conf @@ -116,7 +116,6 @@ bind-key -T copy-mode-vi v send -X begin-selection # M-y is y and Y combined. # ! to copy excluding line endings (most useful for one-line selections). -if-shell 'uname | grep -q -F CYGWIN' 'source-file ~/.config/tmux/cygwin.conf' if-shell 'uname | grep -q -F Linux && command -v xsel' \ 'source-file ~/.config/tmux/linux.conf' if-shell 'uname | grep -q -F Darwin' 'source-file ~/.config/tmux/macos.conf' |