diff --git a/hosts/python/apps.nix b/hosts/python/apps.nix
index 45f7fac..8fbbbb6 100644
--- a/hosts/python/apps.nix
+++ b/hosts/python/apps.nix
@@ -17,17 +17,11 @@
     sessionVariables = {EDITOR = "nvim";};
   };
   alqueva = {
-    mpd = {
-      enable = true;
-      ncmpcpp = true;
-    };
-    emacs.enable = true;
     xonsh.enable = true;
     libvirt.enable = true;
     direnv.enable = true;
     git.enable = true;
     pipewire.enable = true;
-    qutebrowser.enable = true;
     openssh.enable = true;
     river.enable = true;
   };
diff --git a/hosts/shared/emacs.nix b/hosts/shared/emacs.nix
deleted file mode 100644
index 6a6b8bf..0000000
--- a/hosts/shared/emacs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}: let
-  cfg = config.alqueva.emacs;
-in {
-  options.alqueva.emacs = {
-    enable = lib.mkEnableOption "Emacs";
-  };
-  config = lib.mkIf cfg.enable {
-    environment = {
-      systemPackages = [inputs.pankomacs.packages.${pkgs.system}.pankomacs];
-      sessionVariables."EDITOR" = lib.mkDefault "emacs";
-    };
-  };
-}
diff --git a/hosts/shared/fish.nix b/hosts/shared/fish.nix
deleted file mode 100644
index c01dc36..0000000
--- a/hosts/shared/fish.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  cfg = config.alqueva.fish;
-in {
-  options.alqueva.fish = {
-    enable = lib.mkEnableOption "fish";
-  };
-  config = lib.mkIf cfg.enable {
-    programs = {
-      fish = {
-        vendor = {
-          functions.enable = true;
-          config.enable = true;
-          completions.enable = true;
-        };
-        enable = true;
-      };
-      starship = {
-        enable = true;
-        presets = ["no-nerd-font"];
-      };
-    };
-
-    environment.systemPackages = builtins.attrValues {
-      inherit
-        (pkgs.fishPlugins)
-        fzf-fish
-        forgit
-        autopair
-        ;
-    };
-  };
-}
diff --git a/hosts/shared/mpd.nix b/hosts/shared/mpd.nix
deleted file mode 100644
index 10a3ab5..0000000
--- a/hosts/shared/mpd.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  cfg = config.alqueva.mpd;
-in {
-  options.alqueva.mpd = {
-    enable = lib.mkEnableOption "mpd";
-    ncmpcpp = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Enable ncmpcpp alongside mpd.";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.mpd.enable = true;
-    environment.systemPackages =
-      [pkgs.mpd]
-      ++ lib.optional cfg.ncmpcpp pkgs.ncmpcpp;
-  };
-}
diff --git a/hosts/shared/qutebrowser.nix b/hosts/shared/qutebrowser.nix
deleted file mode 100644
index fd9f7c8..0000000
--- a/hosts/shared/qutebrowser.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  cfg = config.alqueva.qutebrowser;
-in {
-  options.alqueva.qutebrowser = {
-    enable = lib.mkEnableOption "qutebrowser";
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = [
-      pkgs.qutebrowser
-    ];
-  };
-}
diff --git a/hosts/shared/sddm.nix b/hosts/shared/sddm.nix
deleted file mode 100644
index 7ebb327..0000000
--- a/hosts/shared/sddm.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  cfg = config.alqueva.sddm;
-in {
-  options.alqueva.sddm = {
-    enable = lib.mkEnableOption "sddm";
-  };
-  config = lib.mkIf cfg.enable {
-    services.displayManager.sddm = {
-      wayland = {
-        enable = true;
-        compositor = "kwin";
-      };
-      enable = true;
-      theme = "where_is_my_sddm_theme";
-    };
-    environment.systemPackages = [
-      pkgs.i-found-my-sddm-theme
-    ];
-  };
-}