Build custom version of Emacs to include both PGTK and Imagemagick support

Install Emacs by default instead just for desktop environment

system/default.nix

@@ -63,6 +63,7 @@
       "steam-unwrapped"
       "steam-original"
       "steam-run"
+      "steamcmd"
       "nomachine-client"
     ];
   system.autoUpgrade = {
@@ -135,6 +136,7 @@
         ./home/shell/default.nix
         ./home/scripts/default.nix
         ./home/password-store/default.nix
+        ./home/emacs/default.nix
       ];
       home = {
         inherit username;

system/desktop.nix

@@ -28,7 +28,7 @@
       fractal
       webcord
       signal-desktop
-      whatsapp-for-linux
+      zapzap
       teams-for-linux
       twinkle
       nomachine-client
@@ -120,11 +120,10 @@
     {
       imports = [
         ./home/hyprland.nix
+        ./home/terminal/default.nix
+        ./home/browser/default.nix
         ./home/email/default.nix
         ./home/calendar/default.nix
-        ./home/terminal/default.nix
-        ./home/emacs/default.nix
-        ./home/browser/default.nix
       ];
       home.file.${config.gtk.gtk2.configLocation}.force = true;
       services = {
@@ -175,7 +174,7 @@
           "gtk-4.0/settings.ini".force = true;
           # Autostart some programs
           "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
-          "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+          "autostart/com.rtosta.zapzap.desktop".source = "${pkgs.zapzap}/share/applications/com.rtosta.zapzap.desktop";
           "teams-for-linux/config.json".text = builtins.toJSON {
             awayOnSystemIdle = true;
             closeAppOnCross = false;

system/home/browser/default.nix

@@ -1,4 +1,8 @@
 { ... }:
 {
-  imports = [ ./firefox.nix ];
+  imports = [
+    ./firefox.nix
+    ./nyxt.nix
+    ./qutebrowser.nix
+  ];
 }

system/home/browser/nyxt.nix

@@ -23,7 +23,7 @@
                                    :on-primary-color "${scheme.base05}"
                                    :secondary-color "${scheme.base03}"
                                    :on-secondary-color "${scheme.base05}"
-                                   :accent-color "${scheme.base0E}"
+                                   :accent-color "${scheme.magenta}"
                                    :on-accent-color "${scheme.base01}"
                                    :action-color "${scheme.cyan}"
                                    :on-action-color "${scheme.base01}"

system/home/browser/qutebrowser.nix

@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  programs.qutebrowser = {
+    enable = true;
+    settings = {
+      changelog_after_upgrade = "major";
+      # confirm_quit = "downloads";
+      content = {
+        autoplay = false;
+        blocking.enabled = true;
+        cookies.accept = "no-unknown-3rdparty";
+        headers.do_not_track = true;
+      };
+      downloads.location.directory = config.xdg.userDirs.download;
+      new_instance_open_target = "tab";
+      qt.highdpi = true;
+      scrolling.smooth = true;
+      # spellcheck.languages = [ "en-GB" ];
+      tabs = {
+        last_close = "blank";
+        show = "multiple";
+      };
+      url.default_page = lib.mkDefault "about:blank";
+      window.hide_decoration = true;
+    };
+    searchEngines = {
+      w = "https://en.wikipedia.org/wiki/Special:Search?search={}&go=Go&ns0=1";
+      aw = "https://wiki.archlinux.org/?search={}";
+      nw = "https://wiki.nixos.org/index.php?search={}";
+      gh = "https://github.com/search?q={}";
+      fh = "https://flathub.org/apps/search?q={}";
+      py = "https://pypi.org/search/?q={}";
+    };
+    # quickmarks =
+    #   let
+    #   in
+    #   { };
+  };
+}

system/home/emacs/default.nix

@@ -17,7 +17,10 @@
   programs.emacs = {
     # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
     enable = true;
-    package = pkgs.emacs29-pgtk;
+    package = pkgs.emacs29.override {
+      withImageMagick = true;
+      withPgtk = true;
+    };
     extraConfig =
       let
         fixed-font-family = "${config.stylix.fonts.monospace.name}";
@@ -62,19 +65,15 @@
       ];
   };
   home.packages = with pkgs; [
-    # Emacs requirements
-    imagemagick
-    languagetool
-    wordnet
-
     # Plugin requirements
     gcc
     sqlite
+    languagetool
+    wordnet
     pandoc
     ghostscript
     poppler_utils
-    graphviz
-    mp3info
+    graphviz-nox
 
     # Customised LaTeX install
     (texlive.combine {

system/home/hyprland.nix

@@ -260,9 +260,9 @@
         "center, xdg-desktop-portal-gtk"
 
         # Workspace rules
-        "workspace 2, firefox" # Browser
+        "workspace 2, (firefox|nyxt|org.qutebrowser.qutebrowser)" # Browser
         "workspace 3, (libreoffice|soffice)(.*)" # Documents
-        "workspace 4, (signal|whatsapp-for-linux|WebCord|teams-for-linux|twinkle)" # Messaging
+        "workspace 4, (signal|com.rtosta.zapzap|WebCord|teams-for-linux|twinkle)" # Messaging
         "workspace 5, (org.remmina.Remmina|Nxplayer.bin)" # Remote Desktop
         "workspace 6, (steam|steam_app|lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher)" # Gaming
 

system/home/scripts/shell/clean-config.sh

@@ -1,2 +1,2 @@
 shopt -s extglob
-rm -rf ~/.config/!(dconf|kdeconnect|protonmail|Signal|WebCord|whatsapp-for-linux)
+rm -rf ~/.config/!(dconf|kdeconnect|protonmail|Signal|WebCord)

system/home/waybar.nix

@@ -70,7 +70,7 @@
           "Nyxt - (.*)" = "󰀹  $1";
           "(.*) - Chromium" = "󰊯  $1";
           "(Signal.*)" = "󰭹  $1";
-          "(WhatsApp for Linux.*)" = "󰖣  $1";
+          "(ZapZap.*)" = "󰖣  $1";
           "((?:.*)WebCord.*)" = "󰙯  $1";
           "(Cartridges.*)" = "󰊗  $1";
           "([Ss]team.*)" = "󰓓  $1";

system/steam.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  username,
-  ...
-}:
+{ pkgs, username, ... }:
 {
   environment = {
     sessionVariables.MANGOHUD = 1;
@@ -22,21 +17,9 @@
       capSysNice = true;
     };
   };
-  home-manager.users.${username}.xdg.configFile."MangoHud/MangoHud.conf".text =
-    with config.lib.stylix.scheme; ''
-      preset=1
-      text_color=${base00}
-      gpu_color=${green}
-      cpu_color=${green}
-      vram_color=${magenta}
-      ram_color=${magenta}
-      engine_color=${red}
-      io_color=${magenta}
-      frametime_color=${green}
-      background_color=${base05}
-      media_player_color=${base00}
-      wine_color=${red}
-      battery_color=${orange}
-      network_color=${red}
-    '';
+  home-manager.users.${username}.programs.mangohud = {
+    enable = true;
+    enableSessionWide = true;
+    settings.preset = 2;
+  };
 }

system/work.nix

@@ -4,7 +4,10 @@
     { config, ... }:
     {
       imports = [ ./home/openfortivpn/ukaea.nix ];
-      programs.git.userEmail = config.accounts.email.accounts.outlook.address;
+      programs = {
+        git.userEmail = config.accounts.email.accounts.outlook.address;
+        qutebrowser.settings.url.default_page = "https://nucleus.ukaea.uk";
+      };
       accounts.email.accounts = {
         proton.primary = lib.mkForce false;
         outlook.primary = lib.mkForce true;