Merge branch 'master' into laptop

alacritty/alacritty.toml

@@ -23,22 +23,22 @@ background = "#000010"
 foreground = "#F8F8F2"
 
 [font]
-size = 14
+size = 13
 
 [font.bold]
-family = "Source Code Pro"
+family = "Iosevka Term Extended"
 style = "Bold"
 
 [font.bold_italic]
-family = "Source Code Pro"
+family = "Iosevka Term Extended"
 style = "Bold Italic"
 
 [font.italic]
-family = "Source Code Pro"
+family = "Iosevka Term Extended"
 style = "Italic"
 
 [font.normal]
-family = "Source Code Pro"
+family = "Iosevka Term Extended"
 style = "Regular"
 
 [[keyboard.bindings]]
@@ -107,4 +107,4 @@ history = 10000
 [window]
 dynamic_padding = true
 dynamic_title = true
-opacity = 0.5
+opacity = 0.3

nvim/lazy-lock.json

@@ -11,24 +11,24 @@
   "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
-  "lush.nvim": { "branch": "main", "commit": "e8a58f36c256af65cda36878f6f2024a612154c3" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" },
   "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
-  "neogit": { "branch": "master", "commit": "760d6d74c328ce2a38b02677bf5161999b992da2" },
+  "neogit": { "branch": "master", "commit": "e43e6824c6ccf1d1d246f0cda7870c4a8d9d6dad" },
   "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
-  "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e47ccfae775f0d572ef0f3a7d245f043b259dafc" },
   "nvim-snippy": { "branch": "master", "commit": "7c8f18e90cad4f56c4e22a49101668735639f286" },
   "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" },
   "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
   "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" },
-  "oil.nvim": { "branch": "master", "commit": "a128e6f75c6a71b7b9ac7ea663949a5209771cd5" },
+  "oil.nvim": { "branch": "master", "commit": "c4cc8240f1c71defcb67c45da96e44b968d29e5f" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
-  "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" },
-  "tree-sitter-hypr": { "branch": "master", "commit": "9bd008f08ffbfb94146ce9d4f31002de66f0e627" },
+  "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" },
+  "tokyodark.nvim": { "branch": "master", "commit": "b6f365cf5b6a2a2fa7de2578ca047db0721335ec" },
+  "tree-sitter-hypr": { "branch": "master", "commit": "42aa7274b5f093cec92b7a5bab629ba26b4be439" },
   "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" },

nvim/lua/mappings.lua

@@ -16,7 +16,7 @@ vim.keymap.set({"n", "v"}, "<leader>Y", [["+Y]])
 vim.keymap.set("n", "<Tab>", "<Nop>", { noremap = true })
 vim.keymap.set("n", "<leader><space>", ":noh<cr>", { noremap = true, silent = true })
 vim.keymap.set("n", "gn", ":n<cr>", { noremap = true, silent = true })
-vim.keymap.set("n", "<leader>d", require("trouble").open, { noremap = true, silent = true })
+vim.keymap.set("n", "<leader>d", require("trouble").toggle, { noremap = true, silent = true })
 vim.keymap.set("n", "gi", ":ClangdSwitchSourceHeader<cr>", { noremap = true, silent = true })
 vim.keymap.set("n", "<leader>t", ":NvimTreeFindFileToggle<cr>", { noremap = true, silent = true })
 vim.keymap.set("n", "-", require("oil").open, { desc = "Open parent directory" })

nvim/lua/plugins.lua

@@ -19,6 +19,12 @@ require('lazy').setup({
     'luckasRanarison/tree-sitter-hypr',
     'debugloop/telescope-undo.nvim',
     'mhartington/formatter.nvim',
+    -- {'projekt0n/github-nvim-theme', config = function ()
+    --     vim.cmd('colorscheme github_dark_default')
+    -- end},
+    {"tiagovla/tokyodark.nvim", config = function ()
+        vim.cmd("colorscheme tokyodark")
+    end},
     {'vimwiki/vimwiki', init = function ()
         vim.g.vimwiki_list = {{path = '~/Workspace/DnD/Lumentis Campaign Setting/', syntax = 'markdown', ext = '.md'}}
         vim.g.vimwiki_key_mappings = { table_mappings = 0 }
@@ -58,5 +64,5 @@ require('lazy').setup({
     {'nvim-tree/nvim-tree.lua', dependencies = {'nvim-tree/nvim-web-devicons'}, tag = 'nightly'},
     {'nvim-treesitter/nvim-treesitter', build = ":TSUpdate"},
     {'williamboman/mason-lspconfig.nvim', dependencies = {'williamboman/mason.nvim', 'neovim/nvim-lspconfig'}},
-    {dir = '~/.config/nvim/colorschemes/material', dependencies= {"rktjmp/lush.nvim"}, config = function () vim.cmd("colorscheme material") end},
+    -- {dir = '~/.config/nvim/colorschemes/material', dependencies= {"rktjmp/lush.nvim"}, config = function () vim.cmd("colorscheme material") end},
 })

nvim/lua/settings.lua

@@ -32,7 +32,7 @@ vim.opt.termguicolors = true
 vim.opt.wildmode = {"longest", "list"}
 vim.g.mapleader = ","
 vim.g.python_highlight_all = 1
-vim.wo.signcolumn = "number"
+vim.wo.signcolumn = "yes"
 vim.wo.relativenumber = true
 vim.g.rooter_patterns = {".git", "Makefile", "CMakeLists.txt", "build/", "meson.build"}
 vim.g.rooter_silent_chdir = 1