From 3bcc0b4cf74b711d5e99cc1ed172da7138fb9884 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Fri, 5 Jul 2024 21:58:36 +0200 Subject: [PATCH 1/5] ignore the currently selected theme --- .gitignore | 1 + lua/settings/theme.lua | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 lua/settings/theme.lua diff --git a/.gitignore b/.gitignore index 2b27ef0..7b8b949 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ after **/.DS_Store lua/custom/secret lua/custom/configs/secret +lua/settings/theme.lua diff --git a/lua/settings/theme.lua b/lua/settings/theme.lua deleted file mode 100644 index 55fb22d..0000000 --- a/lua/settings/theme.lua +++ /dev/null @@ -1,5 +0,0 @@ --- Themery block --- This block will be replaced by Themery. -vim.cmd("colorscheme kanagawa-wave") -vim.g.theme_id = 8 --- end themery block From dc36a117d0ba6522f28bbb6bfaed1eeb50d9b4d0 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Fri, 5 Jul 2024 21:58:43 +0200 Subject: [PATCH 2/5] set colorcolumn --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 14f0456..536bc39 100644 --- a/init.lua +++ b/init.lua @@ -126,7 +126,7 @@ opt.showcmd = false -- show command in status line opt.cmdheight = 0 opt.cmdwinheight = 5 -- Command-line lines opt.equalalways = true -- Resize windows on split or close -opt.colorcolumn = '+0' -- Column highlight at textwidth's max character-limit +opt.colorcolumn = '80' -- Column highlight at textwidth's max character-limit opt.cursorline = true opt.cursorlineopt = { 'number', 'screenline' } From 47be317c0456a50b16f5c8b872cd421ee1f513ad Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Fri, 5 Jul 2024 22:01:35 +0200 Subject: [PATCH 3/5] seperator fir light and dark themes --- lua/custom/plugins/themes.lua | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/lua/custom/plugins/themes.lua b/lua/custom/plugins/themes.lua index 96b8616..1b08289 100644 --- a/lua/custom/plugins/themes.lua +++ b/lua/custom/plugins/themes.lua @@ -12,14 +12,15 @@ return { config = function() require('themery').setup { themes = { + -- Dark Themes + { + name = '==========Dark Themes==========', + colorscheme = '', -- this actually keeps the selected theme + }, { name = 'tokyonight', colorscheme = 'tokyonight', }, - { - name = 'tokyonight-day', - colorscheme = 'tokyonight-day', - }, { name = 'tokyonight-moon', colorscheme = 'tokyonight-moon', @@ -36,14 +37,23 @@ return { name = 'kanagawa-dragon', colorscheme = 'kanagawa-dragon', }, - { - name = 'kanagawa-lotus', - colorscheme = 'kanagawa-lotus', - }, { name = 'kanagawa-wave', colorscheme = 'kanagawa-wave', }, + -- Light themes + { + name = '==========Light Themes==========', + colorscheme = '', -- this actually keeps the selected theme + }, + { + name = 'tokyonight-day', + colorscheme = 'tokyonight-day', + }, + { + name = 'kanagawa-lotus', + colorscheme = 'kanagawa-lotus', + }, }, themeConfigFile = '~/.config/nvim/lua/settings/theme.lua', livePreview = true, -- Apply theme while browsing. Default to true. From ec84dfc857e72dea839791e85e5df8b868121ebb Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Fri, 5 Jul 2024 22:09:16 +0200 Subject: [PATCH 4/5] add some default themes --- lua/custom/plugins/themes.lua | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/lua/custom/plugins/themes.lua b/lua/custom/plugins/themes.lua index 1b08289..6657993 100644 --- a/lua/custom/plugins/themes.lua +++ b/lua/custom/plugins/themes.lua @@ -15,7 +15,31 @@ return { -- Dark Themes { name = '==========Dark Themes==========', - colorscheme = '', -- this actually keeps the selected theme + colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence + }, + { + name = 'nvim default', + colorscheme = 'default', + }, + { + name = 'nvim lunaperche', + colorscheme = 'lunaperche', + }, + { + name = 'nvim quiet', + colorscheme = 'quiet', + }, + { + name = 'nvim retrobox', + colorscheme = 'retrobox', + }, + { + name = 'nvim slate', + colorscheme = 'slate', + }, + { + name = 'nvim vim', + colorscheme = 'vim', }, { name = 'tokyonight', @@ -44,7 +68,7 @@ return { -- Light themes { name = '==========Light Themes==========', - colorscheme = '', -- this actually keeps the selected theme + colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence }, { name = 'tokyonight-day', From 5dd7b23adfade0170e967cb01e59fd872fb7c2b3 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sat, 6 Jul 2024 02:06:24 +0200 Subject: [PATCH 5/5] format lines fl --- lua/custom/maps/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/custom/maps/init.lua b/lua/custom/maps/init.lua index 4789429..fe25ae3 100644 --- a/lua/custom/maps/init.lua +++ b/lua/custom/maps/init.lua @@ -101,6 +101,9 @@ vim.keymap.set({ 'n', 'v' }, '', ' move+2', { desc = 'Move line d vim.keymap.set({ 'n', 'v' }, '', '<<', { desc = 'Less indentation' }) vim.keymap.set({ 'n', 'v' }, '', '>>', { desc = 'More indentation' }) +-- format a long line into multiple with length 80 +vim.keymap.set({ 'v' }, 'fl', ':!fmt -w80', { desc = '[F]ormat long [L]ines into smaller ones' }) + -------------------------------------------------------------------------------- -- Formating --------------------------------------------------------------------------------