From 61fe57871efe9f8e9f3bdfc360a5a62986a2e89b Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <g@gmem.ca>
Date: Tue, 25 Jul 2023 19:45:34 +0100
Subject: [PATCH] update london home

---
 home-manager/london.nix | 50 +++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/home-manager/london.nix b/home-manager/london.nix
index 1012817..c1d92d7 100644
--- a/home-manager/london.nix
+++ b/home-manager/london.nix
@@ -1,32 +1,16 @@
 { config, pkgs, callPackage, ... }:
 
 {
-  nixpkgs.overlays = [
-    (self: super:
-      let
-        # Overlay function
-        emacs-overlay =
-          import (builtins.fetchTarball {
-            url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-          });
-        #
-        # Extract version pointing to master branch
-        emacsGit = (emacs-overlay self super).emacsGit;
-        #
-        # Override source attribute
-        emacs-custom-base = emacsGit.overrideAttrs ( old: {
-          src = pkgs.fetchFromSavannah {
-            repo = "emacs";
-            rev = "89ac5ba11c773764f418c92ab47a237287a0d233";
-            sha256 = "19qjj0aw7w0rz29jpa1x48jmv3mh1p1aky82y040xmk6axg8blnl";
-          };
-        });
-      in
-        {
-          emacs-custom = emacs-custom-base;
-        }
-    )
-  ];
+  nixpkgs.overlays =
+    let
+      discordOverlay = self: super: {
+        discord = super.discord.override { withOpenASAR = true; withVencord = true; };
+      };
+    in
+      [
+        (import (builtins.fetchTarball {
+          url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+        })) discordOverlay];
 
   home.username = "gsimmer";
   home.homeDirectory = "/home/gsimmer";
@@ -38,6 +22,7 @@
     enable = true;
     interactiveShellInit = ''
       set fish_greeting
+      atuin init fish | source
     '';
     plugins = [
       {
@@ -62,7 +47,7 @@
   programs.git = {
     enable = true;
     userName = "Gabriel Simmer";
-    userEmail = "gsimmer@protonmail.com";
+    userEmail = "g@gmem.ca";
     signing = {
       key = "C81B106D46C5B875";
       signByDefault = true;
@@ -71,7 +56,7 @@
 
   programs.emacs = {
     enable = true;
-    package = pkgs.emacs-custom;
+    package = pkgs.emacs-unstable-pgtk;
     extraPackages = epkgs: [
       epkgs.vterm
     ];
@@ -87,7 +72,6 @@
   };
   
   home.packages = with pkgs; [ 
-    discord
     spotify
     bitwarden-cli
     mullvad-vpn
@@ -96,12 +80,20 @@
     obs-studio
     python3
     lmms
+    thunderbird
     prismlauncher
     ripgrep
     kitty
     cider
     virt-manager
     jre8
+    parsec-bin
+    nodejs
+    telegram-desktop
+    atuin
+    age-plugin-yubikey
+    rage
+    discord
   ];
 
   # This value determines the Home Manager release that your