From 042b35ea0fcf6eac2c12b729c64eea89b60888cf Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Tue, 25 May 2021 15:28:06 +0200 Subject: [PATCH] Tidy up tmux --- files/.tmux.conf | 54 ++++++- files/.tmux/.tmux | 1 - files/.tmux/gruvbox-light | 54 ------- files/.tmux/nord-tmux/.editorconfig | 25 ---- files/.tmux/nord-tmux/CHANGELOG.md | 140 ------------------ files/.tmux/nord-tmux/LICENSE.md | 22 --- files/.tmux/nord-tmux/README.md | 91 ------------ files/.tmux/nord-tmux/nord.tmux | 50 ------- .../nord-status-content-no-patched-font.conf | 24 --- .../nord-tmux/src/nord-status-content.conf | 27 ---- files/.tmux/nord-tmux/src/nord.conf | 53 ------- files/linkdots.sh | 2 +- 12 files changed, 54 insertions(+), 489 deletions(-) delete mode 120000 files/.tmux/.tmux delete mode 100644 files/.tmux/gruvbox-light delete mode 100644 files/.tmux/nord-tmux/.editorconfig delete mode 100644 files/.tmux/nord-tmux/CHANGELOG.md delete mode 100644 files/.tmux/nord-tmux/LICENSE.md delete mode 100644 files/.tmux/nord-tmux/README.md delete mode 100755 files/.tmux/nord-tmux/nord.tmux delete mode 100644 files/.tmux/nord-tmux/src/nord-status-content-no-patched-font.conf delete mode 100644 files/.tmux/nord-tmux/src/nord-status-content.conf delete mode 100644 files/.tmux/nord-tmux/src/nord.conf diff --git a/files/.tmux.conf b/files/.tmux.conf index 766c640..1f1fa3a 100644 --- a/files/.tmux.conf +++ b/files/.tmux.conf @@ -22,4 +22,56 @@ setw -g pane-base-index 1 # reload bind bind-key r source-file ~/.tmux.conf -source-file ~/.tmux/gruvbox-light +# colors +BG1="#ebdbb2" +BG2="#7c6f64" +BG3="#d5c4a1" +FG1="#f2e5bc" + +set-option -g status "on" + +# default statusbar colors +set-option -g status-style fg=$FG1,bg=$BG1 #fg1 + +# default window title colors +set-window-option -g window-status-style fg=$BG3,bg=$BG1 #bg1 +set-window-option -g window-status-activity-style fg=colour248,bg=$BG2 #fg3 + +# active window title colors +set-window-option -g window-status-current-style fg=$BG1,bg=$BG2 #bg1 + +# pane border +set-option -g pane-active-border-style fg=$BG3 +set-option -g pane-border-style fg=$BG3 + +# message infos +set-option -g message-style fg=$BG2,bg=$BG1 #fg1 + +# commands +set-option -g message-command-style fg=$FG1,bg=$BG1 #bg1 + +# pane number display +set-option -g display-panes-active-colour colour250 #fg2 +set-option -g display-panes-colour colour237 #bg1 + +# clock +set-window-option -g clock-mode-colour colour24 #blue + +# bell +set-window-option -g window-status-bell-style fg=colour229,bg=colour88 #bg, red + +set-option -g status-style "none" +set-option -g status-justify "left" +set-option -g status-left-style "none" +set-option -g status-left-length "80" +set-option -g status-right-style "none" +set-option -g status-right-length "80" +set-window-option -g window-status-activity-style "none" +set-window-option -g window-status-style "none" +set-window-option -g window-status-separator "" + +set-option -g status-left "#[fg=$FG1, bg=$BG2] #S #[fg=$BG2, bg=$BG1, nobold, noitalics, nounderscore]" +set-option -g status-right "#[fg=$BG3, bg=$BG1, nobold, nounderscore, noitalics]#[fg=$BG2,bg=$BG3] %Y-%m-%d  %H:%M #[fg=$BG2, bg=$BG3, nobold, noitalics, nounderscore]#[fg=$FG1, bg=$BG2] #h " + +set-window-option -g window-status-current-format "#[fg=$BG3, bg=$BG1, :nobold, noitalics, nounderscore]#[fg=$BG1, bg=$BG2] #I #[fg=$BG1, bg=$BG2, bold] #W #[fg=$BG2, bg=$BG1, nobold, noitalics, nounderscore]" +set-window-option -g window-status-format "#[fg=$BG1,bg=$BG3,noitalics]#[fg=$BG2,bg=$BG3] #I #[fg=$BG2, bg=$BG3] #W #[fg=$BG3, bg=$BG1, noitalics]" diff --git a/files/.tmux/.tmux b/files/.tmux/.tmux deleted file mode 120000 index 6c4209e..0000000 --- a/files/.tmux/.tmux +++ /dev/null @@ -1 +0,0 @@ -/home/marc/dots/files/.tmux \ No newline at end of file diff --git a/files/.tmux/gruvbox-light b/files/.tmux/gruvbox-light deleted file mode 100644 index d2d932d..0000000 --- a/files/.tmux/gruvbox-light +++ /dev/null @@ -1,54 +0,0 @@ -# COLORSCHEME: gruvbox light - -BG1="#ebdbb2" -BG2="#7c6f64" -BG3="#d5c4a1" -FG1="#f2e5bc" - -set-option -g status "on" - -# default statusbar colors -set-option -g status-style fg=$FG1,bg=$BG1 #fg1 - -# default window title colors -set-window-option -g window-status-style fg=$BG3,bg=$BG1 #bg1 -set-window-option -g window-status-activity-style fg=colour248,bg=$BG2 #fg3 - -# active window title colors -set-window-option -g window-status-current-style fg=$BG1,bg=$BG2 #bg1 - -# pane border -set-option -g pane-active-border-style fg=$BG3 -set-option -g pane-border-style fg=$BG3 - -# message infos -set-option -g message-style fg=$BG2,bg=$BG1 #fg1 - -# commands -set-option -g message-command-style fg=$FG1,bg=$BG1 #bg1 - -# pane number display -set-option -g display-panes-active-colour colour250 #fg2 -set-option -g display-panes-colour colour237 #bg1 - -# clock -set-window-option -g clock-mode-colour colour24 #blue - -# bell -set-window-option -g window-status-bell-style fg=colour229,bg=colour88 #bg, red - -set-option -g status-style "none" -set-option -g status-justify "left" -set-option -g status-left-style "none" -set-option -g status-left-length "80" -set-option -g status-right-style "none" -set-option -g status-right-length "80" -set-window-option -g window-status-activity-style "none" -set-window-option -g window-status-style "none" -set-window-option -g window-status-separator "" - -set-option -g status-left "#[fg=$FG1, bg=$BG2] #S #[fg=$BG2, bg=$BG1, nobold, noitalics, nounderscore]" -set-option -g status-right "#[fg=$BG3, bg=$BG1, nobold, nounderscore, noitalics]#[fg=$BG2,bg=$BG3] %Y-%m-%d  %H:%M #[fg=$BG2, bg=$BG3, nobold, noitalics, nounderscore]#[fg=$FG1, bg=$BG2] #h " - -set-window-option -g window-status-current-format "#[fg=$BG3, bg=$BG1, :nobold, noitalics, nounderscore]#[fg=$BG1, bg=$BG2] #I #[fg=$BG1, bg=$BG2, bold] #W #[fg=$BG2, bg=$BG1, nobold, noitalics, nounderscore]" -set-window-option -g window-status-format "#[fg=$BG1,bg=$BG3,noitalics]#[fg=$BG2,bg=$BG3] #I #[fg=$BG2, bg=$BG3] #W #[fg=$BG3, bg=$BG1, noitalics]" diff --git a/files/.tmux/nord-tmux/.editorconfig b/files/.tmux/nord-tmux/.editorconfig deleted file mode 100644 index 8bf51e5..0000000 --- a/files/.tmux/nord-tmux/.editorconfig +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2017-present Arctic Ice Studio -# Copyright (C) 2017-present Sven Greb - -# Project: Nord tmux -# Repository: https://github.com/arcticicestudio/nord-tmux -# License: MIT - -# ++++++++++++++++++++++ -# + Base Configuration + -# ++++++++++++++++++++++ -[*] -charset = utf-8 -end_of_line = lf -indent_size = 2 -indent_style = space -insert_final_newline = true -max_line_length = 120 -trim_trailing_whitespace = true - -# +++++++++++++ -# + Languages + -# +++++++++++++ -# +++ Markdown +++ -[*.{md,gfm}] -trim_trailing_whitespace = false diff --git a/files/.tmux/nord-tmux/CHANGELOG.md b/files/.tmux/nord-tmux/CHANGELOG.md deleted file mode 100644 index a661742..0000000 --- a/files/.tmux/nord-tmux/CHANGELOG.md +++ /dev/null @@ -1,140 +0,0 @@ -

- -

- -

Changelog for Nord tmux — An arctic, north-bluish clean and elegant tmux color theme.

- - - -# 0.3.0 - -![Release Date: 2019-06-03](https://img.shields.io/badge/Release_Date-2019--06--03-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.03.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/5) [![Milestone](https://img.shields.io/badge/Milestone-0.03.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/4) - -## Features - -**Nord Docs Transition** — #36 ⇄ #37 (⊶ 6101cf85) -↠ Transferred all documentations, assets and from „Nord tmux“ to [Nord Docs][nord] -Please see the [corresponding issue in the Nord Docs repository][nord-docs#153] to get an overview of what has changed for Nord tmux and what has been done to migrate to Nord Docs. - -###### Landing Page - -

Preview: Nord tmux Port Project Landing Page

- -###### Landing Page Docs - -

Preview: Nord tmux Docs Landing Page

- -###### Installation & Activation Docs - -

Preview: Nord tmux Installation & Activation Docs Page

- -###### Configuration Docs - -

Preview: Nord tmux Configuration Docs Page

- -###### Plugin Support Docs - -

Preview: Nord tmux Plugin Support Docs Page

- -**Patched Font Characters** — #5 ⇄ #11 (⊶ 0809657f) by [@petrhosek][gh-user-petrhosek] -↠ Added a new theme configuration to [disable patched fonts for the default status content][nord-docs-config-font-no-patched] by setting the `@nord_tmux_no_patched_font` variable to `1`. -It can be used facing rendering problems with incompatible terminals or fonts. - -```sh -set -g @nord_tmux_no_patched_font "1" -``` - -

- -**Optional Status Bar Content** — #7, #10 ⇄ #8, #12 (⊶ 27754979) by [@tsroten][gh-user-tsroten] and [@rgcr][gh-user-rgcr] -↠ Added a new theme configuration to [disable the default predefined status bar content][nord-docs-config-default-content], allowing to customize the status content, e.g. adding other plugins or adjust the layout, by setting the `@nord_tmux_show_status_content` variable to `0`: - -```sh -set -g @nord_tmux_show_status_content "0" -``` - -

- -## Improvements - -**Respect User's Status Bar Positioning** — #13 ⇄ #14 (⊶ ee5542c5) by [@drzel][gh-user-drzel] -↠ Removed the `status-position` property in order to respect the user's preferred status bar positioning configuration instead of overriding it. - -**More Spacing** — #16 (⊶ 2da9466c) by [@dylnmc][gh-user-dylnmc] -↠ Added a space character to the first and last status bar element in order to improve the visual appearance to make it look not so squeezed together. - -

Before

- -

- -

After

- -

- -## Bug Fixes - -### Documentation - -**Typo In `source-file` Command** — #32 (⊶ 72b0b3fb) by [@rememberYou][gh-user-rememberyou] -↠ Fixed a typo in the README for the `source-file` command. - -## Tasks - -### Documentation - -**More Spacing** — #16 (⊶ 2da9466c) by [@dylnmc][gh-user-dylnmc] -↠ Added a space character to the first and last status bar element in order to improve the visual appearance to make it look not so squeezed together. - -**MIT License** — #19 ⇄ #20 (⊶ 4d39639a) -↠ Adapted to the MIT license migration of the Nord project. Detailed information can be found in the main task ticket [arcticicestudio/nord#55][]. - -# 0.2.0 - -_2017-04-22_ - -## Features - -### Plugin Support - -❯ Implemented support for the [tmux-prefix-highlight](https://github.com/tmux-plugins/tmux-prefix-highlight) _prefix_- and `copy-mode` status indicator. (@kepbod, #3, 166c8956) - -


- -# 0.1.1 - -_2017-04-21_ - -## Bug Fixes - -❯ Fixed the plugin to be not loadable due to the missing `#!/usr/bin/env bash` hashbang and `+x` permission flag for the plugin loader [`nord.tmux`](https://github.com/arcticicestudio/nord-tmux/blob/develop/nord.tmux) which caused `tpm` to exit with code `126`. (@arcticicestudio, #4, c049da5e) - -# 0.1.0 - -_2017-04-20_ - -## Features - -Detailed information about features and install instructions can be found in the [README](https://github.com/arcticicestudio/nord-tmux/blob/develop/README.md#installation) and in the [project wiki](https://github.com/arcticicestudio/nord-tmux/wiki). - -❯ Implemented the main color theme file [`nord.conf`](https://github.com/arcticicestudio/nord-tmux/blob/develop/src/nord.conf). (@arcticicestudio, #1, e759aedc) - -

- -❯ Implemented the [`tpm`](https://github.com/tmux-plugins/tpm) plugin loader [`nord.tmux`](https://github.com/arcticicestudio/nord-tmux/blob/develop/nord.tmux). (@arcticicestudio, #2, e58b52e9) - -# 0.0.0 - -_2016-04-20_ -❯ **Project Initialization** - -[arcticicestudio/nord#55]: https://github.com/arcticicestudio/nord/issues/55 -[gh-user-drzel]: https://github.com/drzel -[gh-user-dylnmc]: https://github.com/dylnmc -[gh-user-petrhosek]: https://github.com/petrhosek -[gh-user-rememberyou]: https://github.com/rememberYou -[gh-user-rgcr]: https://github.com/rgcr -[gh-user-tsroten]: https://github.com/tsroten -[nord-docs-config-default-content]: https://www.nordtheme.com/docs/ports/tmux/configuration#default-status-bar-content -[nord-docs-config-font-no-patched]: https://www.nordtheme.com/docs/ports/tmux/configuration#patched-font-characters -[nord-docs#153]: https://github.com/arcticicestudio/nord-docs/pull/153 -[nord]: https://www.nordtheme.com diff --git a/files/.tmux/nord-tmux/LICENSE.md b/files/.tmux/nord-tmux/LICENSE.md deleted file mode 100644 index b1d01ab..0000000 --- a/files/.tmux/nord-tmux/LICENSE.md +++ /dev/null @@ -1,22 +0,0 @@ -MIT License (MIT) - -Copyright (C) 2017-present Arctic Ice Studio (https://www.arcticicestudio.com) -Copyright (C) 2017-present Sven Greb (https://www.svengreb.de) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/files/.tmux/nord-tmux/README.md b/files/.tmux/nord-tmux/README.md deleted file mode 100644 index aa57070..0000000 --- a/files/.tmux/nord-tmux/README.md +++ /dev/null @@ -1,91 +0,0 @@ -

- -

- -

- -

An arctic, north-bluish clean and elegant tmux color theme.

- -

Designed for a fluent and clear workflow based on the Nord color palette.

- -

- -## Getting Started - -Visit the [official website][nord-home] to learn all about the [fluidly merging appearance][nord-home#intro] features, details and elements of [UI elements][nord-home#ui-elements], the [various theme configurations][nord-home#configurations] and the [support for plugins][nord-home#plugin-support]. - -Learn about the [installation and activation][nord-docs-home-install], how to [configure][nord-docs-home-config] the theme and [supported plugins][nord-docs-home-plugins] from the [official documentations][nord-docs-home]. - -### Quick Start - -Thanks to existing plugin managers for tmux, Nord tmux can be installed for all platforms in a uniform way within a few lines of codes. The recommended manager is [tpm][gh-tmux-plugins/tpm], but any other manager like [tundle][gh-javier-lopez/tundle] can also be used. - -To automatically download and activate Nord tmux, follow the install instructions for [tpm][gh-tmux-plugins/tpm] and - -1. add `set -g @plugin "arcticicestudio/nord-tmux"` to your [`tmux.conf`][tmux-man-tmux.conf], by default `.tmux.conf` located in your [home directory][wiki-home_dir] -2. press the default key binding `prefix` + I to fetch- and install the plugin - -

- -See the Nord tmux's documentation for [more installation options][nord-docs-home-install] and how to [set it up manually][nord-docs-home-install#manual]. -Also see [_tpm's_ install instructions][gh-tpm-docs-install-plugins] for more details. - -## Features - -

Your terminal. Your style.

The unified UI element design provides a clutter-free and fluidly merging appearance.

- -

- -

- -

Uniform design with beautiful UI elements.

The themed UI elements provide a fluid and unobtrusive transition from the terminal to the tmux status bar.

- -

- -

Take your favorite plugins with you.

The theme supports popular plugins for a fluid and unobtrusive user interface transition.

- -

- -## Contributing - -Nord is an open source project and we love to receive contributions from the [community][nord-comm]! - -There are many ways to contribute, from [writing- and improving documentation and tutorials][nord-contrib-guide-docs], [reporting bugs][nord-contrib-guide-bugs], [submitting enhancement suggestions][nord-contrib-guide-enhance] that can be added to Nord by [submitting pull requests][nord-contrib-guide-pr]. - -Please take a moment to read Nord's full [contributing guide][nord-contrib-guide] to learn about the development process, the project's used [styleguides][nord-contrib-guide-styles], [branch organization][nord-contrib-guide-branching] and [versioning][nord-contrib-guide-versioning] model. - -The guide also includes information about [minimal, complete, and verifiable examples][nord-contrib-guide-mcve] and other ways to contribute to the project like [improving existing issues][nord-contrib-guide-impr-issues] and [giving feedback on issues and pull requests][nord-contrib-guide-feedback]. - -

- -

Copyright © 2017-present Arctic Ice Studio and Sven Greb

- -

- -[gh-javier-lopez/tundle]: https://github.com/javier-lopez/tundle -[gh-tmux-plugins/tpm]: https://github.com/tmux-plugins/tpm -[gh-tpm-docs-install-plugins]: https://github.com/tmux-plugins/tpm#installing-plugins -[nord-comm]: https://www.nordtheme.com/community -[nord-contrib-guide-branching]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#branch-organization -[nord-contrib-guide-bugs]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#bug-reports -[nord-contrib-guide-docs]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#documentations -[nord-contrib-guide-enhance]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#enhancement-suggestions -[nord-contrib-guide-feedback]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#give-feedback-on-issues-and-pull-requests -[nord-contrib-guide-impr-issues]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#improve-issues -[nord-contrib-guide-mcve]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#mcve -[nord-contrib-guide-pr]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#pull-requests -[nord-contrib-guide-styles]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#styleguides -[nord-contrib-guide-versioning]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#versioning -[nord-contrib-guide]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md -[nord-docs-home-config]: https://www.nordtheme.com/docs/ports/tmux/configuration -[nord-docs-home-install]: https://www.nordtheme.com/docs/ports/tmux/installation -[nord-docs-home-install#manual]: https://www.nordtheme.com/docs/ports/tmux/installation#manual -[nord-docs-home-plugins]: https://www.nordtheme.com/docs/ports/tmux/plugin-support -[nord-docs-home]: https://www.nordtheme.com/docs/ports/tmux -[nord-home]: https://www.nordtheme.com/ports/tmux -[nord-home#configurations]: https://www.nordtheme.com/ports/tmux#configurations -[nord-home#intro]: https://www.nordtheme.com/ports/tmux#intro -[nord-home#plugin-support]: https://www.nordtheme.com/ports/tmux#plugin-support -[nord-home#ui-elements]: https://www.nordtheme.com/ports/tmux#ui-elements -[tmux-man-tmux.conf]: http://man.openbsd.org/OpenBSD-current/man1/tmux.1#FILES -[wiki-home_dir]: https://en.wikipedia.org/wiki/Home_directory diff --git a/files/.tmux/nord-tmux/nord.tmux b/files/.tmux/nord-tmux/nord.tmux deleted file mode 100755 index 380b841..0000000 --- a/files/.tmux/nord-tmux/nord.tmux +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2017-present Arctic Ice Studio -# Copyright (C) 2017-present Sven Greb - -# Project: Nord tmux -# Repository: https://github.com/arcticicestudio/nord-tmux -# License: MIT -# References: -# https://tmux.github.io - -NORD_TMUX_COLOR_THEME_FILE=src/nord.conf -NORD_TMUX_VERSION=0.3.0 -NORD_TMUX_STATUS_CONTENT_FILE="src/nord-status-content.conf" -NORD_TMUX_STATUS_CONTENT_NO_PATCHED_FONT_FILE="src/nord-status-content-no-patched-font.conf" -NORD_TMUX_STATUS_CONTENT_OPTION="@nord_tmux_show_status_content" -NORD_TMUX_NO_PATCHED_FONT_OPTION="@nord_tmux_no_patched_font" -_current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -__cleanup() { - unset -v NORD_TMUX_COLOR_THEME_FILE NORD_TMUX_VERSION - unset -v NORD_TMUX_STATUS_CONTENT_FILE NORD_TMUX_STATUS_CONTENT_NO_PATCHED_FONT_FILE - unset -v NORD_TMUX_STATUS_CONTENT_OPTION NORD_TMUX_NO_PATCHED_FONT_OPTION - unset -v _current_dir - unset -f __load __cleanup - tmux set-environment -gu NORD_TMUX_STATUS_TIME_FORMAT -} - -__load() { - tmux source-file "$_current_dir/$NORD_TMUX_COLOR_THEME_FILE" - - local status_content=$(tmux show-option -gqv "$NORD_TMUX_STATUS_CONTENT_OPTION") - local no_patched_font=$(tmux show-option -gqv "$NORD_TMUX_NO_PATCHED_FONT_OPTION") - - if [ "$(tmux show-option -gqv "clock-mode-style")" == '12' ]; then - tmux set-environment -g NORD_TMUX_STATUS_TIME_FORMAT "%I:%M %p" - else - tmux set-environment -g NORD_TMUX_STATUS_TIME_FORMAT "%H:%M" - fi - - if [ "$status_content" != "0" ]; then - if [ "$no_patched_font" != "1" ]; then - tmux source-file "$_current_dir/$NORD_TMUX_STATUS_CONTENT_FILE" - else - tmux source-file "$_current_dir/$NORD_TMUX_STATUS_CONTENT_NO_PATCHED_FONT_FILE" - fi - fi -} - -__load -__cleanup diff --git a/files/.tmux/nord-tmux/src/nord-status-content-no-patched-font.conf b/files/.tmux/nord-tmux/src/nord-status-content-no-patched-font.conf deleted file mode 100644 index bf34b47..0000000 --- a/files/.tmux/nord-tmux/src/nord-status-content-no-patched-font.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2017-present Arctic Ice Studio -# Copyright (C) 2017-present Sven Greb - -# Project: Nord tmux -# Repository: https://github.com/arcticicestudio/nord-tmux -# License: MIT - -#+----------------+ -#+ Plugin Support + -#+----------------+ -#+--- tmux-prefix-highlight ---+ -set -g @prefix_highlight_copy_mode_attr "fg=black,bg=brightcyan" - -#+--------+ -#+ Status + -#+--------+ -#+--- Bars ---+ -set -g status-left "#[fg=black,bg=blue,bold] #S " -set -g status-right "#{prefix_highlight}#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]|#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_TIME_FORMAT} #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore] #[fg=black,bg=cyan,bold] #H " - -#+--- Windows ---+ -set -g window-status-format " #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack]#W #F" -set -g window-status-current-format " #[fg=black,bg=cyan]#I#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F" -set -g window-status-separator "" diff --git a/files/.tmux/nord-tmux/src/nord-status-content.conf b/files/.tmux/nord-tmux/src/nord-status-content.conf deleted file mode 100644 index 8a11405..0000000 --- a/files/.tmux/nord-tmux/src/nord-status-content.conf +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2017-present Arctic Ice Studio -# Copyright (C) 2017-present Sven Greb - -# Project: Nord tmux -# Repository: https://github.com/arcticicestudio/nord-tmux -# License: MIT - -#+----------------+ -#+ Plugin Support + -#+----------------+ -#+--- tmux-prefix-highlight ---+ -set -g @prefix_highlight_output_prefix "#[fg=brightcyan]#[bg=black]#[nobold]#[noitalics]#[nounderscore]#[bg=brightcyan]#[fg=black]" -set -g @prefix_highlight_output_suffix "" -set -g @prefix_highlight_copy_mode_attr "fg=brightcyan,bg=black,bold" - -#+--------+ -#+ Status + -#+--------+ -#+--- Bars ---+ -#set -g status-left "#[fg=black,bg=blue,bold] #S#[fg=blue,bg=black,nobold,noitalics,nounderscore]" -set -g status-left "#[fg=black,bg=blue,bold] #S #[fg=blue,bg=black,nobold,noitalics,nounderscore]" -set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_TIME_FORMAT} #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H " - -#+--- Windows ---+ -set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]" -set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]" -set -g window-status-separator "" diff --git a/files/.tmux/nord-tmux/src/nord.conf b/files/.tmux/nord-tmux/src/nord.conf deleted file mode 100644 index f9aa12c..0000000 --- a/files/.tmux/nord-tmux/src/nord.conf +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2017-present Arctic Ice Studio -# Copyright (C) 2017-present Sven Greb - -# Project: Nord tmux -# Repository: https://github.com/arcticicestudio/nord-tmux -# License: MIT - -#+----------------+ -#+ Plugin Support + -#+----------------+ -#+--- tmux-prefix-highlight ---+ -set -g @prefix_highlight_fg black -set -g @prefix_highlight_bg brightcyan - -#+---------+ -#+ Options + -#+---------+ -set -g status-interval 1 -set -g status on - -#+--------+ -#+ Status + -#+--------+ -#+--- Layout ---+ -set -g status-justify left - -#+--- Colors ---+ -set -g status-bg black -set -g status-fg white -set -g status-attr none - -#+-------+ -#+ Panes + -#+-------+ -set -g pane-border-bg black -set -g pane-border-fg black -set -g pane-active-border-bg black -set -g pane-active-border-fg brightblack -set -g display-panes-colour black -set -g display-panes-active-colour brightblack - -#+------------+ -#+ Clock Mode + -#+------------+ -setw -g clock-mode-colour cyan - -#+----------+ -#+ Messages + -#+---------+ -set -g message-fg cyan -set -g message-bg brightblack -set -g message-command-fg cyan -set -g message-command-bg brightblack diff --git a/files/linkdots.sh b/files/linkdots.sh index 6ab8e26..a348662 100755 --- a/files/linkdots.sh +++ b/files/linkdots.sh @@ -4,7 +4,7 @@ path=$(pwd) # --- home --- # -home_files="scripts .bashrc .zshrc .gitconfig .tmux .tmux.conf .vimrc .Xresources .xinitrc" +home_files="scripts .bashrc .zshrc .gitconfig .tmux.conf .vimrc .Xresources .xinitrc" for file in $home_files do