diff options
-rwxr-xr-x | Common/nvim/init.lua | 4 | ||||
-rwxr-xr-x | Common/nvim/lua/basic.lua | 31 | ||||
-rwxr-xr-x | Common/nvim/lua/plugins.lua | 5 | ||||
-rw-r--r-- | linux/alacritty/atom_one_light.yaml | 3 | ||||
-rw-r--r-- | linux/tmux.conf | 7 |
5 files changed, 27 insertions, 23 deletions
diff --git a/Common/nvim/init.lua b/Common/nvim/init.lua index 34a38fe..4b99e7b 100755 --- a/Common/nvim/init.lua +++ b/Common/nvim/init.lua @@ -1,6 +1,10 @@ -- Use a mapleader vim.g.mapleader = "," +-- To debug +-- vim.opt.verbosefile = ~/nvim.log +-- vim.opt.verbose = 15 + require("helper_functions") require("basic") require("plugins") diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua index d24fbc9..4c09fa6 100755 --- a/Common/nvim/lua/basic.lua +++ b/Common/nvim/lua/basic.lua @@ -24,7 +24,8 @@ vim.api.nvim_create_user_command( ) -- Disable the auto line wrap -vim.cmd [[ set formatoptions-=t ]] +-- vim.cmd [[ set formatoptions-=t ]] +vim.opt.formatoptions:remove("t") --[[ VIM User interface @@ -78,24 +79,22 @@ vim.opt.showcmd = true -- Show colour column vim.opt.colorcolumn = '80,120' -vim.cmd [[ highlight ColorColumn ctermbg=16 ]] +vim.api.nvim_set_hl(0, "ColorColumn", { ctermbg = 16 }) + -- Colorscheme --- default vim.cmd [[ colorscheme default ]] -vim.cmd [[ set background=light ]] - --- Workaround for gutter color -vim.cmd [[ -highlight! link SignColumn LineNr -autocmd ColorScheme * highlight! link SignColumn LineNr -]] - --- Change git colors ---vim.api.nvim_set_hl(0, "DiffAdd", {fg = "#bada9f", bg = "None"}) ---vim.api.nvim_set_hl(0, "DiffChange", {fg = "Purple", bg = "None"}) ---vim.api.nvim_set_hl(0, "DiffDelete", {fg = "Red", bg = "None"}) ---vim.api.nvim_set_hl(0, "DiffText", {fg = "Yellow", bg = "None"}) +vim.opt.background = "light" +vim.opt.termguicolors = true + +-- Workaround for gutter color, to remove background? +vim.api.nvim_set_hl(0, "SignColumn", {link = "LineNr"}) +vim.api.nvim_create_autocmd("ColorScheme", { + pattern = "*", + callback = function() + vim.api.nvim_set_hl(0, "SignColumn", {link = "LineNr"}) + end +}) -- Set utf8 as standard encoding vim.opt.encoding = 'utf8' diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua index 6b8cbbf..d9ae65f 100755 --- a/Common/nvim/lua/plugins.lua +++ b/Common/nvim/lua/plugins.lua @@ -149,10 +149,11 @@ return require('packer').startup(function(use) } use { 'smithbm2316/centerpad.nvim' } - -- Color preview + -- Color picker use { - 'lilydjwg/colorizer', + "ziontee113/color-picker.nvim", config = function() + require("color-picker") end, } diff --git a/linux/alacritty/atom_one_light.yaml b/linux/alacritty/atom_one_light.yaml index 07e3ea3..5ba87ed 100644 --- a/linux/alacritty/atom_one_light.yaml +++ b/linux/alacritty/atom_one_light.yaml @@ -1,6 +1,7 @@ colors: primary: - background: '0xf8f8f8' + #background: '0xf8f8f8' + background: '#F2EEDE' foreground: '0x2a2b33' normal: diff --git a/linux/tmux.conf b/linux/tmux.conf index bb768a0..c750770 100644 --- a/linux/tmux.conf +++ b/linux/tmux.conf @@ -105,10 +105,11 @@ bind -n M-C-i display-popup -E "nvim -c 'e ~/Nextcloud/wiki/I45/Hendelser.md' -c set -g status-justify left set -g status-interval 2 set -g status-position bottom -set -g status-bg '#f8f8f8' +#set -g status-bg '#f8f8f8' +set -g status-bg '#F2EEDE' set -g status-fg colour16 -set -g status-left '#[fg=colour232,bg=colour3,bold]#{?client_prefix,C-a,}#[default] #[fg=colour0,bg=colour7,bold][#S]#[bg=colour15] ' +set -g status-left '#[fg=colour232,bg=colour3,bold]#{?client_prefix,C-a,}#[default] #[fg=colour0,bg=colour7,bold][#S]#[default] ' set -g status-left-length 20 set -g status-right '#[fg=colour0,bg=colour7,bold] #(hostname) #[default] #[fg=colour0,bg=colour7,bold] %d/%m/%y #[default] #[fg=colour0,bg=colour7,bold] %H:%M:%S #[default] #[bg=colour7,bold] #(cat /sys/class/power_supply/BAT0/capacity)% #[default] ' @@ -122,5 +123,3 @@ setw -g window-status-style "bg=colour7,fg=colour0" setw -g window-status-bell-style "bg=colour23,fg=colour15" #setw -g window-status-activity-style "bg=colour23,fg=colour15" setw -g window-status-activity-style "bg=colour243,fg=colour15" - - |