From 67807e8e9635d714989f482b301072425cf58150 Mon Sep 17 00:00:00 2001
From: Christoffer Martinsson <cm@cmtec.se>
Date: Mon, 12 Jun 2023 23:04:25 +0200
Subject: [PATCH] Updated theme

---
 config/nvim/init.lua                          | 31 +++++++++---------
 .../lua/lualine/themes/nightly_cm.lua         | 32 ++++++-------------
 tmux.conf                                     | 10 +++---
 3 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 6fc109a..e2b2139 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -53,7 +53,7 @@ vim.o.showtabline = 0
 
 vim.o.wrap = false
 
-vim.o.cmdheight = 0
+-- vim.o.cmdheight = 0
 
 -------------------------------------------------------------------
 -- Plugin management
@@ -188,40 +188,36 @@ require('lazy').setup({
             options = {
                 icons_enabled = true,
                 theme = 'nightly_cm',
-                component_separators = '|',
+                component_separators = '',
                 section_separators = '',
                 globalstatus = true,
             },
             sections = {
                 lualine_a = { 'mode' },
-                lualine_b = { 'branch' },
-                lualine_c = { 'diff', 'diagnostics', 'filename' },
+                lualine_b = { 'branch', 'diff' },
+                lualine_c = { 'filename' },
                 lualine_x = {
                     {
                         -- Lsp server name .
                         function()
                             local msg = ''
-                            -- local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype')
                             local clients = vim.lsp.get_active_clients({ bufnr = 0 })
                             if next(clients) == nil then
-                                return 'No Active Lsp'
+                                return msg
                             end
                             for _, client in ipairs(clients) do
-                                -- local filetypes = client.config.filetypes
-                                -- if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-                                msg = msg .. client.name .. " - "
-                                -- end
+                                msg = msg .. client.name .. ", "
                             end
                             if msg == '' then
-                                return 'No Active Lsp'
+                                return msg
                             end
-                            return msg:sub(1, -4)
+                            return msg:sub(1, -3)
                         end,
-                        color = { fg = '#afd787' },
-                    }, 'filetype',
+                        color = { fg = '#c6c6c6' },
+                    },
                 },
-                lualine_y = { 'progress' },
-                lualine_z = { 'location' }
+                lualine_y = { 'filetype' },
+                lualine_z = { 'progress' }
             },
         },
     },
@@ -376,6 +372,9 @@ local servers = {
         filetypes = { 'c', 'cpp', 'objc', 'objcpp' },
     },
     rust_analyzer = {},
+    bashls = {},
+    pyright = {},
+    marksman = {},
 }
 
 -------------------------------------------------------------------
diff --git a/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua b/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua
index fc0e478..c184f51 100644
--- a/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua
+++ b/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua
@@ -1,51 +1,39 @@
 local nightly = {
   normal = {
-    -- a = { bg = "#000000", fg = "#87afd7" },
     a = { bg = "#87afd7", fg = "#0c0c0c" },
-    -- b = { bg = "#000000", fg = "#c6c6c6" },
-    b = { bg = "#262626", fg = "#87afd7" },
-    c = { bg = "#0c0c0c", fg = "#c6c6c6" },
+    b = { bg = "#303030", fg = "#c6c6c6" },
+    c = { bg = "#303030", fg = "#c6c6c6" },
   },
 
   insert = {
-    -- a = { bg = "#000000", fg = "#afd787" },
     a = { bg = "#afd787", fg = "#0c0c0c" },
-    -- b = { bg = "#000000", fg = "#c6c6c6" },
-    b = { bg = "#262626", fg = "#afd787" },
+    b = { bg = "#303030", fg = "#c6c6c6" },
   },
 
   command = {
-    -- a = { bg = "#000000", fg = "#d7af5f" },
     a = { bg = "#d7af5f", fg = "#0c0c0c" },
-    -- b = { bg = "#000000", fg = "#c6c6c6" },
-    b = { bg = "#262626", fg = "#d7af5f" },
+    b = { bg = "#303030", fg = "#c6c6c6" },
   },
 
   visual = {
-    -- a = { bg = "#000000", fg = "#87afd7" },
     a = { bg = "#87afd7", fg = "#0c0c0c" },
-    -- b = { bg = "#000000", fg = "#c6c6c6" },
-    b = { bg = "#262626", fg = "#87afd7" },
+    b = { bg = "#303030", fg = "#c6c6c6" },
   },
 
   replace = {
-    -- a = { bg = "#000000", fg = "#d75f00" },
     a = { bg = "#d75f00", fg = "#0c0c0c" },
-    -- b = { bg = "#000000", fg = "#c6c6c6" },
-    b = { bg = "#262626", fg = "#d75f00" },
+    b = { bg = "#303030", fg = "#c6c6c6" },
   },
 
   terminal = {
-    -- a = { bg = "#000000", fg = "#87afd7" },
     a = { bg = "#87afd7", fg = "#0c0c0c" },
-    -- b = { bg = "#000000", fg = "#c6c6c6" },
-    b = { bg = "#262626", fg = "#87afd7" },
+    b = { bg = "#303030", fg = "#c6c6c6" },
   },
 
   inactive = {
-    a = { bg = "#0c0c0c", fg = "#c6c6c6" },
-    b = { bg = "#0c0c0c", fg = "#c6c6c6" },
-    c = { bg = "#0c0c0c", fg = "#c6c6c6" },
+    a = { bg = "#303030", fg = "#c6c6c6" },
+    b = { bg = "#303030", fg = "#c6c6c6" },
+    c = { bg = "#303030", fg = "#c6c6c6" },
   },
 }
 return nightly
diff --git a/tmux.conf b/tmux.conf
index 7d818c0..ba10d8f 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -16,8 +16,8 @@ set-option -sg escape-time 1
 set-option -g focus-events on
 
 set -g status-interval 2
-set -g status-bg black
-set -g status-fg brightblack
+set -g status-bg "#0c0c0c" 
+set -g status-fg "#6c6c6c" 
 set -g status-left ''
 set -g status-right '#($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -g 0 --interval 2)  |  %H:%M  |  %d-%b-%Y'
 set -g status-right-length 100 
@@ -25,11 +25,11 @@ set -g status-right-length 100
 # Use normal and bright monochrome colors to show a tab line on the left.
 set -g status-justify left
 set-window-option -g window-status-separator ''
-set-window-option -g window-status-format '#[bg=black,fg=#555555] #I #W '
-set-window-option -g window-status-current-format '#[bg=black,fg=brightblack] #I #W '
+set-window-option -g window-status-format '#[bg=black,fg=#6c6c6c] #I #W '
+set-window-option -g window-status-current-format '#[bg=black,fg=#b0b0b0] #I #W '
 
 # Switching panes should change the foreground color but not border colors.
-set -g window-style 'bg=default,fg=#ababab'
+set -g window-style 'bg=default,fg=#c6c6c6'
 set -g window-active-style 'bg=default,fg=white'
 set -g pane-border-style 'bg=default,fg=black'
 set -g pane-active-border-style 'bg=default,fg=black'