using tokyonight as theme

lazy-lock.json

@@ -4,28 +4,28 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "48bc9996ebfe90e7766f46338360f75fd6ecb174" },
+  "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" },
   "fidget.nvim": { "branch": "main", "commit": "7dc62b9ce32ac0f21cfb510f243644ce28a39299" },
   "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
-  "gitsigns.nvim": { "branch": "main", "commit": "87640f5a877b18bdd49884dbcac220fed924b867" },
+  "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
   "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
-  "neo-tree.nvim": { "branch": "main", "commit": "9298c1b7a52e63ed4fd977fd792a0d4afe9260d5" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" },
   "neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" },
   "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" },
+  "neovim": { "branch": "main", "commit": "2a4aad89a803c84d7d1555d136639cd48ade1d64" },
   "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" },
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
   "nvim-lspconfig": { "branch": "master", "commit": "511609ae0311abfcfaed3c398429a147e895ce2c" },
-  "nvim-treesitter": { "branch": "master", "commit": "7958ff9ec7a2baea2842323d0e7ac67a509da4d2" },
+  "nvim-treesitter": { "branch": "master", "commit": "f861bc6148e7bc715f6a09bd34bb1f577b62a248" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
-  "rose-pine": { "branch": "main", "commit": "2a4aad89a803c84d7d1555d136639cd48ade1d64" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "vim-deus": { "branch": "master", "commit": "1be965e7bc1c01e7db5e46dcd0e50d32d4eef434" },
+  "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
   "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
   "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },

lua/custom/plugins/rose-pine.lua

@@ -1,75 +1,80 @@
 return {
-  'rose-pine/neovim',
+  'folke/tokyonight.nvim',
-  name = 'rose-pine',
+  lazy = false,
-
+  priority = 1000,
+  opts = {},
   config = function()
-    require('rose-pine').setup {
+    vim.cmd [[colorscheme tokyonight-moon]]
-      variant = 'moon', -- auto, main, moon, or dawn
+  end,
-      dark_variant = 'moon', -- main, moon, or dawn
+}
-      dim_inactive_windows = false,
-      extend_background_behind_borders = true,
 
-      styles = {
+--   config = function()
-        bold = true,
+--     require('rose-pine').setup {
-        italic = true,
+--       variant = 'moon', -- auto, main, moon, or dawn
-        transparency = false,
+--       dark_variant = 'moon', -- main, moon, or dawn
-      },
+--       dim_inactive_windows = false,
-
+--       extend_background_behind_borders = true,
-      groups = {
-        border = 'muted',
-        link = 'iris',
-        panel = 'surface',
-
-        error = 'love',
-        hint = 'iris',
-        info = 'foam',
-        warn = 'gold',
-
-        git_add = 'foam',
-        git_change = 'rose',
-        git_delete = 'love',
-        git_dirty = 'rose',
-        git_ignore = 'muted',
-        git_merge = 'iris',
-        git_rename = 'pine',
-        git_stage = 'iris',
-        git_text = 'rose',
-        git_untracked = 'subtle',
-
-        headings = {
-          h1 = 'iris',
-          h2 = 'foam',
-          h3 = 'rose',
-          h4 = 'gold',
-          h5 = 'pine',
-          h6 = 'foam',
-        },
-        -- Alternatively, set all headings at once.
-        -- headings = "subtle",
-      },
-
-      highlight_groups = {
-        -- Comment = { fg = "foam" },
-        -- VertSplit = { fg = "muted", bg = "muted" },
-      },
-
-      before_highlight = function(group, highlight, palette)
-        -- Disable all undercurls
-        -- if highlight.undercurl then
-        --     highlight.undercurl = false
-        -- end
 --
-        -- Change palette colour
+--       styles = {
-        -- if highlight.fg == palette.pine then
+--         bold = true,
-        --     highlight.fg = palette.foam
+--         italic = true,
-        -- end
+--         transparency = false,
-      end,
+--       },
-    }
+--
-
+--       groups = {
-    vim.cmd 'colorscheme rose-pine'
+--         border = 'muted',
-  end,
+--         link = 'iris',
-}
+--         panel = 'surface',
-
+--
+--         error = 'love',
+--         hint = 'iris',
+--         info = 'foam',
+--         warn = 'gold',
+--
+--         git_add = 'foam',
+--         git_change = 'rose',
+--         git_delete = 'love',
+--         git_dirty = 'rose',
+--         git_ignore = 'muted',
+--         git_merge = 'iris',
+--         git_rename = 'pine',
+--         git_stage = 'iris',
+--         git_text = 'rose',
+--         git_untracked = 'subtle',
+--
+--         headings = {
+--           h1 = 'iris',
+--           h2 = 'foam',
+--           h3 = 'rose',
+--           h4 = 'gold',
+--           h5 = 'pine',
+--           h6 = 'foam',
+--         },
+--         -- Alternatively, set all headings at once.
+--         -- headings = "subtle",
+--       },
+--
+--       highlight_groups = {
+--         -- Comment = { fg = "foam" },
+--         -- VertSplit = { fg = "muted", bg = "muted" },
+--       },
+--
+--       before_highlight = function(group, highlight, palette)
+--         -- Disable all undercurls
+--         -- if highlight.undercurl then
+--         --     highlight.undercurl = false
+--         -- end
+--         --
+--         -- Change palette colour
+--         -- if highlight.fg == palette.pine then
+--         --     highlight.fg = palette.foam
+--         -- end
+--       end,
+--     }
+--
+--     vim.cmd [[colorscheme tokyonight]]
+--   end,
+-- }
 
 -- {
 --   'ajmwagar/vim-deus'
@@ -97,7 +102,3 @@ return {
 --     },
 --   },
 -- },
-
-
-
-