From 30bdfe95a35d46c2de4c6f35b29039f4dd052043 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Mon, 15 Jan 2024 17:08:39 -0500 Subject: [PATCH] Removed world-clock plugin and customized my own one. Setup the left-status colors. --- nvim/.config/nvim/lazy-lock.json | 34 ++++++++++++---------- nvim/.config/nvim/lua/core/settings.lua | 2 +- nvim/.config/nvim/lua/plugins/init.lua | 27 ++++++++--------- tmux/.config/tmux/plugins/lan_ip.sh | 17 +++++++++++ tmux/.config/tmux/plugins/timezones.sh | 6 ++++ tmux/.config/tmux/plugins/tmux-world-clock | 1 + tmux/.config/tmux/plugins/wan_ip.sh | 27 +++++++++++++++++ tmux/.config/tmux/plugins/wan_ip.txt | 1 + tmux/.config/tmux/tmux.conf | 23 ++++++++++++--- 9 files changed, 104 insertions(+), 34 deletions(-) create mode 100755 tmux/.config/tmux/plugins/lan_ip.sh create mode 100755 tmux/.config/tmux/plugins/timezones.sh create mode 160000 tmux/.config/tmux/plugins/tmux-world-clock create mode 100755 tmux/.config/tmux/plugins/wan_ip.sh create mode 100644 tmux/.config/tmux/plugins/wan_ip.txt diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 6145800..7c0e5f3 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -16,23 +16,24 @@ "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, - "dracula.nvim": { "branch": "main", "commit": "ba219499d093f3fce74c6059a1f97e3f8f23df71" }, + "dracula.nvim": { "branch": "main", "commit": "392db4bba96849e70b28e1b411ce194979309e34" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, + "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, + "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" }, "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" }, "hover.nvim": { "branch": "main", "commit": "bbd59ddfae4e64459944acf2abcda4d81ba8bac6" }, "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" }, "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "62ca3b15d637936147b19d921c228a7b6ba5263e" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "558de4372d23bd432cc3594666c4d812cd071bbf" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" }, "mini.fuzzy": { "branch": "stable", "commit": "3f4dca52f791feb5a009fecf8d519f2e391271f4" }, "mini.move": { "branch": "main", "commit": "03a16d64e58da0a871de6493c3d8fa1101baef46" }, @@ -41,31 +42,32 @@ "mini.trailspace": { "branch": "main", "commit": "60d0eca6703b55285e33b0da00105cde50d188df" }, "mkdnflow.nvim": { "branch": "main", "commit": "7b2fc47d6a3ae3b19ebc5a7eea00ea1e712f20d1" }, "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, - "neovim": { "branch": "main", "commit": "92762f4fa2144c05db760ea254f4c399a56a7ef5" }, + "neovim": { "branch": "main", "commit": "67b03139fe43f1fcd03cb34620ec3d41eb407793" }, "night-owl.nvim": { "branch": "main", "commit": "5106bb2d420bb4c6867cd577f9413de039052275" }, - "nightfly": { "branch": "master", "commit": "90d85c8a094266122fb1fd173e7bcc0cd0efdd49" }, - "nightfox.nvim": { "branch": "main", "commit": "34542a433e5bd03c27b6cd4570849d9cde59acf7" }, - "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nightfly": { "branch": "master", "commit": "0c6e2e88bf15634af94a91fcc2e20e28a09dfecd" }, + "nightfox.nvim": { "branch": "main", "commit": "83bad1576d94251d460b2cc5635a15dd73cf6f65" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, "nvim": { "branch": "main", "commit": "5e36ca599f4aa41bdd87fbf2c5aae4397ac55074" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, + "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" }, "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" }, "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, - "nvim-http": { "branch": "main", "commit": "d220ede58aee3a9663e7446216a4a1a5554677d1" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-http": { "branch": "main", "commit": "11de61bcdf01f4728dd8d8bbcd48901d220c28cc" }, + "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" }, "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "0da349ed303bea955942f409d29059cdb89dbe2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, + "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, + "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "4a90ac83c7c8e0ba8a1b6af38bed6d5ee1b04e08" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "739a034046465d2b100151037401c24c42cb09cf" }, "sonokai": { "branch": "master", "commit": "bdce098fc9e7202d3c555e2dc98c755ca1c23835" }, + "styler.nvim": { "branch": "main", "commit": "d5b7e43af4fdaa06e4175c84f4f57b633ae7e6ff" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, "telescope-cmdline.nvim": { "branch": "main", "commit": "0943c44f19a9f9d157f3c07659a304368a9e09a2" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "4bd5657b14b58e069287f5ac591a647bb860b2ed" }, diff --git a/nvim/.config/nvim/lua/core/settings.lua b/nvim/.config/nvim/lua/core/settings.lua index 52d5fb2..32a99ac 100644 --- a/nvim/.config/nvim/lua/core/settings.lua +++ b/nvim/.config/nvim/lua/core/settings.lua @@ -59,7 +59,7 @@ opt.synmaxcol = 240 -- Max column for syntax highlight -- Colorscheme ----------------------------------------------------------- opt.termguicolors = true -- Enable 24-bit RGB colors -cmd[[colorscheme dracula]] +-- cmd[[colorscheme dracula]] ----------------------------------------------------------- -- Tabs, indent ----------------------------------------------------------- diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index f700bb5..baca092 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -159,20 +159,21 @@ return { end }, -- Styler - for per filetype colorschemes - -- { - -- "folke/styler.nvim", - -- config = function() - -- require("styler").setup({ - -- themes = { - -- markdown = { colorscheme = "kanagawa" }, - -- python = { colorscheme = "catppuccin", background="dark" }, - -- javascript = { colorscheme = "dracula", background="dark" }, - -- html = { colorscheme = "tokyonight" }, - -- } - -- }) - -- end, - -- }, + { + "folke/styler.nvim", + config = function() + require("styler").setup({ + themes = { + md = { colorscheme = "kanagawa" }, + python = { colorscheme = "catppuccin" }, + -- javascript = { colorscheme = "dracula" }, + -- html = { colorscheme = "tokyonight" }, + }, + }) + end, + }, "hrsh7th/nvim-cmp", -- optional, for completion + "ggandor/lightspeed.nvim", -- Top Right Notify Pop Up { diff --git a/tmux/.config/tmux/plugins/lan_ip.sh b/tmux/.config/tmux/plugins/lan_ip.sh new file mode 100755 index 0000000..994753c --- /dev/null +++ b/tmux/.config/tmux/plugins/lan_ip.sh @@ -0,0 +1,17 @@ +#!/bin/bash + + +function ip_address() { + + # Loop through the interfaces and check for the interface that is up. + for file in /sys/class/net/*; do + + iface=$(basename $file); + + read status < $file/operstate; + + [ "$status" == "up" ] && ip addr show $iface | awk '/inet /{printf $2" "}' + + done + +} diff --git a/tmux/.config/tmux/plugins/timezones.sh b/tmux/.config/tmux/plugins/timezones.sh new file mode 100755 index 0000000..e7428aa --- /dev/null +++ b/tmux/.config/tmux/plugins/timezones.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +PST=$(TZ=":America/Los_Angeles" date -R +%H:%M) +EST=$(TZ=":America/New_York" date -R +%H:%M) +CET=$(TZ=":Europe/Warsaw" date -R +%H:%M) +echo "PST: $PST | EST: $EST | CET: $CET" diff --git a/tmux/.config/tmux/plugins/tmux-world-clock b/tmux/.config/tmux/plugins/tmux-world-clock new file mode 160000 index 0000000..07266df --- /dev/null +++ b/tmux/.config/tmux/plugins/tmux-world-clock @@ -0,0 +1 @@ +Subproject commit 07266df2978f61880ab13c9b262cde02472db578 diff --git a/tmux/.config/tmux/plugins/wan_ip.sh b/tmux/.config/tmux/plugins/wan_ip.sh new file mode 100755 index 0000000..f04040f --- /dev/null +++ b/tmux/.config/tmux/plugins/wan_ip.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +function wan_ip() { + + tmp_file="./wan_ip.txt" + wan_up="N/a" + + if [ -z "$wan_ip" ]; then + wan_ip=$(curl --max-time 2 -s http://whatismyip.akamai.com/) + + if [ "$?" -eq "0" ]; then + echo "${wan_ip}" > $tmp_file + elif [ -f "${tmp_file}" ]; then + wan_ip=$(cat "$tmp_file") + fi + fi + + if [ -n "$wan_ip" ]; then + printf "ⓦ ${wan_ip}" + fi +} + +function main() { + wan_ip +} + +main diff --git a/tmux/.config/tmux/plugins/wan_ip.txt b/tmux/.config/tmux/plugins/wan_ip.txt new file mode 100644 index 0000000..1e28c11 --- /dev/null +++ b/tmux/.config/tmux/plugins/wan_ip.txt @@ -0,0 +1 @@ +104.246.2.167 diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index f725e61..88149fd 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -22,10 +22,26 @@ nonactive='#6272a4' left_sep='' right_sep='' +wanip="~/.dotfiles/tmux/.config/tmux/plugins/wan_ip.sh" +timezones="~/.dotfiles/tmux/.config/tmux/plugins/timezones.sh" + + +set -g status on +set -g status-interval 1 +set -g status-justify centre + set-window-option -g window-status-separator '' set-window-option -g window-status-current-format "#[fg=${active},bg=${dark_gray}]${right_sep}#[fg=${black},bg=${active}] #I #W #[fg=${active},bg=${dark_gray}]${left_sep}" set-window-option -g window-status-format "#[fg=${white},bg=${dark_gray}] #I #W " -# set-window-option -g window-status-format "#[fg=${nonactive},bg=${dark_gray}]${right_sep}#[fg=${white},bg=${nonactive}] #I #W#[fg=${nonactive},bg=${nonactive}]${left_sep}" +set-option -g status-bg ${dark_gray} +# set-option -g status-fg white +set -g status-left-length 50 +# set -g status-left-style default +set -g status-left "#[fg=${black},bg=${dark_purple}] #(${wanip}) #[fg=${dark_purple},bg=${dark_gray}]${left_sep}" + +set -g status-right-length 60 +set -g status-right "#[fg=${pink},bg=${dark_gray}]${right_sep}#[fg=${black},bg=${pink}]#(${timezones}) " +set -g status-right-style default # Standard Plugins @@ -39,6 +55,7 @@ set -g @plugin 'tmux-plugins/tmux-continuum' # Search your Scrollback using fzf # set -g @plugin 'roosta/tmux-fuzzback' + # Allow Focus Events set -g focus-events on @@ -59,7 +76,5 @@ bind % split-window -h -c "#{pane_current_path}" # Vim-Tmux-Navigator plugin/ set -g @plugin 'christoomey/vim-tmux-navigator' -set -g @plugin 'erikw/tmux-powerline' - -# Initiazlie TMUX plugin manager - kept at bottom of file +# Initialize TMUX plugin manager - kept at bottom of file run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm'