system/default.nix

@@ -135,7 +135,6 @@
         ./home/shell/default.nix
         ./home/scripts/default.nix
         ./home/password-store/default.nix
-        ./home/emacs/default.nix
       ];
       home = {
         inherit username;

system/desktop.nix

@@ -120,10 +120,11 @@
     {
       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 = {

system/home/emacs/default.nix

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

system/home/hyprland.nix

@@ -176,22 +176,41 @@
         "sleep 5; ${pkgs.dex}/bin/dex -a"
       ];
       gestures.workspace_swipe = true;
-      general = {
-        layout = "dwindle";
-        gaps_in = 2.5;
-        gaps_out = 5;
-        "col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.magenta})";
-      };
-      dwindle = {
-        force_split = 2;
-        smart_resizing = false;
-        special_scale_factor = 0.95;
-      };
       input = {
         kb_layout = osConfig.services.xserver.xkb.layout;
         follow_mouse = 1;
         touchpad.natural_scroll = "yes";
       };
+      dwindle = {
+        force_split = 2;
+        preserve_split = false;
+        smart_split = false;
+        smart_resizing = false;
+        special_scale_factor = 0.95;
+        no_gaps_when_only = 0;
+        use_active_for_splits = true;
+        default_split_ratio = 1.0;
+      };
+      master = {
+        allow_small_split = true;
+        special_scale_factor = 0.95;
+        mfact = 0.5;
+        # new_is_master = false;
+        new_on_top = false;
+        no_gaps_when_only = 0;
+        orientation = "left";
+        inherit_fullscreen = false;
+        smart_resizing = false;
+        drop_at_cursor = true;
+      };
+      general = {
+        "col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.magenta})";
+        gaps_in = 2.5;
+        gaps_out = 5;
+        border_size = 1;
+        # cursor_inactive_timeout = 0;
+        layout = "master";
+      };
       decoration = {
         rounding = 5;
         "col.shadow" = lib.mkForce "rgba(${config.lib.stylix.scheme.base00}0d)";