diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json new file mode 100644 index 0000000..1950782 --- /dev/null +++ b/config/nvim/lazy-lock.json @@ -0,0 +1,4 @@ +{ + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "midnight.nvim": { "branch": "main", "commit": "fe062a6f2e5bd77cd8a260f61e6e12789eaf4f13" } +} diff --git a/config/nvim/lua/plugins/dev.lua b/config/nvim/lua/plugins/dev.lua index 70884ae..cafe2bd 100644 --- a/config/nvim/lua/plugins/dev.lua +++ b/config/nvim/lua/plugins/dev.lua @@ -154,12 +154,16 @@ return { before = function() vim.g.pending = { debug = true, - -- TODO: use date formats/personal rice data_path = (os.getenv('XDG_STATE_HOME') or (os.getenv('HOME') .. '/.local/state')) .. '/nvim/pending/tasks.json', + date_format = '%d/%m/%y', + date_syntax = 'd', + recur_syntax = 'r', + input_date_formats = { '%d/%m/%Y', '%d/%m/%y' }, + drawer_height = vim.o.lines, } end, cmd = 'Pending', - keys = { { 'P', 'Pending' } }, + keys = { { 'P', 'Pending|only' } }, }, { 'barrettruth/cp.nvim', diff --git a/config/nvim/plugin/options.lua b/config/nvim/plugin/options.lua index e78c3ed..8dc26aa 100644 --- a/config/nvim/plugin/options.lua +++ b/config/nvim/plugin/options.lua @@ -1,25 +1,24 @@ -local o, opt = vim.o, vim.opt +vim.o.autoread = true +vim.o.autowrite = true -o.autoread = true -o.autowrite = true +vim.o.breakindent = true -o.breakindent = true +vim.o.cursorline = true -o.cursorline = true +vim.opt.diffopt:append('linematch:60') -opt.diffopt:append('linematch:60') +vim.o.expandtab = true -o.expandtab = true +vim.o.exrc = true +vim.o.secure = true -o.exrc = true -o.secure = true +vim.o.foldcolumn = 'auto' +vim.o.foldexpr = 'v:lua.vim.treesitter.foldexpr()' +vim.o.foldlevel = 99 +vim.o.foldmethod = 'expr' +vim.o.foldtext = '' -o.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -o.foldlevel = 99 -o.foldmethod = 'expr' -o.foldtext = '' - -opt.fillchars = { +vim.opt.fillchars = { eob = ' ', vert = '│', diff = '╱', @@ -29,56 +28,53 @@ opt.fillchars = { foldinner = ' ', } -opt.iskeyword:append('-') +vim.opt.iskeyword:append('-') -o.laststatus = 3 +vim.o.laststatus = 3 -o.linebreak = true +vim.o.linebreak = true -o.list = true -opt.listchars = { +vim.o.list = true +vim.opt.listchars = { space = ' ', trail = '·', } -opt.matchpairs:append('<:>') +vim.opt.matchpairs:append('<:>') -o.number = true -o.relativenumber = true -o.signcolumn = 'no' +vim.o.number = true +vim.o.relativenumber = true +vim.o.signcolumn = 'no' -o.statuscolumn = '%s%C %=%{v:relnum?v:relnum:v:lnum} ' -o.statusline = " %{len(expand('%'))?expand('%:~').' ':''}%h%m%r%=%c:%l/%L " +vim.o.statuscolumn = '%s%C %=%{v:relnum?v:relnum:v:lnum} ' +vim.o.statusline = " %{len(expand('%'))?expand('%:~').' ':''}%h%m%r%=%c:%l/%L " -opt.path:append('**') +vim.opt.path:append('**') -o.scrolloff = 8 +vim.o.scrolloff = 8 -o.shiftwidth = 2 +vim.o.shiftwidth = 2 -opt.shortmess:append('acCIs') +vim.opt.shortmess:append('acCIs') -o.showtabline = 0 - -o.spellfile = (vim.env.XDG_DATA_HOME or (vim.env.HOME .. '/.local/share')) +vim.o.spellfile = (vim.env.XDG_DATA_HOME or (vim.env.HOME .. '/.local/share')) .. '/nvim/spell.encoding.add' -o.splitkeep = 'screen' +vim.o.splitkeep = 'screen' -o.splitbelow = true -o.splitright = true +vim.o.splitbelow = true +vim.o.splitright = true -o.swapfile = false +vim.o.swapfile = false -o.termguicolors = true +vim.o.termguicolors = true -o.undodir = (vim.env.XDG_DATA_HOME or (vim.env.HOME .. '/.local/share')) +vim.o.undodir = (vim.env.XDG_DATA_HOME or (vim.env.HOME .. '/.local/share')) .. '/nvim/undo' -o.undofile = true +vim.o.undofile = true -o.updatetime = 50 +vim.o.updatetime = 50 -o.winborder = 'single' -o.winbar = '' +vim.o.winborder = 'single' -o.wrap = false +vim.o.wrap = false diff --git a/home/modules/terminal.nix b/home/modules/terminal.nix index 810437d..097b638 100644 --- a/home/modules/terminal.nix +++ b/home/modules/terminal.nix @@ -9,7 +9,7 @@ programs.ghostty = { enable = true; settings = { - font-family = "Zen Mono"; + font-family = "Zed Mono"; font-codepoint-map = "U+f101-U+f25c=nonicons"; font-feature = "-calt"; font-size = 20;