diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index a6c3c8f..4c988e6 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -12,7 +12,6 @@ "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "live-rename.nvim": { "branch": "main", "commit": "3a3cddf23b89a17992f9ca67afc5858077769462" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "midnight.nvim": { "branch": "main", "commit": "130a1899c2d5a0af431f3e41eeac429e90ea1d09" }, "mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" }, "mini.bufremove": { "branch": "main", "commit": "10857aa39160c127694151828914df3131ba83b6" }, "mini.misc": { "branch": "main", "commit": "b647b64321c34d4868d158282bb89e49f0d6838b" }, diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index e9b9097..ac2492b 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -1,10 +1,4 @@ return { - { - 'barrettruth/midnight.nvim', - config = function() - vim.cmd.colorscheme('midnight') - end, - }, { 'echasnovski/mini.pairs', config = true, diff --git a/config/nvim/plugin/options.lua b/config/nvim/plugin/options.lua index 464a994..4f490ab 100644 --- a/config/nvim/plugin/options.lua +++ b/config/nvim/plugin/options.lua @@ -2,18 +2,6 @@ local o, opt = vim.o, vim.opt o.autowrite = true -local f, background = io.open(vim.env.HOME .. '/.zshenv', 'r'), 'light' -if f then - local content = f:read('*a') - f:close() - local theme = content:match('export THEME=(%S+)') - background = theme -elseif vim.env.THEME then - background = vim.env.THEME -end - -o.background = background == 'daylight' and 'light' or 'dark' - o.breakindent = true o.cursorline = true diff --git a/home/modules/shell.nix b/home/modules/shell.nix index fb07dca..bf0f797 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -415,7 +415,7 @@ in unbind ^; bind ^ last-window - unbind e; bind e neww -n 'tmux.conf' "sh -c 'nvim $XDG_CONFIG_HOME/tmux/tmux.conf; tmux source $XDG_CONFIG_HOME/tmux/tmux.conf'" + unbind e; bind e neww -n 'tmux.conf' "sh -c 'nvim ~/.config/nix/home/modules/shell.nix; tmux source $XDG_CONFIG_HOME/tmux/tmux.conf'" unbind H; bind H run 'mux switch 0'\; refresh -S unbind J; bind J run 'mux switch 1'\; refresh -S