configurations: emacs, move config to org file

configurations/host/materusPC/home/materus/default.nix

@@ -17,7 +17,7 @@
     enableTerminal = lib.mkDefault true;
     enableTerminalExtra = lib.mkDefault true;
     enableNixDevel = lib.mkDefault true;
-    editor.emacs.enable = false;
+    editor.emacs.enable = true;
     editor.code.fhs.enable = true;
     editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_18; in [
       llvmpkgs.clang

configurations/profile/home/editor/emacs/default.nix

@@ -1,5 +1,21 @@
-{ config, lib, pkgs, materusArg, ... }:
+{ config, lib, pkgs, materusArg, materusCfg, ... }:
 let
+  emacs-git =
+    materusCfg.configInputs.emacs-overlay.packages.x86_64-linux.emacs-git;
+
+  materus-config = e:
+    e.trivialBuild {
+      pname = "materus-config";
+      src = pkgs.writeText "materus-config.el" ''
+        (when (file-exists-p "${config.programs.emacs.package}/opt/emacs/buildtime")
+          (setq emacs-build-time (decode-time (seconds-to-time (string-to-number (with-temp-buffer
+            (insert-file-contents "${config.programs.emacs.package}/opt/emacs/buildtime")
+            (buffer-string)))))))
+        (provide 'materus-config)
+      '';
+      version = "1.0.0";
+    };
+
   configPath = "${materusArg.cfg.path}" + "/extraFiles/config/emacs/";
   inits = import ./init.nix {
     path = configPath;
@@ -7,66 +23,8 @@ let
   };
   packages = epkgs:
     with epkgs; [
-      elcord
-      persp-mode
-      dashboard
-      magit
-      avy
-      corfu
-      vterm
-      projectile
-      company
-      clipetty
-      which-key
-      iedit
-      hideshowvis
-      evil
-      treemacs-evil
-      treemacs
-      treemacs-nerd-icons
-      treemacs-perspective
-      treemacs-icons-dired
-      treemacs-magit
-      treemacs-projectile
-      tree-edit
-      vertico
-      marginalia
-      nerd-icons
-      nerd-icons-completion
-      perspective
-      minions
-      telephone-line
-      rainbow-delimiters
-      use-package
-      cmake-mode
-      lsp-mode
-      lsp-java
-      lsp-jedi
-      lsp-haskell
-      lsp-ui
-      lsp-treemacs
-      dap-mode
-      d-mode
-      lua-mode
-      multiple-cursors
-      org
-      org-rainbow-tags
-      org-roam
-      org-roam-ui
-      org-review
-      csharp-mode
-      markdown-mode
-      json-mode
-      nix-mode
-      no-littering
-      right-click-context
-      dracula-theme
-      doom-themes
-      orderless
-      popper
-      undo-tree
-      bash-completion
-      consult
+      (materus-config epkgs)
+      treesit-grammars.with-all-grammars
     ];
 
   default-config = ''
@@ -77,6 +35,7 @@ let
   emacsEnv = pkgs.buildEnv {
     name = "emacs-env";
     paths = with pkgs; [
+      nixfmt-classic
       python3
       lua
       multimarkdown
@@ -101,46 +60,85 @@ let
     (call-process-shell-command "${pkgs.xorg.xmodmap}/bin/xmodmap -e \"keycode 148 = Hyper_L\" -e \"remove Mod4 = Hyper_L\" -e \"add Mod3 = Hyper_L\" &" nil 0)
     (call-process-shell-command "${pkgs.xorg.xmodmap}/bin/xmodmap -e \"keycode 66 = Hyper_L\" -e \"remove Mod4 = Hyper_L\" -e \"add Mod3 = Hyper_L\" &" nil 0)
   '';
-in
-{
+in {
   options.materus.profile.editor.emacs.enable =
     materusArg.pkgs.lib.mkBoolOpt false "Enable emacs with materus cfg";
 
   config = lib.mkIf cfg.enable {
     home.activation.emacsCompile = lib.hm.dag.entryAfter [ "linkGeneration" ] ''
-      mkdir -p ${config.xdg.configHome}/emacs/var/backups
       mkdir -p ${config.xdg.configHome}/emacs/var/recovery
       mkdir -p ${config.xdg.configHome}/emacs/etc
+      
+      mkdir -p ${config.xdg.configHome}/emacs/var/backups
       run ${config.programs.emacs.finalPackage}/bin/emacs --batch \
       --eval '(setq warning-minimum-log-level :error)' \
-      --eval '(byte-recompile-directory "${config.xdg.configHome}/emacs/etc/materus" 0 t)' \
       --eval '(byte-compile-file "${config.xdg.configHome}/emacs/early-init.el")' \
+      --eval '(byte-compile-file "${config.xdg.configHome}/emacs/etc/materus/emacs-config.el")' \
       --eval '(byte-compile-file "${config.xdg.configHome}/emacs/init.el")'
     '';
 
     xdg.configFile = {
       "emacs/early-init.el".text = inits.earlyInitText;
       "emacs/init.el".text = default-config;
-      "emacs/etc/materus" =
-        {
-          source = configPath + "etc/materus";
-          recursive = true;
-        };
+      "emacs/etc/materus" = {
+        source = configPath + "etc/materus";
+        recursive = true;
+      };
+    };
+    xdg.desktopEntries.emacs = {
+      name = "Emacs";
+      genericName = "Edytor tekstu";
+      comment = "Edytuj tekst";
+      exec = ''env COLORTERM=truecolor emacsclient -a "" -c %F'';
+      icon = "emacs";
+      terminal = false;
+      type = "Application";
+      categories = [ "Development" "TextEditor" ];
+      mimeType = [
+        "text/english"
+        "text/plain"
+        "text/x-makefile"
+        "text/x-c++hdr"
+        "text/x-c++src"
+        "text/x-chdr"
+        "text/x-csrc"
+        "text/x-java"
+        "text/x-moc"
+        "text/x-pascal"
+        "text/x-tcl"
+        "text/x-tex"
+        "application/x-shellscript"
+        "text/x-c"
+        "text/x-c++"
+        "x-scheme-handler/org-protocol"
+      ];
+      actions.new-window = {
+        exec = ''env COLORTERM=truecolor emacsclient -a "" -c %F'';
+        name = "Nowe okno";
+      };
+      actions.no-daemon = {
+        exec = "env COLORTERM=truecolor emacs %F";
+        name = "Instancja samodzielna";
+      };
     };
 
     programs.emacs = {
       enable = true;
-      package = 
-        lib.mkDefault (pkgs.emacs29.override {
-          withSQLite3 = true;
-          withWebP = true;
-          withX = true;
-          withGTK3 = true;
-          withAlsaLib = true;
-          withGconf = true;
-          withImageMagick = true;
-          withXwidgets = true;
-        });
+      package = lib.mkDefault ((emacs-git.override {
+        withSQLite3 = true;
+        withWebP = true;
+        withX = true;
+        withGTK3 = true;
+        withAlsaLib = true;
+        withGconf = true;
+        withImageMagick = true;
+      }).overrideAttrs (f: p: {
+        postInstall = p.postInstall + ''
+          rm -fr $out/share/applications/*
+          mkdir -p $out/opt/emacs
+          date +%s | tr -d '\n' > $out/opt/emacs/buildtime
+        '';
+      }));
       extraPackages = epkgs: (packages epkgs);
     };
 

configurations/profile/home/editor/neovim.nix

@@ -13,7 +13,7 @@ in
       viAlias = true;
       vimAlias = true;
       vimdiffAlias = true;
-      defaultEditor = true;
+      defaultEditor = lib.mkDefault false;
 
 
       extraConfig = ''

configurations/profile/home/shell/default.nix

@@ -1,3 +1,4 @@
+{config, pkgs, lib, ...}:
 {
 
   imports = [
@@ -6,4 +7,12 @@
     ./fish.nix
     ./starship.nix
   ];
+  home.sessionVariables = {
+    EDITOR = lib.mkDefault (if (config.materus.profile.editor.emacs.enable) then 
+    lib.getBin (pkgs.writeShellScript "editor" ''${config.programs.emacs.finalPackage}/bin/emacsclient --alternate-editor= -c  -nw $@'') 
+    else "${pkgs.micro}/bin/micro");
+    VISUAL = lib.mkDefault (if (config.materus.profile.editor.emacs.enable) then 
+    lib.getBin (pkgs.writeShellScript "editor-visual" ''exec env COLORTERM=truecolor ${config.programs.emacs.finalPackage}/bin/emacsclient --alternate-editor= -c $@'')
+    else "${pkgs.micro}/bin/micro");
+  };
 }