configuration.nix

@@ -102,6 +102,7 @@
 pkgs.fprintd
     wget
     vim
+    emacs29-pgtk
     sg3_utils
     nfs-utils
     fontconfig

flake.nix

@@ -29,6 +29,10 @@
       url = "github:nix-community/home-manager"; #/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+    emacs-config = {
+      url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
+      flake = false;
+    };
     displaylink = {
       url = "file+https://marq42.xyz/displaylink-580.zip";
       flake = false;

home.nix

@@ -6,14 +6,15 @@ 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
@@ -55,7 +56,11 @@ 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";
@@ -87,6 +92,11 @@ with lib.hm.gvariant;
   # programs.gdb = {
   #   enable = true;
   # };
+  # home.file.".emacs.d" = {
+  #   source = inputs.emacs-config;
+  #   recursive = true;
+  # };
+
 
   programs.gpg = {
     enable = true;

modules/emacs.nix

@@ -1,33 +1,20 @@
 { 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
-#    ];
-#    }
-#)];
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacs29-pgtk.override { 
-      # inherit (pkgs) imagemagickBig; 
-      withImageMagick = true;
-    };
-    # package = (pkgs.emacsWithPackages.override {
-    #     imagemagick = pkgs.imagemagickBig;
-    #     withImagemagick = true;
-    # };
-    # }
-    # );
-  };
+  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
+    ];
+    }
+)];
 }

modules/gui/niri.nix

@@ -1,8 +0,0 @@
-{ config, lib, pkgs, nixos-unstable, inputs, ... }:
-
-{
-  programs.niri = {
-    enable = true;
-    # wrapperFeatures.gtk = true;
-  };}
-  

modules/shell.nix

@@ -6,6 +6,9 @@
   #     ls = "eza";
   #     tree = "eza -T";
   #   };
+  #   initExtra = ''
+  #   export EDITOR=emacs\ -nw
+  #   '';
   # };
   programs.zsh = {
     enable = true;
@@ -16,6 +19,7 @@
       ip = "ip -c";
     };
     initExtraFirst = ''
+      export EDITOR=emacs\ -nw
       [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
       source "$EAT_SHELL_INTEGRATION_DIR/zsh"
       source ~/.p10k.zsh