From 8746d38eef335c834e71e43569a9031386221839 Mon Sep 17 00:00:00 2001
From: Random936 <randomdude936@gmail.com>
Date: Mon, 4 Aug 2025 20:50:09 -0700
Subject: [PATCH] Updated emacs config for new dot-emacs repo

---
 config/omen.nix        | 20 +++++++++++++++++++-
 home/modules/emacs.nix | 17 +++--------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/config/omen.nix b/config/omen.nix
index 90ff8c2..061571f 100644
--- a/config/omen.nix
+++ b/config/omen.nix
@@ -56,11 +56,29 @@
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
+  # System Packages
+  environment.systemPackages = with pkgs; [
+    pinentry-gtk2
+    protonmail-bridge
+    pass
+  ];
+
   # Setup Pinentry
-  environment.systemPackages = with pkgs; [ pinentry-gtk2 ];
   programs.gnupg.agent = {
     enable = true;
     pinentryPackage = pkgs.pinentry-gtk2;
     enableSSHSupport = true;
   };
+
+  # Setup protonmail bridge
+  systemd.user.services.protonmail-bridge = {
+    description = "Protonmail Bridge";
+    after = [ "network.target" ];
+    wantedBy = [ "default.target" ];
+    path = [ pkgs.pass ];
+    serviceConfig = {
+      Restart = "always";
+      ExecStart = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive";
+    };
+  };
 }
diff --git a/home/modules/emacs.nix b/home/modules/emacs.nix
index 9a2b2d3..9320851 100644
--- a/home/modules/emacs.nix
+++ b/home/modules/emacs.nix
@@ -6,12 +6,12 @@
     libtool
 
     # Additional packages for functionality
-    isync
-    ispell
-    texliveFull
     mu
     zip
     unzip
+    isync
+    ispell
+    texliveFull
 
     # Fonts
     maple-mono.truetype
@@ -38,15 +38,4 @@
       ];
     };
   };
-
-  home.file = {
-    ".emacs".source = ../../dotfiles/.emacs;
-    ".emacs.d/config.org".source = ../../dotfiles/.emacs.d/config.org;
-    ".emacs.d/terminal.org".source = ../../dotfiles/.emacs.d/terminal.org;
-    ".emacs.d/functions.org".source = ../../dotfiles/.emacs.d/functions.org;
-    ".emacs.d/email.org".source = ../../dotfiles/.emacs.d/email.org;
-    ".emacs.d/org.org".source = ../../dotfiles/.emacs.d/org.org;
-    ".emacs.d/lsp.org".source = ../../dotfiles/.emacs.d/lsp.org;
-    ".mbsyncrc".source = ../../dotfiles/.mbsyncrc;
-  };
 }