morta

morta morta + lualine fix lualine + morta
philosofonusus · Jan 7, 2025 · 8ab62dc · 8ab62dc
1 parent db47b7a
commit 8ab62dc
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 49 deletions.
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -2,7 +2,6 @@
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
   "cmp-buffer": { "branch": "main", "commit": "11159370b51495c9848b0b6bb2b933df27672a7a" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "32a511e862811db68c894b541bdc7546ce552e50" },
   "cmp-nvim-lua": { "branch": "main", "commit": "e7823d08c5072e8390fef3be4bcabce702c8cab5" },
@@ -16,10 +15,10 @@
   "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
   "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
   "harpoon-lualine": { "branch": "master", "commit": "eae10bc6bddddbc73daa0956ba4ee5cc29cf9a49" },
-  "lazy.nvim": { "branch": "main", "commit": "72aa3a2624be5dc240646084f7b6a38eb99eb2ce" },
+  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
   "lspsaga.nvim": { "branch": "main", "commit": "5fce15331ac6c3a3ec3ac91ab0e85ed82f5cbba0" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.bracketed": { "branch": "main", "commit": "1d1c774b5dcc9a55af3bfbd977571c31c4054223" },
@@ -30,19 +29,19 @@
   "neotest-plenary": { "branch": "master", "commit": "3523adcf9ffaad1911960c5813b0136c1b63a2ec" },
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
   "nvim-bqf": { "branch": "main", "commit": "ebb6d2689e4427452180f17c53f29f7e460236f1" },
-  "nvim-cmp": { "branch": "main", "commit": "e9a8078bd0465444328cffc7fd4bcd04d63d3fbf" },
-  "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
-  "nvim-lspconfig": { "branch": "master", "commit": "f4ed656e876e45cf914d7beb972830561178e232" },
+  "nvim-cmp": { "branch": "main", "commit": "af655022cc86cb91cb00852afbcf5dec1b7707c3" },
+  "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
-  "nvim-treesitter": { "branch": "master", "commit": "57713d079c3c2afcc31f3e0650bf8594a2a296ba" },
+  "nvim-treesitter": { "branch": "master", "commit": "622a4a6ba76d1de52b72a965159213ae655b4ac7" },
   "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
   "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "oil.nvim": { "branch": "master", "commit": "c12fad2d225d8f81fadd48521d253607fe25465c" },
+  "oil.nvim": { "branch": "master", "commit": "a6a4f48b14b4a51fded531c86f6c04b4503a2ef8" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "snacks.nvim": { "branch": "main", "commit": "b5f4f27b28f7803509739bfde93dc0b8a953f3f4" },
+  "snacks.nvim": { "branch": "main", "commit": "14e89401da348f5d14509fca164fb7bcec83e597" },
   "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
   "tailwind-sorter.nvim": { "branch": "main", "commit": "717e5c9761ed8334dadbb9357df7d826aae97b92" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
@@ -55,7 +54,7 @@
   "typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
   "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" },
   "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "7f77c330df5f38b5ed11220c1f6622b61fd0149e" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "95cbcf21ea7a5c8c025f387280c2e261b8cb3a89" },
   "vim-dadbod-ui": { "branch": "master", "commit": "65454e2011c029922c2c972d63f8bf04282de033" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
   "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }

diff --git a/lua/plugins/catpuccin.lua b/lua/plugins/catpuccin.lua
diff --git a/lua/plugins/comments.lua b/lua/plugins/comments.lua
@@ -35,16 +35,31 @@ return {
         end,
         desc = 'Delete Log statements',
       },
+      {
+        '<leader>glw',
+        function()
+          require('timber.actions').insert_log { template = 'watcher', position = 'below' }
+        end,
+        desc = 'Insert Watcher Log Statement',
+      },
     },
     config = function()
       require('timber').setup {
-        log_marker = '🪵',
+        log_templates = {
+          watcher = {
+            javascript = [[console.log('%watcher_marker_start', %log_target, '%watcher_marker_end')]],
+            typescript = [[console.log('%watcher_marker_start', %log_target, '%watcher_marker_end')]],
+            jsx = [[console.log('%watcher_marker_start', %log_target, '%watcher_marker_end')]],
+            tsx = [[console.log('%watcher_marker_start', %log_target, '%watcher_marker_end')]],
+          },
+        },
         log_watcher = {
           enabled = true,
           sources = {
-            neotest = {
-              type = 'neotest',
-              name = 'Neotest',
+            ts = {
+              type = 'filesystem',
+              name = 'Log file',
+              path = '/tmp/metro.log',
             },
           },
           preview_snippet_length = 32,

diff --git a/lua/plugins/lspsaga.lua b/lua/plugins/lspsaga.lua
@@ -13,9 +13,6 @@ return {
     },
     config = function()
       require('lspsaga').setup {
-        ui = {
-          kind = require('catppuccin.groups.integrations.lsp_saga').custom_kind(),
-        },
         lightbulb = {
           sign = false,
         },

diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
@@ -35,7 +35,7 @@ return {
     config = function()
       require('lualine').setup {
         options = {
-          theme = 'catppuccin',
+          globalstatus = true,
         },
         extensions = {
           'lazy',

diff --git a/lua/plugins/morta.lua b/lua/plugins/morta.lua
@@ -0,0 +1,11 @@
+return {
+  {
+    dir = '~/projects/morta',
+    name = 'morta',
+    priority = 1000,
+    opts = {},
+    config = function()
+      vim.cmd.colorscheme 'morta'
+    end,
+  },
+}