From 70b18b36ca81a5d8b467752d7fe4494696784dac Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 26 Aug 2023 20:21:53 +0200 Subject: [PATCH] Added tmux theme --- .config/nushell/alias.nu | 46 ++++++++--- .config/nvim/lazy-lock.json | 24 +++--- .config/tmux/theme.conf | 156 ++++++++++++++++++++++++++++++++++++ .config/tmux/tmux.conf | 7 +- 4 files changed, 210 insertions(+), 23 deletions(-) create mode 100644 .config/tmux/theme.conf diff --git a/.config/nushell/alias.nu b/.config/nushell/alias.nu index 2a2c756..430b6de 100644 --- a/.config/nushell/alias.nu +++ b/.config/nushell/alias.nu @@ -1,19 +1,45 @@ -# System -alias cls = clear -alias hex = hexdump -C -alias ll = ls -la -alias p = cd ~/projects - -# Go -alias gb = go build -alias gt = go test - # Git +alias g = git +alias gc = git clone alias gd = git diff alias gl = git log --oneline alias gp = git pull alias gs = git status alias home = git $"--git-dir=($env.HOME)/.home/" $"--work-tree=($env.HOME)" +# Go +alias gob = go build -v +alias got = go test -v + # Neovim alias e = nvim +alias n = nvim + +# Pacman +alias p = pacman +alias pi = sudo pacman -S +alias pr = sudo pacman -Rs +alias pu = sudo pacman -Syu + +# Tmux +alias t = tmux +alias ta = tmux attach +alias td = tmux detach +alias tl = tmux ls +alias tk = tmux kill-server + +# Systemctl +alias s = systemctl +alias s+ = systemctl start +alias s- = systemctl stop +alias sl = systemctl list-units --type=service --state=running +alias sld = systemctl list-unit-files --type=service --state=disabled +alias sle = systemctl list-unit-files --type=service --state=enabled +alias slt = systemctl list-timers +alias ss = systemctl status + +# ... +alias cdp = cd ~/projects +alias cls = clear +alias hex = hexdump -C +alias ll = ls -la diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index faefec5..0a6e8f8 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -5,22 +5,22 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" }, - "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" }, - "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, - "neodev.nvim": { "branch": "main", "commit": "f8a4200951189f7c831cfb698a2e05791e9fd83c" }, - "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" }, + "gitsigns.nvim": { "branch": "main", "commit": "79127db3b127f5d125f35e0d44ba60715edf2842" }, + "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, + "neodev.nvim": { "branch": "main", "commit": "0d210aa340ec9840ac963938bf1b5d06cfdf67dc" }, + "noice.nvim": { "branch": "main", "commit": "791c7adda821fd03529f995df2ee284ad591dabd" }, "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, - "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, - "nvim-lspconfig": { "branch": "master", "commit": "1cfb96490c3889a2c57d1ef5e1acc59e9b47c455" }, + "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, + "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-spectre": { "branch": "master", "commit": "eb17a856a6f17e03d8d610cbc00cd9f2f39e3fd7" }, - "nvim-tree.lua": { "branch": "master", "commit": "920868dba13466586897a8f40220eca6b2caac41" }, - "nvim-treesitter": { "branch": "master", "commit": "05fe2c38a3bd4f889ac13f1735685ab348d95346" }, + "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, + "nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" }, + "nvim-treesitter": { "branch": "master", "commit": "cb74c1c5aefd8b903f1b547d08d4df42be07aa2a" }, "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, "nvterm": { "branch": "main", "commit": "5ae78fb332e92447121d2af58a6313189a7799fb" }, - "onedark.nvim": { "branch": "master", "commit": "09b71d84bd2524438e48c0aa5b54d855cc72af32" }, - "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "onedark.nvim": { "branch": "master", "commit": "7bd3558c17045b95c961d28861c1b3bd9bdc992a" }, + "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, - "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, + "telescope.nvim": { "branch": "master", "commit": "207285ccec21b69996a4d3bcfa59df35d48610e8" }, "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" } } \ No newline at end of file diff --git a/.config/tmux/theme.conf b/.config/tmux/theme.conf new file mode 100644 index 0000000..aebae75 --- /dev/null +++ b/.config/tmux/theme.conf @@ -0,0 +1,156 @@ +# +# Powerline Gray - Tmux Themepack +# https://github.com/jimeh/tmux-themepack +# +# Inspired by vim-powerline: https://github.com/powerline/powerline +# +# Requires terminal to be using a powerline compatible font, find one here: +# https://github.com/powerline/fonts +# + +# Themepack format options +set -goq @themepack-status-left-area-left-format "#S" +set -goq @themepack-status-left-area-middle-format "#(whoami)" +set -goq @themepack-status-left-area-right-format "#I:#P" +set -goq @themepack-status-right-area-left-format "%H:%M:%S" +set -goq @themepack-status-right-area-middle-format "%Y-%m-%d" +set -goq @themepack-status-right-area-right-format "#H" +set -goq @themepack-window-status-current-format "#I:#W#F" +set -goq @themepack-window-status-format "#I:#W#F" + +# Customizable prefixes and suffixes for @themepack-* format options +set -goq @themepack-status-left-area-left-prefix "" +set -goq @themepack-status-left-area-left-suffix "" +set -goq @themepack-status-left-area-middle-prefix "" +set -goq @themepack-status-left-area-middle-suffix "" +set -goq @themepack-status-left-area-right-prefix "" +set -goq @themepack-status-left-area-right-suffix "" +set -goq @themepack-status-right-area-left-prefix "" +set -goq @themepack-status-right-area-left-suffix "" +set -goq @themepack-status-right-area-middle-prefix "" +set -goq @themepack-status-right-area-middle-suffix "" +set -goq @themepack-status-right-area-right-prefix "" +set -goq @themepack-status-right-area-right-suffix "" +set -goq @themepack-window-status-current-prefix "" +set -goq @themepack-window-status-current-suffix "" +set -goq @themepack-window-status-prefix "" +set -goq @themepack-window-status-suffix "" + +# Apply prefixes and suffixes to @themepack-* format options +set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}" +set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}" +set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}" +set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}" +set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}" +set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}" +set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}" +set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}" + +# Powerline color options +set -goq @powerline-color-main-1 colour245 +set -goq @powerline-color-main-2 colour250 +set -goq @powerline-color-main-3 colour245 +set -goq @powerline-color-black-1 black +set -goq @powerline-color-grey-1 colour233 +set -goq @powerline-color-grey-2 colour235 +set -goq @powerline-color-grey-3 colour238 +set -goq @powerline-color-grey-4 colour240 +set -goq @powerline-color-grey-5 colour243 +set -goq @powerline-color-grey-6 colour245 + +# Powerline options +set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}" +set -goqF @powerline-status-bg "#{@powerline-color-grey-1}" +set -goqF @powerline-status-fg "#{@powerline-color-grey-4}" +set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}" +set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}" +set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}" +set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}" +set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}" +set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}" +set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}" +set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}" +set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}" +set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}" +set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}" +set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}" +set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}" +set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}" +set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}" +set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}" + +# Theme options +set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}" +set -goq @theme-clock-mode-style 24 +set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}" +set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}" +set -goqF @theme-message-bg "#{@powerline-color-main-1}" +set -goqF @theme-message-command-bg "#{@powerline-color-main-1}" +set -goqF @theme-message-command-fg "#{@powerline-color-black-1}" +set -goqF @theme-message-fg "#{@powerline-color-black-1}" +set -goqF @theme-mode-bg "#{@powerline-color-main-1}" +set -goqF @theme-mode-fg "#{@powerline-color-black-1}" +set -goq @theme-pane-active-border-bg default +set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}" +set -goq @theme-pane-border-bg default +set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}" +set -goqF @theme-status-bg "#{@powerline-status-bg}" +set -goqF @theme-status-fg "#{@powerline-status-fg}" +set -goq @theme-status-interval 1 +set -goq @theme-status-justify centre +set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]" +set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}" +set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}" +set -goq @theme-status-left-length 40 +set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} " +set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}" +set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}" +set -goq @theme-status-right-length 150 +set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}" +set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}" +set -goq @theme-window-status-separator "" +set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}" +set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}" +set -goqF @theme-window-status-format " #{@themepack-window-status-format} " +set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]" + +# Customizable prefixes and suffixes for @theme-* format options +set -goq @theme-status-left-prefix "" +set -goq @theme-status-left-suffix "" +set -goq @theme-status-right-prefix "" +set -goq @theme-status-right-suffix "" +set -goq @theme-window-status-current-prefix "" +set -goq @theme-window-status-current-suffix "" +set -goq @theme-window-status-prefix "" +set -goq @theme-window-status-suffix "" + +# Apply prefixes and suffixes to @theme-* format options +set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left}#{@theme-status-left-suffix}" +set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right}#{@theme-status-right-suffix}" +set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format}#{@theme-window-status-current-suffix}" +set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format}#{@theme-window-status-suffix}" + +# Apply @theme-* options to Tmux +set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}" +set -gF display-panes-colour "#{@theme-display-panes-colour}" +set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}" +set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}" +set -gF status-interval "#{@theme-status-interval}" +set -gF status-justify "#{@theme-status-justify}" +set -gF status-left "#{@theme-status-left}" +set -gF status-left-length "#{@theme-status-left-length}" +set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}" +set -gF status-right "#{@theme-status-right}" +set -gF status-right-length "#{@theme-status-right-length}" +set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}" +set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}" +set -gwF clock-mode-colour "#{@theme-clock-mode-colour}" +set -gwF clock-mode-style "#{@theme-clock-mode-style}" +set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}" +set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}" +set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}" +set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}" +set -gwF window-status-current-format "#{@theme-window-status-current-format}" +set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}" +set -gwF window-status-format "#{@theme-window-status-format}" +set -gwF window-status-separator "#{@theme-window-status-separator}" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 552fba3..10fc2ef 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,5 +1,7 @@ # global options -set -sg terminal-overrides ",*:RGB" +set -g terminal-overrides ",*:RGB" +set -g escape-time 0 +set -g focus-events on set -g mouse on set -g prefix C-a @@ -21,3 +23,6 @@ bind -n M-Left select-pane -L bind -n M-Right select-pane -R bind -n M-Up select-pane -U bind -n M-Down select-pane -D + +# theme +source-file ~/.config/tmux/theme.conf