custom colorscheme

after/colors/jpbones.lua

@@ -1,4 +1,4 @@
-local colors_name = "gruvbones"
+local colors_name = "jpbones"
 vim.g.colors_name = colors_name -- Required when defining a colorscheme
 
 local lush = require "lush"
@@ -13,12 +13,12 @@ local palette
 palette = util.palette_extend({
 	bg = hsluv "#000000",
 	fg = hsluv "#ebdbb2",
-	rose = hsluv "#fb4934",
-	leaf = hsluv "#b8bb26",
-	wood = hsluv "#fabd2f",
+	rose = hsluv "#e3716e",
+	leaf = hsluv "#8bae68",
+	wood = hsluv "#f0e4cf",
 	water = hsluv "#83a598",
-	blossom = hsluv "#d3869b",
-	sky = hsluv "#83c07c",
+	blossom = hsluv "#b279a7",
+	sky = hsluv "#819b69",
 }, bg)
 
 -- Generate the lush specs using the generator util

init.lua

@@ -581,3 +581,4 @@ end
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
 require("settings")
+vim.cmd([[colorscheme jpbones]])

lua/custom/plugins/init.lua

@@ -3,69 +3,15 @@
 return {
   -- [[ Eyecandy & fancy prgramming stuff ]]
 
-  -- [[ Colorscheme ]]
   {
-    'habamax/vim-alchemist',
+    "mcchrish/zenbones.nvim",
+    dependencies = "rktjmp/lush.nvim",
+    priority = 1000,
     config = function()
-      vim.g.alchemist_transp_bg = true
-      vim.g.alchemist_transp_bg = true
-      vim.cmd [[colorscheme alchemist]]
+      vim.g.zenbones_transparent_background = true
+      vim.cmd [[colorscheme jpbones]]
     end
   },
-  -- {
-  --
-
-  --   name = "moonfly",
-  --   lazy = false,
-  --   priority = 1000,
-  --   config = function()
-  --     vim.cmd [[colorscheme moonfly]]
-  --     vim.g.moonflytransparent = true
-  --     vim.g.moonflyItalics = false
-  --   end
-  -- },
-  -- {
-  --   "catppuccin/nvim",
-  --   name = "catppuccin",
-  --   priority = 1000,
-  --   config = function()
-  --     require("catppuccin").setup({
-  --       flavour = "frappe", -- latte, frappe, macchiato, mocha
-  --       background = {      -- :h background
-  --         light = "latte",
-  --         dark = "frappe",
-  --       },
-  --       transparent_background = true, -- disables setting the background color.
-  --       show_end_of_buffer = false,    -- shows the '~' characters after the end of buffers
-  --       term_colors = false,           -- sets terminal colors (e.g. `g:terminal_color_0`)
-  --       dim_inactive = {
-  --         enabled = false,             -- dims the background color of inactive window
-  --         shade = "dark",
-  --         percentage = 0.15,           -- percentage of the shade to apply to the inactive window
-  --       },
-  --       no_italic = false,             -- Force no italic
-  --       no_bold = false,               -- Force no bold
-  --       no_underline = false,          -- Force no underline
-  --       styles = {                     -- Handles the styles of general hi groups (see `:h highlight-args`):
-  --         comments = { "italic" },     -- Change the style of comments
-  --         conditionals = { "italic" },
-  --         loops = {},
-  --         functions = { "italic", "bold" },
-  --         keywords = {},
-  --         strings = { "italic" },
-  --         variables = { "italic" },
-  --         numbers = {},
-  --         booleans = {},
-  --         properties = { "italic" },
-  --         types = {},
-  --         operators = {},
-  --       },
-  --     })
-  --
-  --     -- setup must be called before loading
-  --     vim.cmd.colorscheme "catppuccin"
-  --   end
-  -- },
   --
   {
     "folke/trouble.nvim",

lua/settings.lua

@@ -1,4 +1,4 @@
--- Personal Configuration keymaps etc.
+-- Personal Configuration keymaps
 -- Variables declarations
 
 -- [[ Setting options ]]
@@ -24,6 +24,8 @@ vim.o.undofile = true
 -- Case insensitive searching UNLESS /C or capital in search
 vim.o.ignorecase = true
 vim.o.smartcase = true
+vim.cmd([[highlight clear LineNr]])
+vim.cmd([[highlight clear SignColumn]])
 
 -- Decrease update time
 vim.o.updatetime = 250
@@ -32,7 +34,7 @@ vim.opt.showmode = false
 
 -- Set colorscheme
 vim.o.termguicolors = true
--- vim.cmd([[colorscheme habamax]])
+vim.cmd([[colorscheme jpbones]])
 
 local map = vim.api.nvim_set_keymap
 local opts = { noremap = true, silent = true }
@@ -58,11 +60,6 @@ vim.opt.cursorline = false
 -- Do not load tohtml.vim
 vim.g.loaded_2html_plugin = 1
 
-vim.cmd([[let g:neorg_syntax_code_list = {
-      \ 'python': ['python'],
-      \ 'bash': ['sh', 'bash'],
-      \ }]])
-
 -- Tabs keys
 vim.opt.tabstop = 4
 vim.opt.softtabstop = 4

lua/statusline.lua

@@ -0,0 +1,90 @@
+-- INI STATUSLINE
+-- local util = require('creativenull.utils')
+vim.opt.showmode = false
+vim.opt.laststatus = 2
+local CTRL_v = vim.api.nvim_replace_termcodes('<C-v>', true, true, true)
+local CTRL_s = vim.api.nvim_replace_termcodes('<C-s>', true, true, true)
+local modes = setmetatable({
+    ["n"]    = "[NORMAL]",
+    ["i"]    = "[INSERT]",
+    ["R"]    = "[REPLACE]",
+    ["v"]    = "[VISUAL]",
+    ["V"]    = "[V-LINE]",
+    [CTRL_v] = "[V-BLOCK]",
+    ["c"]    = "[COMMAND]",
+    ["s"]    = "[SELECT]",
+    ["S"]    = "[S-LINE]",
+    [CTRL_s] = "[S-BLOCK]",
+    ["t"]    = "[TERMINAL]",
+}, {
+    __index = function()
+        return "UNKNOWN "
+    end
+})
+
+function GitBranch()
+    local cmd = 'git branch --show-current'
+
+    local is_dir = util.is_dir(vim.fn.getcwd() .. '/.git')
+    if not is_dir then
+        return ''
+    end
+
+    local fp = io.popen(cmd)
+    local branch = fp:read('*a')
+
+    -- TODO:
+    -- Will need to check if the '^@' chars are at the end
+    -- instead of implicitly removing the last 2 chars
+    branch = string.sub(branch, 0, -2)
+    return branch
+end
+
+local get_current_mode = function()
+    local current_mode = vim.api.nvim_get_mode().mode
+    return string.format("%s", modes[current_mode])
+end
+
+local file_type = function()
+    local v_ft = vim.bo.filetype
+    if v_ft == nil or v_ft == "" then
+        return string.format("%s", "no ft")
+    else
+        return string.format("%s", v_ft)
+    end
+end
+
+local file_format = function()
+    return string.format("%s", vim.bo.fileformat)
+end
+
+local file_enc = function()
+    local v_fenc = vim.bo.fileencoding
+    if v_fenc == nil or v_fenc == "" then
+        return string.format("%s", vim.go.encoding)
+    else
+        return string.format("%s", v_fenc)
+    end
+end
+
+Statusline = function()
+    return table.concat {
+        get_current_mode(),
+        "%r %t %m",
+        "%=",
+        file_format(),
+        "|",
+        file_enc(),
+        "|",
+        file_type(),
+        "|",
+        "%3p%%",
+        "|",
+        "%l,%c",
+        ""
+    }
+end
+
+vim.opt.statusline = "%!v:lua.Statusline()"
+
+-- FIN STATUSLINE