From 261135724c8e9adece5365a99200624e4aec5c2c Mon Sep 17 00:00:00 2001
From: Miranda Marquez <mirmarq428@gmail.com>
Date: Sun, 22 Sep 2024 16:27:52 -0800
Subject: [PATCH] purge and merge emacs settings. still not perfect

---
 configuration.nix    |  1 -
 home.nix             | 12 +----------
 modules/emacs.nix    | 47 ++++++++++++++++++++++++++++----------------
 modules/gui/niri.nix |  8 ++++++++
 modules/shell.nix    |  4 ----
 5 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 modules/gui/niri.nix

diff --git a/configuration.nix b/configuration.nix
index 05ceb99..70564f4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -102,7 +102,6 @@
 pkgs.fprintd
     wget
     vim
-    emacs29-pgtk
     sg3_utils
     nfs-utils
     fontconfig
diff --git a/home.nix b/home.nix
index 903267f..950b87b 100644
--- a/home.nix
+++ b/home.nix
@@ -6,15 +6,14 @@ with lib.hm.gvariant;
     ./modules/dconf.nix
     ./modules/shell.nix
     ./modules/firefox.nix
-    # ./modules/emacs.nix
     # ./modules/sway.nix
+    ./modules/emacs.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "mir";
   home.homeDirectory = "/home/mir";
   home.packages = [
-    pkgs.emacs-all-the-icons-fonts
     pkgs.btop
     pkgs.killall
     pkgs.gdb
@@ -56,11 +55,7 @@ with lib.hm.gvariant;
     enable = true;
     # version = "23.11";
   };
-  # environment.variables = rec {
-  #   EDITOR = "emacs -nw";
-  # };
   home.sessionVariables = {
-    EDITOR = "emacs";
     TERMINAL = "kitty";
     TERM_PROGRAM = "kitty";
     BROWSER = "firefox";
@@ -92,11 +87,6 @@ with lib.hm.gvariant;
   # programs.gdb = {
   #   enable = true;
   # };
-  # home.file.".emacs.d" = {
-  #   source = inputs.emacs-config;
-  #   recursive = true;
-  # };
-
 
   programs.gpg = {
     enable = true;
diff --git a/modules/emacs.nix b/modules/emacs.nix
index 49db48a..d8546c5 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -1,20 +1,33 @@
 { lib, config, pkgs, inputs, ... }:
 {
-  home.packages = [
-    (pkgs.emacsWithPackages {
-      package = pkgs.emacs29;
-      # config = ~/.emacs.d/init.el;
-    extraEmacsPackages = epkgs: [
-      epkgs.dash
-      epkgs.compat
-      epkgs.marginalia
-      epkgs.page-break-lines
-      epkgs.rainbow-mode
-      epkgs.powershell
-      epkgs.diminish
-      # epkgs.general
-      epkgs.eldoc
-    ];
-    }
-)];
+#  home.packages = [
+#    (pkgs.emacsWithPackages {
+#      package = pkgs.emacs29;
+#      # config = ~/.emacs.d/init.el;
+#    extraEmacsPackages = epkgs: [
+#      epkgs.dash
+#      epkgs.compat
+#      epkgs.marginalia
+#      epkgs.page-break-lines
+#      epkgs.rainbow-mode
+#      epkgs.powershell
+#      epkgs.diminish
+#      # epkgs.general
+#      epkgs.eldoc
+#    ];
+#    }
+#)];
+  programs.emacs = {
+    enable = true;
+    package = pkgs.emacs29-pgtk.override { 
+      # inherit (pkgs) imagemagickBig; 
+      withImageMagick = true;
+    };
+    # package = (pkgs.emacsWithPackages.override {
+    #     imagemagick = pkgs.imagemagickBig;
+    #     withImagemagick = true;
+    # };
+    # }
+    # );
+  };
 }
diff --git a/modules/gui/niri.nix b/modules/gui/niri.nix
new file mode 100644
index 0000000..b681e8a
--- /dev/null
+++ b/modules/gui/niri.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, nixos-unstable, inputs, ... }:
+
+{
+  programs.niri = {
+    enable = true;
+    # wrapperFeatures.gtk = true;
+  };}
+  
diff --git a/modules/shell.nix b/modules/shell.nix
index f431eb6..f59c029 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -6,9 +6,6 @@
   #     ls = "eza";
   #     tree = "eza -T";
   #   };
-  #   initExtra = ''
-  #   export EDITOR=emacs\ -nw
-  #   '';
   # };
   programs.zsh = {
     enable = true;
@@ -19,7 +16,6 @@
       ip = "ip -c";
     };
     initExtraFirst = ''
-      export EDITOR=emacs\ -nw
       [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
       source "$EAT_SHELL_INTEGRATION_DIR/zsh"
       source ~/.p10k.zsh