diff --git a/home-cli.nix b/home-cli.nix
index 91e763d..7f7d019 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -47,6 +47,7 @@ in
     pastel
     jo # jo name=Dustin age=99 -> { name: "dustin", age: 99 }
     fx # jo -a one two three | fx ".map(e => e.length > 3)"  -> [false, false, true]
+    visidata
     bandwhich
     nodejs
     deno
@@ -89,7 +90,8 @@ in
   ];
 
   home.sessionVariables = {
-    EDITOR = "hx";
+    EDITOR = "vim";
+    BROSWER = "open";
     MANPAGER = "sh -c 'col -bx | bat -l man -p'";
     PATH = "$PATH:${builtins.getEnv "HOME"}/.emacs.d/bin:${builtins.getEnv "HOME"}/.cargo/bin";
     EXA_ICON_SPACING = 2;
diff --git a/lunar.lua b/lunar.lua
index d9a6e29..6a596a7 100644
--- a/lunar.lua
+++ b/lunar.lua
@@ -3,6 +3,8 @@ lvim.format_on_save = true
 lvim.leader = "space"
 lvim.colorscheme = "nord"
 lvim.transparent_window = true
+-- vim.opt.cmdheight = 1
+vim.opt.conceallevel = 2 -- TODO: only for org files
 
 lvim.builtin.dashboard.active = true
 lvim.builtin.notify.active = true
@@ -10,32 +12,28 @@ lvim.builtin.terminal.active = true
 lvim.builtin.treesitter.highlight.enabled = true
 
 lvim.plugins = {
-  { "ChristianChiarulli/nvcode-color-schemes.vim" },
+  { "shaunsingh/nord.nvim" },
+  -- { "rose-pine/neovim" },
+  -- { "folke/tokyonight.nvim" },
+
   { "nacro90/numb.nvim", event = "BufRead", config = function() require("numb").setup() end },
   { "npxbr/glow.nvim", ft = { "markdown" } },
   { "tpope/vim-repeat" },
   { "tpope/vim-surround" },
   { "ggandor/lightspeed.nvim", event = "BufRead" },
-  {
-    'wfxr/minimap.vim',
-    config = function()
-      vim.cmd ("let g:minimap_auto_open = 0")
-      vim.cmd ("let g:minimap_highlight_range = 1")
-      vim.cmd ("let g:minimap_highlight_search = 1")
-      vim.cmd ("let g:minimap_git_colors = 1")
-    end,
-  },
   { "folke/trouble.nvim", cmd = "TroubleToggle" },
-  { "folke/todo-comments.nvim", event = "BufRead", config = function() require("todo-comments").setup() end },
+  { "folke/todo-comments.nvim", event = "BufRead", config = function() require "todo-comments".setup() end },
   { "ray-x/lsp_signature.nvim", event = "BufRead", config = function() require "lsp_signature".setup() end },
   { "lukas-reineke/indent-blankline.nvim", event = "BufRead" },
   {
-    "nvim-neorg/neorg",
-    tag = "latest",
+    "nvim-orgmode/orgmode",
     config = function()
-      require('neorg').setup()
-    end,
-    requires = "nvim-lua/plenary.nvim"
+      require('orgmode').setup{
+        org_agenda_files = {'~/Sync/Notes/*'},
+        org_default_notes_file = '~/Sync/Notes/Main.org',
+      }
+      vim.opt.conceallevel = 1
+    end
   },
   {
     'rmagatti/goto-preview',
@@ -47,6 +45,23 @@ lvim.plugins = {
   },
   { "APZelos/blamer.nvim" },
   { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' },
+  -- {
+  --   'f-person/auto-dark-mode.nvim',
+  --   config = function()
+  --     local auto_dark_mode = require('auto-dark-mode')
+  --     auto_dark_mode.setup({
+  --       set_dark_mode = function()
+  --         -- vim.api.nvim_set_option('background', 'dark')
+  --         -- vim.cmd('colorscheme rose-pine')
+  --       end,
+  --       set_light_mode = function()
+  --         -- vim.api.nvim_set_option('background', 'light')
+  --         -- vim.cmd('colorscheme rose-pine')
+  --       end
+  --     })
+  --     auto_dark_mode.init()
+  --   end
+  -- },
 }
 
 lvim.builtin.which_key.mappings["t"] = {
@@ -61,3 +76,30 @@ lvim.builtin.which_key.mappings["t"] = {
 
 lvim.builtin.which_key.mappings["m"] = { "<cmd>MinimapToggle<cr>", "Toggle Minimap" }
 lvim.builtin.which_key.mappings["B"] = { "<cmd>BlamerShow<cr>", "Show Blamer" }
+
+-- Org mode stuff
+
+local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
+parser_config.org = {
+  install_info = {
+    url = 'https://github.com/milisims/tree-sitter-org',
+    revision = 'f110024d539e676f25b72b7c80b0fd43c34264ef',
+    files = {'src/parser.c', 'src/scanner.cc'},
+  },
+  filetype = 'org',
+}
+
+require'nvim-treesitter.configs'.setup {
+  -- If TS highlights are not enabled at all, or disabled via `disable` prop, highlighting will fallback to default Vim syntax highlighting
+  highlight = {
+    enable = true,
+    disable = {'org'}, -- Remove this to use TS highlighter for some of the highlights (Experimental)
+    additional_vim_regex_highlighting = {'org'}, -- Required since TS highlighter doesn't support all syntax features (conceal)
+  },
+  ensure_installed = {'org'}, -- Or run :TSUpdate org
+}
+
+require('orgmode').setup({
+  org_agenda_files = {'~/Dropbox/org/*', '~/my-orgs/**/*'},
+  org_default_notes_file = '~/Dropbox/org/refile.org',
+})