vim: use vim.env.HOME

1 files changed, 16 insertions, 13 deletions

diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 5fbd2a6..06ffabd 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -497,11 +497,9 @@ return require('packer').startup({function()
   use {'kristijanhusak/orgmode.nvim', -- {{{
     ft = {'org'},
     config = function()
-      local nnoremap = require('astronauta.keymap').nnoremap
-
       require('orgmode').setup {
-        org_agenda_files = {'$HOME/Documents/org/*.org'},
-        org_default_notes_file = '$HOME/Documents/org/todo.org',
+        org_agenda_files = {vim.env.HOME..'/Documents/org/*.org'},
+        org_default_notes_file = vim.env.HOME..'/Documents/org/todo.org',
         org_todo_keywords = {'TODO', 'DONE'},
         org_indent_mode = 'noindent',
         org_agenda_templates = {
@@ -512,27 +510,32 @@ return require('packer').startup({function()
           n = {
             description = 'Note',
             template = '* %?',
-            target = '$HOME/Documents/org/notes.org',
+            target = vim.env.HOME..'/Documents/org/notes.org',
           },
         },
+        mappings = {
+          agenda = {
+            org_agenda_close = nil,
+          }
+        },
       }
 
       local pickers = require('telescope.pickers')
       local finders = require('telescope.finders')
 
-      nnoremap { ';O', function()
+      require('astronauta.keymap').nnoremap { ';O', function()
           pickers.new(opts, {
             prompt_title = 'Orgmode',
             finder = finders.new_table(require('orgmode.config'):get_all_files()),
           }):find()
         end }
 
-      vim.cmd [[ command! Orgmode lua require('orgmode').action('agenda.prompt') ]]
-      vim.cmd [[ command! OrgmodeCapture lua require('orgmode').action('capture.refile') ]]
-      vim.cmd [[ command! OrgmodeInsert lua require('orgmode').action('org_mappings.insert_heading_respect_content') ]]
-      vim.cmd [[ command! OrgmodeTodoCycle lua require('orgmode').action('org_mappings.todo_next_state') ]]
-      vim.cmd [[ command! OrgmodeTag lua require('orgmode').action('org_mappings.set_tags') ]]
-      vim.cmd [[ command! OrgmodeArchive lua require('orgmode').action('org_mappings.toggle_archive_tag') ]]
+      -- vim.cmd [[ command! Orgmode lua require('orgmode').action('agenda.prompt') ]]
+      -- vim.cmd [[ command! OrgmodeCapture lua require('orgmode').action('capture.refile') ]]
+      -- vim.cmd [[ command! OrgmodeInsert lua require('orgmode').action('org_mappings.insert_heading_respect_content') ]]
+      -- vim.cmd [[ command! OrgmodeTodoCycle('orgmode').action('org_mappings.todo_next_state') ]]
+      -- vim.cmd [[ command! OrgmodeTag lua require('orgmode').action('org_mappings.set_tags') ]]
+      -- vim.cmd [[ command! OrgmodeArchive lua require('orgmode').action('org_mappings.toggle_archive_tag') ]]
     end} -- }}}
 
   -- languages
@@ -650,7 +653,7 @@ return require('packer').startup({function()
           val = function()
             local j = require('plenary.job'):new({
               command = 'fortune',
-              args = {vim.fn.expand('$HOME/devel/projects/zig/fortune/fortunes')},
+              args = {vim.env.HOME..'/devel/projects/zig/fortune/fortunes'},
               enable_recording = true,
             })
             local lines = j:sync()