qenya: Install/uninstall misc packages

common/base-graphical/default.nix

@@ -14,6 +14,7 @@ in
 
   config = mkIf cfg.enable {
     services.xserver.enable = true;
+    services.xserver.excludePackages = [ pkgs.xterm ];
     services.libinput.enable = true;
     services.printing.enable = true;
     services.avahi = {

home/qenya/dconf/default.nix

@@ -20,7 +20,6 @@ in
     ./keyboard.nix
     ./mouse-touchpad.nix
     ./multitasking.nix
-    ./shell.nix
     ./wellbeing.nix
   ];
 }

home/qenya/dconf/shell.nix

@@ -1,26 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  dconf.settings = {
-    "org/gnome/shell" = {
-      disable-user-extensions = true;
-
-      # TODO: this is fine for now on tohru (the only GNOME system I use) but shouldn't depend on certain apps being installed
-      favorite-apps = [
-        "discord.desktop"
-        "org.gnome.Evolution.desktop"
-        "firefox.desktop"
-        "torbrowser.desktop"
-        "steam.desktop"
-        "codium.desktop"
-        "org.gnome.Console.desktop"
-        "org.gnome.Nautilus.desktop"
-        "org.gnome.SystemMonitor.desktop"
-      ];
-
-      # TODO: fill this out (needs preinstalled stuff removing first)
-      # app-picker-layout = [
-      #   ...
-      # ];
-    };
-  };
-}

home/qenya/packages.nix

@@ -25,6 +25,8 @@ in
     discord
     # https://github.com/NixOS/nixpkgs/issues/427155
     # gimp-with-plugins
+    jellyfin-desktop
+    keepassxc
     tor-browser
     zoom-us
 
@@ -32,9 +34,5 @@ in
     libreoffice
     hunspell
     hunspellDicts.en_GB-ise
-  ] ++ optionals isGnome [
-    celluloid
-  ] ++ optionals isPlasma [
-    haruna
   ];
 }

hosts/tohru/default.nix

@@ -43,11 +43,16 @@ in
   nixpkgs.overlays = [ inputs.scoutshonour.overlays.default ];
   home-manager.users.qenya = { pkgs, ... }: {
     home.packages = with pkgs; [
-      keepassxc
-      apostrophe
       foliate
       nicotine-plus
+
+      apostrophe
+      blanket
+      gnome-podcasts
+      resources
       tuba
+      wike
+      wordbook
 
       # games
       openttd