diff --git a/filesets/base/i3/.config/i3/config b/filesets/base/i3/.config/i3/config
index e510fc9..3a5a8b0 100755
--- a/filesets/base/i3/.config/i3/config
+++ b/filesets/base/i3/.config/i3/config
@@ -145,6 +145,10 @@ bindsym $mod+Shift+d exec --no-startup-id dunstctl set-paused toggle
 bindsym $mod+Control+grave exec --no-startup-id dunstctl history-pop
 bindsym $mod+grave exec --no-startup-id dunstctl close
 
+# org-agenda
+bindsym $mod+Shift+o exec --no-startup-id org-agenda
+
+
 ##############
 # Workspaces #
 ##############
diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua b/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua
index 28fad22..473d747 100644
--- a/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua
+++ b/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua
@@ -1,6 +1,6 @@
 require("toggleterm").setup{
     open_mapping = [[<a-`>]],
-    hide_numbers = true, 
+    hide_numbers = true,
     shade_terminals = true,
     shading_factor = 1,
     start_in_insert = true,
@@ -11,3 +11,9 @@ require("toggleterm").setup{
         border = 'single',
     }
 }
+
+function _G.set_terminal_keymaps()
+    utils.map('t', '<esc>', [[<C-\><C-n>]])
+end
+
+vim.cmd('autocmd! TermOpen term://*toggleterm#* lua set_terminal_keymaps()')