update vim and ghostty colorschemes

diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config
index d9df56aa4e9bfafab56716b1684e7f4255f2d084..da4ae72775501f0026b638d515c7f8c8353807df 100644 (file)
--- a/ghostty/.config/ghostty/config
+++ b/ghostty/.config/ghostty/config
@@ -1,12 +1,14 @@
-theme = Sakura
+# theme = Sakura
+theme = Builtin Light
 copy-on-select = true
 adjust-cell-height = 10
 quit-after-last-window-closed = true
 
 # ==== Font
 #
-font-family = Hasklug Nerd Font Mono
+# font-family = Hasklug Nerd Font Mono
 font-size = 15
+font-family = mononoki
 
 # ==== Cursor
 #

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index ad5f1f7a21cf25dfbd3d2af33372c57f92ae817f..50e7329e39f4363be136da9f7e967262ea961be5 100644 (file)
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,27 +1,26 @@
 {
   "ghcid": { "branch": "master", "commit": "daf89d0ca7430f2abbc2c9175ab1e89ab1fc9926" },
-  "gitsigns.nvim": { "branch": "main", "commit": "f2ce545601fdeb755e91470b25a55705639586a4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" },
   "mini.test": { "branch": "main", "commit": "22f98a71ca0a05e67cddcab9e476e8e0af6a8c19" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-dap": { "branch": "master", "commit": "4f5deb110d9ff8994d96c21df95e2271d11214f9" },
+  "nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" },
   "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9ccd58a7949091c0cc2777d4e92a45a209c808c1" },
+  "nvim-grey": { "branch": "main", "commit": "62d268a3e582b846f5c20a895a07bd7d563e9db9" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8fde495949782bb61c2605174e231d145a048d8c" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
-  "nvim-tree.lua": { "branch": "master", "commit": "31503ad5d869fca61461d82a9126f62480ecb0ab" },
+  "nvim-tree.lua": { "branch": "master", "commit": "24cfcc94372e526fd9e1c2803ede9e0f1715e33f" },
   "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8fe8a95630f4f2c72a87ba1927af649e0bfaa244" },
-  "nvim-web-devicons": { "branch": "master", "commit": "40e9d5a6cc3db11b309e39593fc7ac03bb844e38" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
   "one-small-step-for-vimkind": { "branch": "main", "commit": "1af6ffb9b5229a856e8090fa2f690e0931a5aace" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "sakura.nvim": { "branch": "main", "commit": "9ec556973513700f6ad3fe816bd1ae6ceebabb3f" },
+  "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
+  "sakura.nvim": { "branch": "main", "commit": "8976e8278e3b6155a949ef7fed9720d6422ba9fe" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "vim-stylish-haskell": { "branch": "master", "commit": "60a59fd767956c40372b5aeab2d68a0a953ebb2b" },
-  "vscode-js-debug": { "branch": "main", "commit": "c3715e0be6923bd7a607ac26c6318859bc0f0411" }
+  "vim-stylish-haskell": { "branch": "master", "commit": "60a59fd767956c40372b5aeab2d68a0a953ebb2b" }
 }

diff --git a/nvim/.config/nvim/lua/autocmds.lua b/nvim/.config/nvim/lua/autocmds.lua
index ac77c6f81b939c030c306a92a97fdb829d95402e..638bca4308bd20e51f67f336ea749f4ed305a407 100644 (file)
--- a/nvim/.config/nvim/lua/autocmds.lua
+++ b/nvim/.config/nvim/lua/autocmds.lua
@@ -17,3 +17,11 @@ vim.api.nvim_create_autocmd("BufEnter", {
     })
   end,
 })
+
+vim.cmd([[
+  augroup TransparentBackground
+    autocmd!
+    autocmd ColorScheme * highlight Normal ctermbg=none guibg=none
+    autocmd ColorScheme * highlight NonText ctermbg=none guibg=none
+  augroup END
+]])

diff --git a/nvim/.config/nvim/lua/options.lua b/nvim/.config/nvim/lua/options.lua
index d61fc8ab599dfd96ea06cdd767bb54a46b37eeaa..7cb4a2a18d85c10138383a207a3a40005d39415a 100644 (file)
--- a/nvim/.config/nvim/lua/options.lua
+++ b/nvim/.config/nvim/lua/options.lua
@@ -20,6 +20,3 @@ vim.o.termguicolors = true
 -- Netrw
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
-
--- vim.cmd('colorscheme vim')
-

diff --git a/nvim/.config/nvim/lua/plugins/colors.lua b/nvim/.config/nvim/lua/plugins/colors.lua
new file mode 100644 (file)
index 0000000..f5f736a
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/colors.lua
@@ -0,0 +1,17 @@
+return {
+  {
+    "anAcc22/sakura.nvim",
+    dependencies = "rktjmp/lush.nvim",
+    config = function()
+        vim.opt.background = "dark"
+        -- vim.cmd('colorscheme sakura')
+    end
+  },
+  {
+    'yorickpeterse/nvim-grey',
+    config = function()
+      vim.cmd('colorscheme grey')
+      vim.cmd('set background=light')
+    end
+  }
+}

diff --git a/nvim/.config/nvim/lua/plugins/dap.lua b/nvim/.config/nvim/lua/plugins/dap.lua
index 30f1c4375c6479c3ad91847291ae4268d4a81fb8..27e738b305094f128f51b662368be38f4f8c6603 100644 (file)
--- a/nvim/.config/nvim/lua/plugins/dap.lua
+++ b/nvim/.config/nvim/lua/plugins/dap.lua
@@ -39,17 +39,17 @@ return {
         opts = { virt_text_pos = 'eol' },
       },
       -- JS/TS debugging.
-      {
-        'mxsdev/nvim-dap-vscode-js',
-        opts = {
-          debugger_path = vim.fn.stdpath 'data' .. '/lazy/vscode-js-debug',
-          adapters = { 'pwa-node', 'pwa-chrome', 'pwa-msedge', 'node-terminal', 'pwa-extensionHost' },
-        },
-      },
-      {
-        'microsoft/vscode-js-debug',
-        build = 'npm i && npm run compile vsDebugServerBundle && rm -rf out && mv -f dist out',
-      },
+      -- {
+      --   'mxsdev/nvim-dap-vscode-js',
+      --   opts = {
+      --     debugger_path = vim.fn.stdpath 'data' .. '/lazy/vscode-js-debug',
+      --     adapters = { 'pwa-node', 'pwa-chrome', 'pwa-msedge', 'node-terminal', 'pwa-extensionHost' },
+      --   },
+      -- },
+      -- {
+      --   'microsoft/vscode-js-debug',
+      --   build = 'npm i && npm run compile vsDebugServerBundle && rm -rf out && mv -f dist out',
+      -- },
       -- Lua adapter.
       {
         'jbyuki/one-small-step-for-vimkind',

diff --git a/nvim/.config/nvim/lua/plugins/sakura.lua b/nvim/.config/nvim/lua/plugins/sakura.lua
deleted file mode 100644 (file)
index 793faf7..0000000
--- a/nvim/.config/nvim/lua/plugins/sakura.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-return {
-    "anAcc22/sakura.nvim",
-    dependencies = "rktjmp/lush.nvim",
-    config = function()
-        vim.opt.background = "dark"
-        vim.cmd([[
-          augroup TransparentBackground
-            autocmd!
-            autocmd ColorScheme * highlight Normal ctermbg=none guibg=none
-            autocmd ColorScheme * highlight NonText ctermbg=none guibg=none
-          augroup END
-        ]])
-        vim.cmd('colorscheme sakura')
-    end
-}