From da290991d317a588693fd9e4a6ba919e7fd54c79 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <g@gmem.ca>
Date: Tue, 7 Nov 2023 12:32:55 +0000
Subject: [PATCH] Switch from GNOME to KDE Plasma

---
 nix/london/configuration.nix | 42 ++++++++++++++----------------------
 nix/london/gsimmer.nix       | 18 ++++++++++++----
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/nix/london/configuration.nix b/nix/london/configuration.nix
index 2540722..a9c336a 100644
--- a/nix/london/configuration.nix
+++ b/nix/london/configuration.nix
@@ -129,11 +129,8 @@
       xkbVariant = "";
       videoDrivers = [ "nvidia" ];
       enable = true;
-      displayManager = {
-        gdm.wayland = true;
-        gdm.enable = true;
-      };
-      desktopManager.gnome.enable = true;
+      desktopManager.plasma5.enable = true;
+      displayManager.sddm.enable = true;
     };
     pipewire = {
       enable = true;
@@ -175,24 +172,6 @@
   };
 
   xdg.portal.enable = true;
-  environment.gnome.excludePackages = (with pkgs; [
-    gnome-photos
-    gnome-tour
-  ]) ++ (with pkgs.gnome; [
-    cheese # webcam tool
-    gnome-music
-    gnome-terminal
-    gedit # text editor
-    epiphany # web browser
-    geary # email reader
-    evince # document viewer
-    gnome-characters
-    totem # video player
-    tali # poker game
-    iagno # go game
-    hitori # sudoku game
-    atomix # puzzle game
-  ]);
 
   programs = {
     gamemode.enable = true;
@@ -202,8 +181,8 @@
     dconf.enable = true;
     steam = {
       enable = true;
-      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-      dedicatedServer.openFirewall = false; # Open ports in the firewall for Source Dedicated Server
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = false;
     };
     gnupg.agent = {
 	   enable = true;
@@ -266,8 +245,19 @@
       vulkan-tools
       glmark2
       libnotify
+      emojione
     ];
-  };  
+  };
+
+  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
+    elisa
+    okular
+    oxygen
+    khelpcenter
+    konsole
+    plasma-browser-integration
+    print-manager
+  ];
 
   security = {
     polkit.enable = true;
diff --git a/nix/london/gsimmer.nix b/nix/london/gsimmer.nix
index c93357d..2b111e0 100644
--- a/nix/london/gsimmer.nix
+++ b/nix/london/gsimmer.nix
@@ -10,13 +10,13 @@
     overlays =
       let
         discordOverlay = self: super: {
-          discord = super.discord.override { };
+          discord = super.discord.override { withVencord = true; withOpenASAR = true; };
         };
       in
         [
           (import (builtins.fetchTarball {
             url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
-            sha256 = "0lqk8xl3bpwmfdv8p9147rag1jxa8r0k8sibhyrvsnyp3q5lvxdx";
+            sha256 = "0w50a5dwphqkvlyi4h0bp3fssjkilyr92f9zgdhdxish3dzn4y0d";
           })) discordOverlay];
   };
   home = {
@@ -556,7 +556,18 @@ $env.config = {
       enable = true;
     };
   };
-  
+
+  # Prevent clobbering SSH_AUTH_SOCK
+  home.sessionVariables = {
+      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock";
+  };
+
+  # Disable gnome-keyring ssh-agent
+  xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
+      ${lib.fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
+      Hidden=true
+    '';
+
   home.packages = with pkgs; [
     bitwarden-cli
     vlc
@@ -576,7 +587,6 @@ $env.config = {
     discord
     mangohud
     comma
-    grimblast
   ];
 
   # This value determines the Home Manager release that your