From 5b4abd236ad7c02c8eb84434a269619c1dd71f4d Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Fri, 5 Jan 2024 17:11:46 -0500 Subject: [PATCH] Backing up before the weekend. Tried out styler, but too many errors. Commented out --- nvim/.config/nvim/init.lua | 2 +- nvim/.config/nvim/lazy-lock.json | 7 +++---- nvim/.config/nvim/lua/plugins/init.lua | 16 +++++++++++++++- tmux/.config/tmux/tmux.conf | 1 + zsh/.zshrc | 12 ++++++------ 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 5eede58..b5e3ec1 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -168,4 +168,4 @@ end --]] require('core/keymaps') -vim.cmd[[colorscheme kanagawa]] +-- vim.cmd[[colorscheme kanagawa]] diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 0f2882a..6145800 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, - "dracula.nvim": { "branch": "main", "commit": "cadf9a1d873d67a92a76b258715cad91f0c1dbb9" }, + "dracula.nvim": { "branch": "main", "commit": "ba219499d093f3fce74c6059a1f97e3f8f23df71" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, @@ -44,7 +44,7 @@ "neovim": { "branch": "main", "commit": "92762f4fa2144c05db760ea254f4c399a56a7ef5" }, "night-owl.nvim": { "branch": "main", "commit": "5106bb2d420bb4c6867cd577f9413de039052275" }, "nightfly": { "branch": "master", "commit": "90d85c8a094266122fb1fd173e7bcc0cd0efdd49" }, - "nightfox.nvim": { "branch": "main", "commit": "1467688e23aa58c2efe98033c3b3d51711e0e75b" }, + "nightfox.nvim": { "branch": "main", "commit": "34542a433e5bd03c27b6cd4570849d9cde59acf7" }, "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, @@ -53,7 +53,7 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" }, - "nvim-dap-ui": { "branch": "master", "commit": "947660daced01c3eb673e3dc9527c988e42fe4cc" }, + "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-http": { "branch": "main", "commit": "d220ede58aee3a9663e7446216a4a1a5554677d1" }, "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, @@ -66,7 +66,6 @@ "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "4a90ac83c7c8e0ba8a1b6af38bed6d5ee1b04e08" }, "sonokai": { "branch": "master", "commit": "bdce098fc9e7202d3c555e2dc98c755ca1c23835" }, - "starry.nvim": { "branch": "master", "commit": "c61379d4dc81572026975db7821aa3bed76f98d5" }, "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/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index e590029..f700bb5 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -158,6 +158,20 @@ 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, + -- }, "hrsh7th/nvim-cmp", -- optional, for completion -- Top Right Notify Pop Up @@ -374,7 +388,7 @@ return { end, }, 'Mofiqul/dracula.nvim', - 'ray-x/starry.nvim', + -- 'ray-x/starry.nvim', 'rose-pine/neovim', 'EdenEast/nightfox.nvim', 'rebelot/kanagawa.nvim', diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index fe1d151..f725e61 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -1,5 +1,6 @@ set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin" set-window-option -g mode-keys vi +set-option default-terminal "screen-256color" set-option default-terminal "tmux-256color" set-option -a terminal-overrides ",*256col*:RGB" diff --git a/zsh/.zshrc b/zsh/.zshrc index f12275e..b9c37c5 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -13,15 +13,15 @@ export LANG=en_US.UTF-8 export DOT="~/.dotfiles" alias vim='vim -S ~/.vimrc' alias nvim='nvim' -# alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew' + alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew' export EDITOR="$VISUAL" export VISUAL='nvim' -# export PYTHONPATH="/opt/homebrew/bin/python3:$PYTHONPATH" -# export PYENV_ROOT="$HOME/.pyenv" -# command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" -# eval "$(pyenv init -)" -# eval "$(pyenv virtualenv-init -)" +export PYTHONPATH="/opt/homebrew/bin/python3:$PYTHONPATH" +export PYENV_ROOT="$HOME/.pyenv" +command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" # Function to Correctly Source $VIRTUAL_ENV for Neovim function nvimvenv {