Updated a few configs.

This commit is contained in:
Norm Rasmussen
2023-04-25 18:19:42 -04:00
parent eb70be50e6
commit 7254c723e8
19 changed files with 131 additions and 91 deletions

View File

@ -1,65 +1,72 @@
{
"LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" },
"alpha-nvim": { "branch": "main", "commit": "dafa11a6218c2296df044e00f88d9187222ba6b0" },
"alpha-nvim": { "branch": "main", "commit": "87c204040e3f5d4c1c95067b35905d8f8a2f2545" },
"auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" },
"barbar.nvim": { "branch": "master", "commit": "d0b39de8ce48e9efced88edc9244ca21e571bb98" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
"cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" },
"cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"deadcolumn.nvim": { "branch": "master", "commit": "1de03069f5d525b2ab2ab65abe9ab90d9d44dcc1" },
"deadcolumn.nvim": { "branch": "master", "commit": "fef1b129779b223ddde9971fc852da20dfa6717d" },
"distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" },
"dressing.nvim": { "branch": "master", "commit": "f5d7fa1fa5ce6bcebc8f07922f39b1eda4d01e37" },
"feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
"friendly-snippets": { "branch": "main", "commit": "8d91ba2dc2421a54981115f61b914974f938fa77" },
"gitsigns.nvim": { "branch": "main", "commit": "ca473e28382f1524aa3d2b6f04bcf54f2e6a64cb" },
"friendly-snippets": { "branch": "main", "commit": "9590ff90759488674cf97fe5d5754a0733ab37bb" },
"gitsigns.nvim": { "branch": "main", "commit": "7dfe4be94b4f84a9931098f0f0f618d055e50bd5" },
"glow.nvim": { "branch": "main", "commit": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215" },
"headlines.nvim": { "branch": "master", "commit": "6496b6229ce708253a906daed07067c1d32a427b" },
"headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" },
"indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
"lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
"jupynium.nvim": { "branch": "master", "commit": "4f2c1ea3d6186ad5490d4f86ebc1943069a6a4cb" },
"kanagawa.nvim": { "branch": "master", "commit": "172d858162c4fdeca9cb2cab56eb4b8237af5df1" },
"lazy.nvim": { "branch": "main", "commit": "903f0fe542fc35b74f3c09494f9c175346dfa76d" },
"lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" },
"lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
"lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
"lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "b64fdede85fd5e0b720ce722919e0a9b95ed6547" },
"mason.nvim": { "branch": "main", "commit": "92fe8b7b3795ebb9e856124ae9ef5d4a1502f230" },
"mini.comment": { "branch": "main", "commit": "9fc3fe43129e8c2611bd21b8f50af8c0d0742533" },
"mini.fuzzy": { "branch": "stable", "commit": "e8faf897330eadb1b1b76da67eeff04be85cbd8b" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "22d17951315e22e602912c9629b97d183fb90d16" },
"mason.nvim": { "branch": "main", "commit": "9a68a4bd997b72cee4132459e0fd99eea0cdc627" },
"mini.comment": { "branch": "main", "commit": "9ead47cef4266efa5145808b838762c658b74f74" },
"mini.fuzzy": { "branch": "stable", "commit": "cc1d65ce13a8441fd1095ba6d8e6827e99d9b5b7" },
"mini.move": { "branch": "main", "commit": "33c54f69a3d72aa3d22c73d1f6b11601d65caff4" },
"mini.pairs": { "branch": "stable", "commit": "4ebc1ff8d77fe75e8f219432302800ca29e17614" },
"mini.surround": { "branch": "main", "commit": "6a4f31e2a380439315729f561d7e7898bde1fd52" },
"mini.pairs": { "branch": "stable", "commit": "771c08bd313614c7e9a1904d277ac76eb226f674" },
"mini.surround": { "branch": "main", "commit": "cc962bae0890217f8473390abc8cef988519d370" },
"mini.trailspace": { "branch": "main", "commit": "37b6517750353fb53b546494093461ccc319a7f4" },
"mkdnflow.nvim": { "branch": "main", "commit": "587fbc12a06bb89df5601ae19df94ecbc82b6ec0" },
"moonfly": { "branch": "master", "commit": "de80e20ffa2d1743aa9f4bef0326e037478ca3f6" },
"mkdnflow.nvim": { "branch": "main", "commit": "5a9768fe09c614600fd2881f29c5cedf931f3e36" },
"moonfly": { "branch": "master", "commit": "b3bdecc240fd90bc7548f41b010dcf48adddb231" },
"neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
"neovim": { "branch": "main", "commit": "17723f76ea78cdd71fd0007b7b760683b60a5e43" },
"nightfox.nvim": { "branch": "main", "commit": "4b73c9d0995eb1a43e284534b97a543ca21c5c77" },
"null-ls.nvim": { "branch": "main", "commit": "0180603b6f3cee40f83c6fc226b9ac5f85e691c4" },
"nvim": { "branch": "main", "commit": "73587f9c454da81679202f1668c30fea6cdafd5e" },
"nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
"nvim-dap": { "branch": "master", "commit": "7389e85233e3483b31b6a1c4ba69cda77336b7a8" },
"nvim-dap-python": { "branch": "master", "commit": "af5e04c6eae97498258f84c61e1b22be6660763b" },
"nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" },
"nvim-lspconfig": { "branch": "master", "commit": "c5505c70571b094663745167d40388edd40f6450" },
"neovim": { "branch": "main", "commit": "667851c05f87874826084474b5f04829940b6451" },
"nightfox.nvim": { "branch": "main", "commit": "68db77db88bf997f060cf591f81813ccba97c5e6" },
"null-ls.nvim": { "branch": "main", "commit": "63e1ab06f362c7fcd8a1b6f95665b55814190986" },
"nvim": { "branch": "main", "commit": "dd176757cc745f71bd54c472a9f58d5f8a54661d" },
"nvim-cmp": { "branch": "main", "commit": "e28fb7a730b1bd425fdddfdbd3d36bb84bd77611" },
"nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" },
"nvim-dap-python": { "branch": "master", "commit": "972b8b8b65823c433ee834ed02a7f06edf590dfc" },
"nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" },
"nvim-lspconfig": { "branch": "master", "commit": "710c45bd13928c1f37ef0a714fd49b75f00d7d5e" },
"nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" },
"nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" },
"nvim-tree.lua": { "branch": "master", "commit": "45400cd7e02027937cd5e49845545e606ecf5a1f" },
"nvim-treesitter": { "branch": "master", "commit": "5a7a2ad172bcc40c53aa274dff05aacb5074b509" },
"nvim-web-devicons": { "branch": "master", "commit": "267af2d57e0f251d65b95bdfd1f382211b272417" },
"plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
"nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" },
"nvim-tree.lua": { "branch": "master", "commit": "bb375fb20327c49920c41d2b51c1ce2f4fe7deb3" },
"nvim-treesitter": { "branch": "master", "commit": "75f911d01f740385f1f60b2f73266514647913b5" },
"nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
"plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"prettier.nvim": { "branch": "main", "commit": "08f7f08fae57fd970c7470d883c9127f172bd9e6" },
"sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" },
"starry.nvim": { "branch": "master", "commit": "9c4f8669acb302300e1495d4b1f1e618524a48f4" },
"styler.nvim": { "branch": "main", "commit": "58d0d12191adee41fce7ef20d46d1203efa0d11e" },
"symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "15caac96190f5ad8b016c0228a510026b88a576d" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "e0fcb12702ad0d2873544a31730f9aaef04fd032" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "cf7994277c89e0a367e90f3ad054c983e2dfc22c" },
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" },
"telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
"tmux.nvim": { "branch": "main", "commit": "9ba03cc5dfb30f1dc9eb50d0796dfdd52c5f454e" },
"todo-comments.nvim": { "branch": "main", "commit": "0874bda6848ff6f3da3ffdf4bd8297a5c951c5d4" },
"tokyonight.nvim": { "branch": "main", "commit": "1b0c88094548a62641ece1e668fa9a234e1c539e" },
"trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" },
"vim-wakatime": { "branch": "master", "commit": "3b3d7f3d0fb4a476a7d1ef4d6f41e31050bdf52a" },
"which-key.nvim": { "branch": "main", "commit": "4b73390eec680b4c061ea175eb32c0ff3412271d" }
"terminal.nvim": { "branch": "master", "commit": "764b7c137512bcfba2e45cf3e25c08a9f4d3b733" },
"tmux.nvim": { "branch": "main", "commit": "b6da35847df972f50df27d938b6e5ea09bcc8391" },
"todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
"tokyonight.nvim": { "branch": "main", "commit": "ab0ac67f4f32f44c3480f4b81ed90e11cb4f3763" },
"trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" },
"vim-wakatime": { "branch": "master", "commit": "515dbcc2278a9279a19de838fa29fc5078e34e56" },
"which-key.nvim": { "branch": "main", "commit": "94cb020ff33a1e0e22fac1c41663d2c439741f17" }
}

View File

@ -0,0 +1,16 @@
return
{
'chipsenkbeil/distant.nvim',
branch = 'v0.2',
config = function()
require('distant').setup {
-- Applies Chip's personal settings to every machine you connect to
--
-- 1. Ensures that distant servers terminate with no connections
-- 2. Provides navigation bindings for remote directories
-- 3. Provides keybinding to jump into a remote file's parent directory
['*'] = require('distant.settings').chip_default()
}
end
}

View File

@ -30,9 +30,22 @@ return {
{
'L3MON4D3/LuaSnip', version = "1.2.1",
dependencies = { "friendly-snippets" },
-- {
-- 'bennypowers/nvim-regexplainer',
-- dependencies = {
-- 'nvim-treesitter/nvim-treesitter',
-- 'MunifTanjim/nui.nvim',
-- },
-- config = function() require('regexplainer').setup{} end,
-- },
},
'saadparwaiz1/cmp_luasnip',
'hrsh7th/cmp-nvim-lsp-signature-help',
{
'asiryk/auto-hlsearch.nvim',
version = "1.1.0",
config = function() require("auto-hlsearch").setup{} end,
},
------------------------------------------------------------
-- General Functionality
@ -84,6 +97,15 @@ return {
}
end
},
{
"kiyoon/jupynium.nvim",
build = "pip3 install --user .",
-- build = "conda run --no-capture-output -n jupynium pip install .",
-- enabled = vim.fn.isdirectory(vim.fn.expand "~/miniconda3/envs/jupynium"),
},
"hrsh7th/nvim-cmp", -- optional, for completion
"rcarriga/nvim-notify", -- optional
"stevearc/dressing.nvim", -- optional, UI for :JupyniumKernelSelect
-- Top Right Notify Pop Up
'rcarriga/nvim-notify',
@ -160,7 +182,7 @@ return {
end
},
{ "iamcco/markdown-preview.nvim", build = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = {
{ "iamcco/markdown-preview.nvim", build = "cd app && npm install", init = function() vim.g.mkdp_filetypes = {
"markdown" } end, ft = { "markdown" }, },
-- Prettier Plugin for Neovim specifically
@ -177,11 +199,18 @@ return {
)
end
},
{
'rebelot/terminal.nvim',
config = function()
require("terminal").setup()
end
},
-- Sidebar
{
'sidebar-nvim/sidebar.nvim',
config = function()
require("sidebar-nvim").setup({
side = "right",
sections = {
"git",
"symbols",
@ -270,6 +299,7 @@ return {
end},
'rose-pine/neovim',
'EdenEast/nightfox.nvim',
'rebelot/kanagawa.nvim',
'catppuccin/nvim',
{
"folke/tokyonight.nvim",

View File

@ -83,8 +83,8 @@ return {
{ name = 'nvim-lsp' },
{ name = 'luasnip' },
{ name = 'path' },
{ name = 'buffer' },
{ name = 'zsh' },
-- { name = 'buffer' },
-- { name = 'zsh' },
}
}
end

View File

@ -0,0 +1,14 @@
return {
"folke/styler.nvim",
config = function()
require("styler").setup({
themes = {
markdown = { colorscheme = "tokyonight-storm" },
python = { colorscheme = "dracula" },
html = { colorscheme = "carbonfox" },
help = { colorscheme = "catppuccin-mocha", background = "dark" },
css = { colorscheme = "carbonfox" }
},
})
end,
}

View File

@ -114,13 +114,13 @@ return {
preview = {
treesitter = {
enable = {
'css', 'dockerfile', 'elixir', 'erlang', 'fish',
'css', 'dockerfile', 'elixir', 'erlang', 'zsh',
'html', 'http', 'javascript', 'json', 'lua', 'php',
'python', 'regex', 'ruby', 'rust', 'scss', 'svelte',
'typescript', 'vue', 'yaml', 'markdown', 'bash', 'c',
'python', 'regex', 'ruby', 'rust', 'scss',
'typescript', 'yaml', 'markdown', 'bash', 'c',
'cmake', 'comment', 'cpp', 'dart', 'go', 'jsdoc',
'json5', 'jsonc', 'llvm', 'make', 'ninja', 'prisma',
'proto', 'pug', 'swift', 'todotxt', 'toml', 'tsx',
'json5', 'jsonc', 'llvm', 'make', 'ninja',
'todotxt', 'toml', 'help'
}
}
},

View File

@ -292,3 +292,6 @@ centre
centres
consisently
LiveStorm
represneted
Jagannatha
Q2

Submodule tmux/.config/tmux/plugins/tmux-nova deleted from 7bd3bceb99

Submodule tmux/.config/tmux/plugins/tmux-open-nvim deleted from 2f4818d0d2

Submodule tmux/.config/tmux/plugins/tmux-peacock deleted from b9bce7e817

Submodule tmux/.config/tmux/plugins/tmux-sidebar deleted from aacbdb45bc

Submodule tmux/.config/tmux/plugins/tmux-ssh-status deleted from 5d786c676f

Submodule tmux/.config/tmux/plugins/tmux-themepack deleted from 7c59902f64

Submodule tmux/.config/tmux/plugins/tokyo-night-tmux deleted from 26617ca796

Submodule tmux/.config/tmux/plugins/tpm updated: b699a7e01c...99469c4a9b

Submodule tmux/.config/tmux/plugins/vim-tmux-navigator updated: 9ca5bfe5bd...cdd66d6a37

View File

@ -1,3 +1,6 @@
set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin"
set-window-option -g mode-keys vi
# Standard Plugins
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
@ -6,17 +9,9 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum'
# synchronize panes toggle - literally typing at the same time in both panes!
# unbind C-s
# bind C-y set-window-option synchronize-panes
# Search your Scrollback using fzf
set -g @plugin 'roosta/tmux-fuzzback'
# Open files in Neovim from another pane
# Might not work on ZSH. Commenting out for now.
# set -g @plugin 'trevarj/tmux-open-nvim'
# Allow Focus Events
set -g focus-events on
@ -26,30 +21,6 @@ set-option -g mouse on
# Vim-Tmux-Navigator plugin/
set -g @plugin 'christoomey/vim-tmux-navigator'
# Navigating Vim & Tmux Panes
# Smart pane switching with awareness of Vim splits.
#is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
#bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
#bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
#bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
#bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
#tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
#if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
# "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
#if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
#bind-key -T copy-mode-vi 'C-h' select-pane -L
#bind-key -T copy-mode-vi 'C-j' select-pane -D
#bind-key -T copy-mode-vi 'C-k' select-pane -U
#bind-key -T copy-mode-vi 'C-l' select-pane -R
#bind-key -T copy-mode-vi 'C-\' select-pane -l
# Themes
# set -g @plugin 'o0th/tmux-nova'
#set -g @plugin "janoamaral/tokyo-night-tmux"
# Dracula
set -g @plugin 'dracula/tmux'
set -g @dracula-plugins "git weather network-ping cpu-usage time"
@ -75,10 +46,10 @@ set -g @dracula-git-no-repo-message ⊚
set -g @dracula-show-timezone false
set -g @dracula-military-time true
run-shell ~/clone/path/continuum.tmux
#run-shell ~/.dotfiles/tmux/.config/tmux/plugins/tmux-continuum/continuum.tmux
# Autoreload tmux.conf
set-option -g @plugin 'b0o/tmux-autoreload'
# set-option -g @plugin 'b0o/tmux-autoreload'
# Initiazlie TMUX plugin manager - kept at bottom of file
run '~/.config/tmux/plugins/tpm/tpm'
# run '~/.config/tmux/plugins/tpm/tpm'
run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm'

View File

@ -7,6 +7,7 @@ export LANG=en_US.UTF-8
plugins=(
zsh-autosuggestions
git
wakatime
)
# User configuration
@ -34,3 +35,8 @@ export PATH="$PATH:$HOME/.rvm/bin"
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
export PATH="/opt/homebrew/sbin:$PATH"
eval "$(starship init zsh)"
export PATH="/opt/homebrew/bin:$PATH"
### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT)
export PATH="/Users/normrasmussen/.rd/bin:$PATH"
### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT)