From 46371470eee5512d94c1454b9d8bc0dab6f32109 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 10 Oct 2023 16:02:01 +0100
Subject: [PATCH] Disable emacs daemon

Set custom mu4e modeline icons because it was annoying me

Update keybinds, all workspaces now have a "default" program so to speak
with associated keybind to launch
---
 home/default.nix          |  2 +-
 home/emacs/default.nix    |  7 -------
 home/emacs/doom/config.el | 15 ++++++---------
 home/hyprland/config.nix  |  4 +++-
 system/desktop.nix        | 29 +++++------------------------
 5 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 09885f3b..746170e8 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -125,7 +125,7 @@
         };
         line_break.disabled = false;
         git_branch = {
-          symbol = "󰘬";
+          symbol = "";
           only_attached = true;
           ignore_branches = [ "master" "main" ];
         };
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 89987725..9d54008c 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -14,13 +14,6 @@ in {
     enable = true;
     package = pkgs.emacs29-pgtk;
   };
-  services.emacs = {
-    enable = true;
-    package = config.programs.emacs.package;
-    defaultEditor = true;
-    client.enable = true;
-    socketActivation.enable = true;
-  };
   home = {
     inherit sessionVariables;
     sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ];
diff --git a/home/emacs/doom/config.el b/home/emacs/doom/config.el
index 5011b8aa..f2089f0b 100644
--- a/home/emacs/doom/config.el
+++ b/home/emacs/doom/config.el
@@ -15,14 +15,6 @@
       doom-font (font-spec :family "FiraCode Nerd Font" :size 16 :weight 'regular)
       doom-theme 'catppuccin
       doom-emoji-fallback-font-families '("Noto Color Emoji")
-      doom-symbol-fallback-font-families '("FiraCode Nerd Font"
-                                           "FontAwesome"
-                                           "Weather Icons"
-                                           "Material Icons"
-                                           "Material Design Icons"
-                                           "Material Symbols Rounded"
-                                           "Material Symbols Sharp"
-                                           "Material Symbols Outlined")
       catppuccin-flavor 'macchiato
       display-line-numbers-type 'relative
       org-directory "~/Notes/"
@@ -54,7 +46,7 @@
         mu4e-sent-messages-behavior 'delete
         mu4e-attachment-dir "~/Downloads"
         mu4e-change-filenames-when-moving t
-        mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter
+        ;; mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter
         sendmail-program (executable-find "msmtp")
         send-mail-function #'smtpmail-send-it
         message-sendmail-f-is-evil t
@@ -64,6 +56,11 @@
                                  (:maildir "/iCloud/Inbox/" :key ?i)
                                  (:maildir "/UKAEA/Inbox/" :key ?u)))
 
+  (setq mu4e-modeline-all-read '("R:" . "󰪱 ")
+        mu4e-modeline-all-clear '("C:" . "󰪱 ")
+        mu4e-modeline-new-items '("N:" . "󱃚 ")
+        mu4e-modeline-unread-items '("U:" . "󰛏 "))
+
   ;; Add accounts with contexts
   (set-email-account! "proton.me"
                       '((user-mail-address . "e.litherlandsmith@proton.me")
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 7c93c1ca..4a6fbfaf 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -114,18 +114,19 @@ in ''
   bind = SUPER, X, exec, swaync-client -t
 
   # Common program shortcuts
-  bind = SUPER, E, exec, emacsclient -c
   bind = SUPER, Space, exec, pkill anyrun || anyrun
   bind = SUPER, Return, exec, alacritty
   bind = SUPER SHIFT, Return, exec, [float] alacritty
 
   bind = SUPER ALT, T, exec, [workspace 1] alacritty
+  bind = SUPER ALT, D, exec, [workspace 2] emacs
   bind = SUPER ALT, W, exec, [workspace 3] firefox
   bind = SUPER ALT, A, exec, [workspace 4] alacritty -e khal interactive
   bind = SUPER ALT, F, exec, [workspace 5] alacritty -e mc
   bind = SUPER ALT, S, exec, [workspace 6] alacritty -e ncspot
   bind = SUPER ALT, C, exec, [workspace 7] ferdium
   bind = SUPER ALT, R, exec, [workspace 8] remmina
+  bind = SUPER ALT, G, exec, [workspace 9] steam
 
   # Misc useful binds
   bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
@@ -205,6 +206,7 @@ in ''
   bind = SUPER, D, moveworkspacetomonitor, 2 current
   bind = SUPER, D, workspace, 2
   bind = SUPER SHIFT, D, movetoworkspace, 2
+  windowrule = workspace 2,(emacs)
 
   # 3: [b]rowser
   bind = SUPER, W, moveworkspacetomonitor, 3 current
diff --git a/system/desktop.nix b/system/desktop.nix
index 2aa35731..4ed55d25 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -47,14 +47,7 @@
       };
     };
     homeManagerIntegration.followSystem = true;
-    targets = {
-      chromium.enable = true;
-      # console.enable = true;
-      # grub = {
-      #   enable = true;
-      #   useImage = true;
-      # };
-    };
+    targets.chromium.enable = true;
   };
   fonts = {
     packages = with pkgs; [
@@ -64,27 +57,15 @@
       (nerdfonts.override { fonts = [ "FiraCode" ]; })
       dejavu_fonts
       noto-fonts-emoji
-      font-awesome
-      material-symbols
-      material-design-icons
-      weather-icons
-      vscode-extensions.file-icons.file-icons
       emacs-all-the-icons-fonts
     ];
     fontconfig = {
       enable = true;
-      defaultFonts = let
-        icons = [
-          "FontAwesome"
-          "Material Icons"
-          "Material Design Icons"
-          "Weather Icons"
-        ];
-      in rec {
-        sansSerif = [ "Fira Sans" "DejaVu Sans" ] ++ icons;
+      defaultFonts = rec {
+        sansSerif = [ "Fira Sans" "DejaVu Sans" ];
         serif = sansSerif;
-        monospace = [ "Fira Mono" "DejaVu Sans Mono" ] ++ icons;
-        emoji = [ "Noto Color Emoji" ] ++ icons;
+        monospace = [ "Fira Mono" "DejaVu Sans Mono" ];
+        emoji = [ "Noto Color Emoji" ];
       };
     };
   };