diff --git a/home/profiles/desktop/kitty.conf b/home/profiles/desktop/kitty.conf
index 3144fdaf..1535586c 100644
--- a/home/profiles/desktop/kitty.conf
+++ b/home/profiles/desktop/kitty.conf
@@ -6,3 +6,6 @@ bold_italic_font auto
 open_url_with default
 mouse_map left click ungrabbed mouse_click_url_or_select
 confirm_os_window_close 0
+-- Allows zen-mode.nvim to increase font size
+allow_remote_control socket-only
+listen_on unix:/tmp/kitty
diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix
index bdb57775..ab53920b 100644
--- a/home/profiles/nvim/default.nix
+++ b/home/profiles/nvim/default.nix
@@ -107,16 +107,6 @@ let
         sha256 = "XdbgIWuAHNdTfyKDrKmQVq5oSbBoi56DpwtgOqhScAk=";
       };
     };
-    my-gitsigns = pkgs.vimUtils.buildVimPluginFrom2Nix {
-      pname = "gitsigns";
-      version = "v0.5";
-      src = pkgs.fetchFromGitHub {
-        owner = "lewis6991";
-        repo = "gitsigns.nvim";
-        rev = "f98c85e7c3d65a51f45863a34feb4849c82f240f";
-        sha256 = "FgNSwvW7Bk+eKutMj0zqEorJ3+ijCALtOXs2OYiSX1I=";
-      };
-    };
     my-fterm = pkgs.vimUtils.buildVimPluginFrom2Nix {
       pname = "fterm";
       version = "2022-07-22";
@@ -335,7 +325,7 @@ in
       map <leader>zf :Telescope oldfiles only_cwd=true<CR>
       map <leader>wt :VimwikiMakeTomorrowDiaryNote
       map <leader>wd :VimwikiMakeYesterdayDiaryNote
-      map <leader>zd :Goyo<CR>:lua require('cmp').setup.buffer { enabled = false }<CR>
+      map <leader>zm :ZenMode<CR>:setlocal nospell<CR>
       let g:vimwiki_list = [{ 'path': '~/kitaab/vimwiki', 'auto_tags': 1, 'auto_diary_index': 1, 'auto_generate_links': 1 }]
       let g:sync_taskwarrior = 0
       let g:zettel_format = "%y%m%d-%H%M"
@@ -723,6 +713,52 @@ in
         }
       } 
       -- require("luasnip").add_snippets("supercollider", require("scnvim/utils").get_snippets())
+
+      -- zen mode
+      require('zen-mode').setup{
+        window = {
+          backdrop = 1.0, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
+          -- height and width can be:
+          -- * an absolute number of cells when > 1
+          -- * a percentage of the width / height of the editor when <= 1
+          -- * a function that returns the width or the height
+          width = 120, -- width of the Zen window
+          height = 1, -- height of the Zen window
+          -- by default, no options are changed for the Zen window
+          -- uncomment any of the options below, or add other vim.wo options you want to apply
+          options = {
+            signcolumn = "no", -- disable signcolumn
+            number = false, -- disable number column
+            relativenumber = false, -- disable relative numbers
+            cursorline = false, -- disable cursorline
+            cursorcolumn = false, -- disable cursor column
+            foldcolumn = "0", -- disable fold column
+            list = false, -- disable whitespace characters
+          },
+        },
+        plugins = {
+          -- disable some global vim options (vim.o...)
+          -- comment the lines to not apply the options
+          options = {
+            enabled = true,
+            ruler = false, -- disables the ruler text in the cmd line area
+            showcmd = false, -- disables the command in the last line of the screen
+          },
+          twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
+          gitsigns = { enabled = false }, -- disables git signs
+          tmux = { enabled = false }, -- disables the tmux statusline
+          -- this will change the font size on kitty when in zen mode
+          -- to make this work, you need to set the following kitty options:
+          -- - allow_remote_control socket-only
+          -- - listen_on unix:/tmp/kitty
+          kitty = {
+            enabled = true,
+            font = "+2", -- font size increment
+          },
+        },
+      }
+      require('twilight').setup{}
+
       EOF
 
     '';
@@ -752,7 +788,6 @@ in
       fzf-vim
       nerdtree
       neovim-ayu
-      goyo-vim
       rainbow_parentheses-vim
       vim-surround
       vim-devicons
@@ -769,6 +804,8 @@ in
       my-marks
       which-key-nvim
       nvim-peekup
+      zen-mode-nvim
+      twilight-nvim
 
       # language
       vim-nix
@@ -805,7 +842,7 @@ in
 
       # git stuff
       vim-fugitive
-      my-gitsigns
+      gitsigns-nvim
       fzf-checkout-vim
 
       # Clojure stuff