diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index d8e487e..8211c15 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -2,7 +2,6 @@ "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, "cp.nvim": { "branch": "main", "commit": "029ea125b97320ff5c2884bf84bf5aa4e7077c79" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, - "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "fzf-lua": { "branch": "main", "commit": "fb8c50ba62a0daa433b7ac2b78834f318322b879" }, "guard.nvim": { "branch": "main", "commit": "addb8d2f40662b8b62d60dd7d18f503beb2332e7" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, @@ -14,7 +13,6 @@ "mini.bufremove": { "branch": "main", "commit": "10857aa39160c127694151828914df3131ba83b6" }, "mini.misc": { "branch": "main", "commit": "b647b64321c34d4868d158282bb89e49f0d6838b" }, "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" }, - "neogit": { "branch": "master", "commit": "75ca811db3ca3e43137596d25d26e57331540ee0" }, "nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" }, "nvim-lspconfig": { "branch": "master", "commit": "f4e9d367d4e067d7a5fabc9fd3f1349b291eb718" }, "nvim-navic": { "branch": "master", "commit": "f5eba192f39b453675d115351808bd51276d9de5" }, @@ -24,7 +22,6 @@ "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" }, "oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" }, "overseer.nvim": { "branch": "master", "commit": "392093e610333c0aea89bf43de7362e25783eada" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" }, "typst-preview.nvim": { "branch": "master", "commit": "e123a7ab64e52d836e00dea9251e85b201f38966" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index 798cdc7..9ead7a6 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -61,10 +61,6 @@ return { { dir = '~/dev/diffs.nvim', enabled = true, - dependencies = { - 'NeogitOrg/neogit', - 'sindrets/diffview.nvim', - }, init = function() vim.g.diffs = { fugitive = true, @@ -83,23 +79,6 @@ return { } end, }, - { - 'NeogitOrg/neogit', - dependencies = { - 'nvim-lua/plenary.nvim', - 'sindrets/diffview.nvim', - }, - cmd = 'Neogit', - opts = { - integrations = { - diffview = true, - }, - }, - }, - { - 'sindrets/diffview.nvim', - cmd = { 'DiffviewOpen', 'DiffviewFileHistory' }, - }, { 'ibhagwan/fzf-lua', keys = { diff --git a/home/modules/ui.nix b/home/modules/ui.nix index 63109f8..5c32f80 100644 --- a/home/modules/ui.nix +++ b/home/modules/ui.nix @@ -51,7 +51,7 @@ in }; home.packages = with pkgs; [ - nerd-fonts.symbols-only + nerd-fonts.jetbrains-mono papirus-icon-theme psmisc fuzzel @@ -189,7 +189,7 @@ in @import url("${config.xdg.configHome}/waybar/themes/theme.css"); * { - font-family: "Symbols Nerd Font", "SF Pro Display", sans-serif; + font-family: "JetBrainsMono Nerd Font", "SF Pro Display", sans-serif; font-size: 14px; border: none; border-radius: 0;