Revert back to the previous nixpkgs version

flake.lock

@@ -118,17 +118,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715087517,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
+        "lastModified": 1707451808,
+        "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "442d407992384ed9c0e6d352de75b69079904e4e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "442d407992384ed9c0e6d352de75b69079904e4e",
         "type": "github"
       }
     },

flake.nix

@@ -16,8 +16,7 @@
 {
   description = "FG42 - Emacs Editor for advance users";
 
-  #inputs.nixpkgs.url = "github:NixOS/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/b211b392b8486ee79df6cdfb1157ad2133427a29";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e";
   inputs.noether = {
     url = "git+https://devheroes.codes/lxsameer/noether?ref=refs/tags/v0.1.11";
     inputs.nixpkgs.follows = "nixpkgs";
@@ -102,7 +101,6 @@
           type = "app";
           program = "${fg42}/bin/fg42";
         };
-
       };
   };
 }

lisp/fg42/editor.el

@@ -290,6 +290,7 @@ contextual information."
 
   (when-wm
    ;; Activating the WM mode
+   (debug)
    (exwm-enable)
    (exwm-systemtray-enable)
    (exwm-randr-enable))

lisp/fg42/wm.el

@@ -26,16 +26,16 @@
 
 
 (defvar workspace-configuration
-  '(0 "HDMI-1"
-      1 "HDMI-1"
-      2 "HDMI-1"
-      3 "HDMI-1"
-      4 "HDMI-1"
-      5 "HDMI-1"
-      6 "HDMI-1"
-      7 "HDMI-1"
-      8 "HDMI-1"
-      9 "HDMI-1")
+  (list 0 "HDMI-1"
+        1 "HDMI-1"
+        2 "HDMI-1"
+        3 "HDMI-1"
+        4 "HDMI-1"
+        5 "HDMI-1"
+        6 "HDMI-1"
+        7 "HDMI-1"
+        8 "HDMI-1"
+        9 "HDMI-1")
   "Workspace configuration for EXWM.  (default 10 screens on HDMI-1).")
 
 ;; TODO: Document this
@@ -55,7 +55,7 @@
 
  (use! exwm-systemtray
    "Enables systemtray on EXWM"
-   :commands exwm-systemtray-enable)
+   :after exwm)
 
 
  ;; (use! mini-frame

nix/modules/editor/lisp/fg42/editor.el

@@ -317,11 +317,6 @@ short extension."
      (setq server-name "fg42-wm"))
     (server-start))
 
-  (when-wm
-   ;; Activating the WM mode
-   (exwm-enable)
-   (exwm-systemtray-enable)
-   (exwm-randr-enable))
   (message "[FG42]: Use `fg42-help' to get help."))
 
 

nix/modules/nix/lisp/fg42/nix-support.el

@@ -26,6 +26,7 @@
   (require 'fg42/config)
   (require 'cl-lib))
 
+
 (cl-defmethod fg42/setup-lang-server-for ((mode (eql nix-mode)))
   "Setup the lang server for the `nix-mode' as MODE."
   (with-eval-after-load 'eglot
@@ -33,9 +34,7 @@
     (let ((nil-lsp '(nix-mode . ("nil"
                                  :initializationOptions
                                  (:formatting (:command ["nixpkgs-fmt"]))))))
-      (add-to-list 'eglot-server-programs nil-lsp)
-      ;; (add-hook 'before-save-hook  #'fg42/lang-server-format)
-      ))
+      (add-to-list 'eglot-server-programs nil-lsp)))
   (eglot-ensure))
 
 
@@ -44,12 +43,7 @@
   :mode ("\\.nix\\'" "\\.nix.in\\'")
 
   :hook
-  ;;(nix-mode . fg42/ensure-lang-server)
-  ;;(nix-mode . fg42/setup-completion)
-  (nix-mode . flyspell-prog-mode)
-
-  :config
-  )
+  (nix-mode . flyspell-prog-mode))
 
 
 (use! nix-drv-mode

nix/modules/unit/default.nix

@@ -100,6 +100,7 @@ in
       default = pkgs.emacs29.override ({
         withTreeSitter = true;
         toolkit = "no";
+        withSQLite3 = true;
       });
       description = "What Emacs package to use.";
     };

nix/modules/unit/lisp/fg42.el

@@ -111,6 +111,7 @@
   "The entry point of FG42."
   (when (string= (getenv "FG42_DEBUG") "1")
     (setq debug-on-error t
+          edebug-all-forms t
           fg42/debug? t))
 
   ;; We don't use any Emacs package manager, so
@@ -130,10 +131,16 @@
         (or (getenv "FG42_CONFIG_FILE")
             (path-join fg42/config-dir "fg42.el")))
 
+  (when (boundp 'native-comp-eln-load-path)
+    (setcar native-comp-eln-load-path fg42/cache-dir))
+
+  (when (file-exists-p user-init-file)
+    (load user-init-file))
+
   ;; Load the customization file. In FG42 it is different than
   ;; the default `user-init-file'
-  (if (file-exists-p custom-file)
-      (load custom-file))
+  (when (file-exists-p custom-file)
+    (load custom-file))
 
   ;; From point forward we can use normal Elisp stuff without
   ;; interfering with user's Emacs configuration

nix/modules/wm/lisp/fg42/wm.el

@@ -25,6 +25,11 @@
   (require 'fpkg)
   (require 'fg42/config))
 
+(setq debug-on-error t)
+;; (setq debug-on-quit t)
+(setq edebug-all-forms t)
+(setq debug-allow-recursive-debug t)
+
 
 (defvar workspace-configuration
   (list 0 "HDMI-1"
@@ -77,6 +82,15 @@
  (use! exwm
    "Emacs X Widnow manager."
    :commands exwm-enable
+   :hook (emacs-startup . (lambda ()
+                            (when-wm
+                             (message "[FG42]: Starting the window manager.")
+                             ;; Activating the WM moder
+                             (exwm-enable)
+                             (exwm-systemtray-enable)
+                             (exwm-randr-enable)
+                             (exwm-debug t)
+                             (message "[FG42]: Finished loading the window manager."))))
    :config
    (require 'exwm-config)
    ;;  (setq ido-enable-flex-matching t)
@@ -180,5 +194,6 @@
            (,(kbd "C-s") . ,(kbd "C-f"))))))
 
 
+
 (provide 'fg42/wm)
 ;;; wm.el ends here