diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix
index 6a6d39d..95eeff2 100644
--- a/home/editors/neovim/default.nix
+++ b/home/editors/neovim/default.nix
@@ -66,7 +66,6 @@ in {
       neorg
     ];
     extraConfig = with builtins;
-    # readFile ./vim-surround-fix.vim +
       vimLua (lib.foldl (r: f: r + "\n" + readFile f) "" [
         ./init.lua
         ./alpha.lua
diff --git a/home/editors/neovim/vim-surround-fix.vim b/home/editors/neovim/vim-surround-fix.vim
deleted file mode 100644
index 3cce18b..0000000
--- a/home/editors/neovim/vim-surround-fix.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" fix for timeout issue with vim-surround in neovim
-" but it also breaks yss
-" https://github.com/tpope/vim-surround/issues/272
-
-let g:surround_no_mappings = 1
-
-function! SurroundOp(char)
-    if v:operator ==# 'd'
-        return "\<plug>D" . a:char . "urround"
-    elseif v:operator ==# 'c'
-        return "\<plug>C" . a:char . "urround"
-    elseif v:operator ==# 'y'
-        return "\<plug>Y" . a:char . "urround"
-    endif
-    return ''
-endfunction
-
-omap <expr> s '<esc>'.SurroundOp('s')
-omap <expr> S '<esc>'.SurroundOp('S')
-
-imap <C-S>  <Plug>Isurround
-imap <C-G>s <Plug>Isurround
-imap <C-G>S <Plug>ISurround
diff --git a/services/kodi.nix b/services/kodi.nix
deleted file mode 100644
index a74527f..0000000
--- a/services/kodi.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.xserver.enable = true;
-  services.xserver.desktopManager.kodi.enable = true;
-  services.xserver.desktopManager.kodi.package =
-    pkgs.kodi.withPackages (p: with p; [ jellyfin netflix youtube ]);
-
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "kodi";
-
-  users.extraUsers.kodi = {
-    isNormalUser = true;
-    extraGroups = [ "video" "input" "audio" ];
-  };
-
-  # TODO doesn't seem to work
-  # services.cage.enable = true;
-  # services.cage.user = "kodi";
-  # services.cage.program = "${pkgs.kodi-wayland}/bin/kodi-standalone";
-
-  networking.firewall = {
-    allowedTCPPorts = [ 8080 ];
-    allowedUDPPorts = [ 8080 ];
-  };
-
-  environment.systemPackages = [
-    (pkgs.kodi.override {
-      plugins = with pkgs.kodiPlugins;
-        [ pkgs.nur.repos.marzipankaiser.kodiPlugins.netflix ];
-    })
-  ];
-}