diff --git a/README.md b/README.md index ea66e1b..b713528 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ | neovim | | | ripgrep | | | tmux | | +| [macOS Input Source Manager][macism] | | ``` @@ -57,11 +58,10 @@ Then reload ``.tmux.conf`` (``bind + shift + I`` in tmux) and the plugins specif [brew]:https://brew.sh/index [fisher]:https://github.com/jorgebucaran/fisher +[macism]:https://github.com/laishulu/macism -## Environment variables +### Environment Variables -This repository assumes that the following environment variables are set. - -| Environemnt variable | Note | -|----------------------|------| -| MANDAIY_ORG_NOTE_DIR | Directory where org-note repository resides | +| Variable | Description | +|----------|-------------| +| `NVIM_PYTHON_PATH` | Path to Python interpreter to be used in neovim | diff --git a/nvim/init.lua b/nvim/init.lua index 42bb389..b758a83 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -130,6 +130,10 @@ vim.opt.wildmode = "list:full" -- Command completion vim.opt.wrap = false vim.opt.writebackup = false +vim.opt.termguicolors = true +vim.opt.winblend = 0 +vim.opt.pumblend = 0 + -- %<: truncation position -- %n: buffer number, %m: modified? -- %r: RO?, %h: help buffer? @@ -226,14 +230,22 @@ end, { expr = true }) -- Enable editorconfig vim.g.editorconfig = true + -- Disable python2 support. vim.g.loaded_python_provider = 0 -if vim.fn.isdirectory(vim.env.XDG_CONFIG_HOME .. "/nvim/venv/") then - vim.g.python3_host_prog = vim.env.XDG_CONFIG_HOME .. "/nvim/venv/bin/python" - vim.g.black_virtualenv = vim.env.XDG_CONFIG_HOME .. "/nvim/venv" +local nvim_python_path = vim.loop.os_getenv("NVIM_PYTHON_PATH") +local XDG_CONFIG_HOME = vim.loop.os_getenv("XDG_CONFIG_HOME") or "" +if nvim_python_path ~= nil then + vim.g.python3_host_prog = nvim_python_path +elseif vim.fn.isdirectory(XDG_CONFIG_HOME .. "/nvim/venv/") then + vim.g.python3_host_prog = XDG_CONFIG_HOME .. "/nvim/venv/bin/python" end +-- Example for configuring Neovim to load user-installed installed Lua rocks: +package.path = package.path .. ";" .. vim.fn.expand("$HOME") .. "/.luarocks/share/lua/5.1/?/init.lua;" +package.path = package.path .. ";" .. vim.fn.expand("$HOME") .. "/.luarocks/share/lua/5.1/?.lua;" + -- lazy bootstrap local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index e511a7c..400956b 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -4,6 +4,15 @@ return { lazy = false, -- make sure we load this during startup if it is your main colorscheme priority = 1000, -- make sure to load this before all the other start plugins config = function() + require("tokyonight").setup({ + style = "storm", + transparent = true, + styles = { + sidebars = "transparent", + floats = "transparent", + }, + }) + -- load the colorscheme here vim.cmd([[colorscheme tokyonight]]) end, diff --git a/tmux/tmux.conf b/tmux/tmux.conf index fbe4549..2074e0a 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -56,4 +56,6 @@ set -g @plugin 'seebi/tmux-colors-solarized' set -g @yank_action 'copy-pipe' +set -gq allow-passthrough on + run '$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm'