diff --git a/default.nix b/default.nix
index 6e7dafe..30fd770 100644
--- a/default.nix
+++ b/default.nix
@@ -13,6 +13,5 @@
     ./modules/security-tools.nix
     ./modules/status-on-console.nix
     ./modules/sway.nix
-    ./modules/vim.nix
   ];
 }
diff --git a/modules/cli.nix b/modules/cli.nix
index 2594564..154657c 100644
--- a/modules/cli.nix
+++ b/modules/cli.nix
@@ -112,4 +112,16 @@ in
     }
     [ "$TERM" = "linux" ] || PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
   '';
+
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    configure = {
+      packages.sconfig.start = [ pkgs.vimPlugins.vim-nix ];
+      customRC = ''
+        set nowrap scrolloff=9
+      '';
+    };
+  };
 }
diff --git a/modules/graphical.nix b/modules/graphical.nix
index cf4aac9..4dfbf20 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -1,7 +1,4 @@
 { pkgs, config, ... }:
-let
-  legacy = (config.system.nixos.release == "20.09");
-in
 {
   environment.systemPackages = with pkgs; [
     brave
@@ -53,8 +50,8 @@ in
 
   virtualisation.docker = { enable = true; enableOnBoot = false; };
 
-  hardware.pulseaudio.enable = legacy;
-  services.pipewire = if legacy then { } else {
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
     enable = true;
     pulse.enable = true;
     alsa.enable = true;
diff --git a/modules/vim.nix b/modules/vim.nix
deleted file mode 100644
index 2d6376d..0000000
--- a/modules/vim.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-let
-  legacy = (config.system.nixos.release == "20.09");
-in
-{
-
-  environment.systemPackages = if legacy then [ pkgs.vim ] else [ ];
-
-  programs = if legacy then { } else {
-    neovim = {
-      enable = true;
-      viAlias = true;
-      vimAlias = true;
-      configure = {
-        packages.sconfig.start = [ pkgs.vimPlugins.vim-nix ];
-        customRC = ''
-          set nowrap scrolloff=9
-        '';
-      };
-    };
-  };
-
-}