From a4c6142e3adf824f4163bbd128b88a7299c694c0 Mon Sep 17 00:00:00 2001 From: Jaroslaw Konik Date: Sun, 9 Jul 2023 09:33:58 +0200 Subject: [PATCH] Colors --- bashrc | 2 +- init.lua | 15 +++++++++++---- tmux.conf | 7 +++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/bashrc b/bashrc index 4edf727..0bb6d28 100644 --- a/bashrc +++ b/bashrc @@ -24,4 +24,4 @@ export PYTHONSTARTUP=.python_startup.py eval "$(~/.rbenv/bin/rbenv init - bash)" alias vim=nvim export EDITOR=nvim - +export TERM='xterm-256color' diff --git a/init.lua b/init.lua index 260b41b..3c0f507 100644 --- a/init.lua +++ b/init.lua @@ -13,7 +13,6 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ { "NeogitOrg/neogit", dependencies = "nvim-lua/plenary.nvim" }, - "wbthomason/packer.nvim", "lewis6991/fileline.nvim", "mfussenegger/nvim-dap", { @@ -53,7 +52,6 @@ require("lazy").setup({ require("nvim-tree").setup({}) end, }, - "hrsh7th/nvim-cmp", "hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp-signature-help", @@ -65,7 +63,13 @@ require("lazy").setup({ "nvim-lua/popup.nvim", "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", - "rebelot/kanagawa.nvim", + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = {}, + }, + "nvim-lualine/lualine.nvim", }) -- Vim options @@ -75,7 +79,7 @@ vim.g.mapleader = "," vim.wo.signcolumn = "yes" -- prevents jitter vim.opt.updatetime = 100 vim.o.background = "dark" -- or "light" for light mode -vim.cmd([[colorscheme kanagawa]]) +vim.cmd([[colorscheme tokyonight]]) -- Set completeopt to have a better completion experience -- :help completeopt -- menuone: popup even when there's only one match @@ -251,3 +255,6 @@ null_ls.setup({ -- Scroll bar require("scrollbar").setup() + +-- Status line +require("lualine").setup() diff --git a/tmux.conf b/tmux.conf index e6c9019..1d1d3d1 100644 --- a/tmux.conf +++ b/tmux.conf @@ -15,7 +15,10 @@ set -g @tmux-gruvbox 'dark' # set -g @plugin 'git@github.com:user/plugin' # set -g @plugin 'git@bitbucket.com:user/plugin' -# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) -run '~/.tmux/plugins/tpm/tpm' bind r source-file ~/.tmux.conf + +set -ga terminal-overrides ",xterm-256color:Tc" + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run '~/.tmux/plugins/tpm/tpm'