Commit Diff


commit - ee9fa3b1d6f4fb7cddf0a468cf588bba29785265
commit + 45d6a7c6aabe0fe9e632f93c8105cdfda658f94b
blob - 7f8623780dcc67f599f338a4f8335cbe85684d9b
blob + d01610756a1e32db7ca615943db0b6e547921e6c
--- init.lua
+++ init.lua
@@ -11,8 +11,8 @@ require('lazy').setup({
     require('plugins/mini'),
     require('plugins/autopairs'),
     require('plugins/gitsigns'),
-    require('plugins/colors'),
 })
 
 require('config.options')
+require('config.colors')
 require('config.keymaps')
blob - c6971e5682b31865278c77bb83767e196fc94b17
blob + 9d11d191ea233190667dcb32f4bb75e359be14df
--- lazy-lock.json
+++ lazy-lock.json
@@ -1,17 +1,15 @@
 {
-  "conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "bef29b653ba71d442816bf56286c2a686210be04" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
-  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
-  "mini.nvim": { "branch": "main", "commit": "c3d398d8bfbd18ae24cb22a17cde1aaad3764cd3" },
-  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "b1d9a914b02ba5660f1e272a03314b31d4576fe2" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
+  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
+  "mini.nvim": { "branch": "main", "commit": "dce9bc4e19d02d5c37fe71c16f40f8a5536b0386" },
+  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
+  "nvim-lspconfig": { "branch": "master", "commit": "95fe3c170753238d3ca4f760e79a991400677abc" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "vim-plan9": { "branch": "master", "commit": "8263b2459ca48bc9dca6dad8fa34a28935426193" }
+  "telescope.nvim": { "branch": "master", "commit": "3a12a853ebf21ec1cce9a92290e3013f8ae75f02" }
 }
blob - /dev/null
blob + f9c5a3d106820a733e4c9dcdcdbacd7b42e028e4 (mode 644)
--- /dev/null
+++ lua/config/colors.lua
@@ -0,0 +1,14 @@
+vim.opt.termguicolors = true
+vim.opt.background = 'dark'
+vim.cmd.colorscheme('quiet')
+
+vim.api.nvim_set_hl(0, 'Keyword', { bold = true })
+vim.api.nvim_set_hl(0, 'Comment', { italic = true })
+vim.api.nvim_set_hl(0, 'Constant', { fg = '#999999' })
+vim.api.nvim_set_hl(0, 'Visual', { bg = '#555555' })
+vim.api.nvim_set_hl(0, 'NormalFloat', { bg = '#333333' })
+vim.api.nvim_set_hl(0, 'DiagnosticError', { fg = '#888888' })
+vim.api.nvim_set_hl(0, 'DiagnosticVirtualTextError', { fg = '#888888' })
+vim.api.nvim_set_hl(0, 'DiagnosticWarn', { fg = '#777777' })
+vim.api.nvim_set_hl(0, 'DiagnosticVirtualTextWarn', { fg = '#777777' })
+vim.api.nvim_set_hl(0, 'MatchParen', { fg = '#888888', bg = '#333333' })
blob - de83b4c8d0f3ce803ba92b72eccffdeb16d32111
blob + 4a26da6f36c522a3ba0fca626b55cfdbd20ed758
--- lua/config/options.lua
+++ lua/config/options.lua
@@ -61,3 +61,4 @@ vim.opt.scroll = 10
 -- This is done to sync terminal background with neovim background
 -- effectively hiding the padding
 MiniMisc.setup_termbg_sync()
+
blob - ce2ad6df6e8122f0e84d9f8dbb216254135f056c (mode 644)
blob + /dev/null
--- lua/custom/telescope.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-local M = {}
-
-local builtin = require('telescope.builtin')
-local previewers = require('telescope.previewers')
-
-function M.git_bcommits_with_preview()
-    local opts = {
-        git_log_args = {
-            '--pretty=format:%h %s (%cr) <%an>',
-            '--graph',
-        },
-    }
-
-    opts.previewer = {
-        previewers.git_commit_diff_to_parent.new(opts),
-        previewers.git_commit_message.new(opts),
-    }
-
-    builtin.git_bcommits(opts)
-end
-
-return M
blob - 20a6d9234038d8ecacd5471a113a28d449cc7f9e (mode 644)
blob + /dev/null
--- lua/plugins/colors.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-    'lunacookies/vim-plan9',
-    config = function()
-        vim.cmd.colorscheme('plan9')
-    end,
-}
blob - b803d15de173c9fcaf4cd20aa6eea05d5748e0c6
blob + 8e317f50e6c6ba3df8cd2269b88bde21863edc59
--- lua/plugins/conform.lua
+++ lua/plugins/conform.lua
@@ -11,6 +11,7 @@ return {
                 javascript = { 'prettier' },
                 vue = { 'prettier' },
                 python = { 'black' },
+                php = { 'pretty-php' },
             },
         },
     },