Start moving to new colourscheme (Catpuccin), WIP

config/nvim/lua/colours.lua

@@ -0,0 +1,13 @@
+vim.opt.fillchars:append({
+    horiz = '━',
+    horizup = '┻',
+    horizdown = '┳',
+    vert = '┃',
+    vertleft = '┨',
+    vertright = '┣',
+    verthoriz = '╋',
+})
+require("config.nightfox")
+require("config.onedarkpro")
+require("config.kanagawa")
+vim.cmd("colorscheme nightfox")

config/nvim/lua/config/kanagawa.lua

@@ -0,0 +1,4 @@
+require("kanagawa").setup({
+    transparent = true,
+    dimInactive = true,
+})

config/nvim/lua/config/lualine.lua

@@ -0,0 +1,5 @@
+require("lualine").setup({
+    options = {
+        global_status = true
+    },
+})

config/nvim/lua/config/nightfox.lua

@@ -4,4 +4,3 @@ require("nightfox").setup({
 	},
 })
 require("nightfox").compile()
-vim.cmd("colorscheme duskfox")

config/nvim/lua/config/onedarkpro.lua

@@ -0,0 +1,5 @@
+require("onedarkpro").setup {
+    options = {
+        transparency = true,
+    },
+}

config/nvim/lua/options.lua

@@ -7,6 +7,7 @@ vim.g.python_indent = {
 	closed_paren_align_last_line = "v:false",
 }
 vim.opt.termguicolors = true
+vim.opt.laststatus = 3
 vim.opt.mouse = "nv"
 vim.opt.shiftwidth = 4
 vim.opt.number = true

config/nvim/lua/plugins.lua

@@ -10,16 +10,17 @@ require("packer").startup({
 		use("wbthomason/packer.nvim")
 		use("lewis6991/impatient.nvim")
 		use("stevearc/dressing.nvim")
+                use { "catppuccin/nvim", as = "catppuccin" }
 		use({
 			"EdenEast/nightfox.nvim",
-			config = function()
+			"olimorris/onedarkpro.nvim",
-				require("config.nightfox")
+			"rebelot/kanagawa.nvim",
-			end,
 		})
 		use({
-			"nanozuki/tabby.nvim",
+			"nvim-lualine/lualine.nvim",
+			requires = { "kyazdani42/nvim-web-devicons", opt = true },
 			config = function()
-				require("config.tabby")
+				require("config.lualine")
 			end,
 		})
 		use({
@@ -82,12 +83,6 @@ require("packer").startup({
 				require("config.gitsigns")
 			end,
 		})
-		use({
-			"feline-nvim/feline.nvim",
-			config = function()
-				require("config.feline")
-			end,
-		})
 		use({
 			"kyazdani42/nvim-tree.lua",
 			config = function()
@@ -153,5 +148,6 @@ require("packer").startup({
 		},
 	},
 })
+require("colours")
 require("config.lsp")
 require("config.cmp")

config/wezterm/status.lua

@@ -1,12 +1,30 @@
 local wezterm = require("wezterm")
 
+-- Equivalent to POSIX basename(3)
+-- Given "/foo/bar" returns "bar"
+-- Given "c:\\foo\\bar" returns "bar"
+function basename(s)
+	return string.gsub(s, "(.*[/\\])(.*)", "%2")
+end
+
 wezterm.on("update-right-status", function(window, pane)
+	local scheme = wezterm.color.get_builtin_schemes()["kanagawabones"]
 	-- Each element holds the text for a cell in a "powerline" style << fade
 	local cells = {}
 
+	-- Show current active key table
+	local name = window:active_key_table()
+	if name then
+		name = "TABLE: " .. name
+		table.insert(cells, name)
+	end
+
 	-- I like my date/time in this style: "Wed Mar 3 08:14"
-	local date = wezterm.strftime("%a %b %-d %H:%M")
+	-- local date = wezterm.strftime("%a %b %-d %H:%M")
+        local date = wezterm.strftime("%Y-%m-%d")
 	table.insert(cells, date)
+        local time = wezterm.strftime("%H:%M")
+        table.insert(cells, time)
 
 	-- Get current hostname to track which device I'm on
 	table.insert(cells, wezterm.hostname())
@@ -16,55 +34,34 @@ wezterm.on("update-right-status", function(window, pane)
 		table.insert(cells, string.format("%.0f%%", b.state_of_charge * 100))
 	end
 
-	-- WIP key table code - not yet used
-	local name = window:active_key_table()
-	if name then
-		name = "TABLE: " .. name
-		table.insert(cells, name)
-	end
-
 	-- The powerline < symbol
 	local LEFT_ARROW = utf8.char(0xe0b3)
 	-- The filled in variant of the < symbol
 	local SOLID_LEFT_ARROW = utf8.char(0xe0b2)
 
-	-- Color palette for the backgrounds of each cell
+	-- Define various colours used from active colourscheme
-	local colors = wezterm.color.gradient({
+	local tab_bar_bg = "#333333" -- Not defined in scheme for some reason...
-		colors = {
+	local tab_bg = scheme.foreground
-			"#333333",
+	local tab_fg = scheme.background
-			"#926ee4",
-			-- "#9ccfd8",
-		},
-	}, #cells + 1)
-
-	-- Foreground color for the text across the fade
-	local text_fg = wezterm.color.get_builtin_schemes()["duskfox"].foreground
 
 	-- The elements to be formatted
 	local elements = {}
-	-- How many cells have been formatted
-	local num_cells = 0
 
-	-- Translate a cell into elements
+	table.insert(elements, { Foreground = { Color = tab_bg } })
-	local function push(text, is_last)
+	table.insert(elements, { Background = { Color = tab_bar_bg } })
-		local cell_no = num_cells + 1
+	table.insert(elements, { Text = SOLID_LEFT_ARROW })
-		table.insert(elements, { Foreground = { Color = text_fg } })
+	while #cells > 1 do
-		table.insert(elements, { Background = { Color = colors[cell_no + 1] } })
+		local text = table.remove(cells, 1)
+		table.insert(elements, { Foreground = { Color = tab_fg } })
+		table.insert(elements, { Background = { Color = tab_bg } })
 		table.insert(elements, { Text = " " .. text .. " " })
-		if not is_last then
+		table.insert(elements, { Foreground = { Color = tab_fg } })
-			table.insert(elements, { Foreground = { Color = colors[cell_no + 2] } })
+		table.insert(elements, { Text = LEFT_ARROW })
-			table.insert(elements, { Text = SOLID_LEFT_ARROW })
-		end
-		num_cells = num_cells + 1
-	end
-
-	table.insert(elements, { Foreground = { Color = colors[num_cells + 2] } })
-	table.insert(elements, { Background = { Color = colors[1] } })
-	table.insert(elements, { Text = SOLID_LEFT_ARROW })
-	while #cells > 0 do
-		local cell = table.remove(cells, 1)
-		push(cell, #cells == 0)
 	end
+	local text = table.remove(cells, 1)
+	table.insert(elements, { Foreground = { Color = tab_fg } })
+	table.insert(elements, { Background = { Color = tab_bg } })
+	table.insert(elements, { Text = " " .. text .. " " })
 
 	window:set_right_status(wezterm.format(elements))
 end)

config/wezterm/wezterm.lua

@@ -5,7 +5,9 @@ return {
 	font_size = 14,
 	window_background_opacity = 0.95,
 	window_decorations = "RESIZE",
-	color_scheme = "duskfox",
+	-- use_fancy_tab_bar = false,
+	color_scheme = "Catppuccin Mocha",
+	-- color_scheme = "nightfox",
 	disable_default_key_bindings = true,
 	keys = require("keys"),
 	key_tables = require("key_tables"),