flake.lock: Update

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/856a2902156ba304efebd4c1096dbf7465569454' (2024-11-04)
  → 'github:nix-community/disko/5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f' (2024-11-08)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/1febd5c1ad7e798543c886756c598e0fb8d473fd' (2024-11-05)
  → 'github:nix-community/emacs-overlay/2313c4189eaef014d01fb260313f58554ddb5e31' (2024-11-08)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02)
  → 'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/d063c1dd113c91ab27959ba540c0d9753409edf3' (2024-11-04)
  → 'github:NixOS/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede' (2024-11-06)
• Updated input 'homeManager':
    'github:nix-community/home-manager/8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661' (2024-11-03)
  → 'github:nix-community/home-manager/2f607e07f3ac7e53541120536708e824acccfaa8' (2024-11-05)
• Updated input 'lix-eval-jobs/flake-parts':
    'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01)
  → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01)
• Updated input 'lix-eval-jobs/nix-github-actions':
    'github:nix-community/nix-github-actions/e04df33f62cdcf93d73e9a04142464753a16db67' (2024-10-24)
  → 'github:nix-community/nix-github-actions/622f829f5fe69310a866c8a6cd07e747c44ef820' (2024-07-04)
• Updated input 'lix-eval-jobs/treefmt-nix':
    'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30)
  → 'github:numtide/treefmt-nix/349de7bc435bdff37785c2466f054ed1766173be' (2024-08-12)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/0516be85630befa2c1e8042ac873342ce186b2f6' (2024-10-30)
  → 'github:NixOS/mobile-nixos/2268e358ed407d9c0a4499ae767d105eeaeec586' (2024-11-06)
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/0e3f3f017c14467085f15d42343a3aaaacd89bcb' (2024-11-05)
  → 'github:LnL7/nix-darwin/2fbf4a8417c28cf45bae6e6e97248cbbd9b78632' (2024-11-08)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/2e78b1af8025108ecd6edaa3ab09695b8a4d3d55' (2024-11-05)
  → 'github:NixOS/nixos-hardware/e1cc1f6483393634aee94514186d21a4871e78d7' (2024-11-06)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02)
  → 'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)

checks/default.nix

@@ -16,7 +16,7 @@
       treefmt.config = {
         projectRootFile = ".git/config";
         programs = {
-          nixfmt-rfc-style.enable = true;
+          nixfmt.enable = true;
           deadnix.enable = false;
         };
       };
@@ -32,9 +32,7 @@
       build = _: nc: nc.config.system.build.toplevel;
     in
     {
-      x86_64-linux = lib.mapAttrs build {
+      x86_64-linux = lib.mapAttrs build { inherit (self.nixosConfigurations) picard; };
-        inherit (self.nixosConfigurations) picard;
-      };
       aarch64-linux = lib.mapAttrs build {
         inherit (self.nixosConfigurations) sisko; # pbp;
       };

flake.lock

@@ -80,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730751873,
+        "lastModified": 1731060864,
-        "narHash": "sha256-sdY29RWz0S7VbaoTwSy6RummdHKf0wUTaBlqPxrtvmQ=",
+        "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "856a2902156ba304efebd4c1096dbf7465569454",
+        "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1730970854,
+        "lastModified": 1731057136,
-        "narHash": "sha256-PvStjAOzvb3Ta9lUkPtbXKE3HJ+4/zsWvHJFO/mzD2o=",
+        "narHash": "sha256-/E0UgOD6LnDfJPqCwqa1WVEgwDQ6NXXH+Wq89cMUris=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "83b6f9732eaf48f94d8ad6baa5cc2bf82bc3d3ff",
+        "rev": "2313c4189eaef014d01fb260313f58554ddb5e31",
         "type": "github"
       },
       "original": {
@@ -218,6 +218,27 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "lix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
@@ -235,7 +256,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixThePlanet",
@@ -256,7 +277,7 @@
         "type": "indirect"
       }
     },
-    "flake-parts_4": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_3"
       },
@@ -411,7 +432,7 @@
     },
     "hercules-ci-effects": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
@@ -571,19 +592,46 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1730938523,
+        "lastModified": 1728951119,
-        "narHash": "sha256-UAh8hocN7Vdl+sXxuToL6Cm1TsMHBpcEmHy+l5xFrMk=",
+        "narHash": "sha256-vUBgL8zJBDyj2serxdEVbNqe6pBN4YgWwhtg3XP8mpQ=",
         "ref": "refs/heads/main",
-        "rev": "72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f",
+        "rev": "f6077314fa6aff862758095bb55fe844e9162a1d",
-        "revCount": 16454,
+        "revCount": 16344,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
       "original": {
+        "rev": "f6077314fa6aff862758095bb55fe844e9162a1d",
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       }
     },
+    "lix-eval-jobs": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "lix": [
+          "lix"
+        ],
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1723579251,
+        "narHash": "sha256-xnHtfw0gRhV+2S9U7hQwvp2klTy1Iv7FlMMO0/WiMVc=",
+        "ref": "refs/heads/main",
+        "rev": "42a160bce2fd9ffebc3809746bc80cc7208f9b08",
+        "revCount": 609,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nix-eval-jobs"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nix-eval-jobs"
+      }
+    },
     "lix-module": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -651,6 +699,27 @@
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "lix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1720066371,
+        "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nix-on-droid": {
       "inputs": {
         "home-manager": "home-manager_2",
@@ -679,11 +748,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1730980823,
+        "lastModified": 1731032247,
-        "narHash": "sha256-nUSlnYSeg4N18LByLw8luEvrV+8Hwgddh9Bp13mo3wA=",
+        "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "fa7b46fa7716d0ff1abaa59ee2472ab25ad07188",
+        "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632",
         "type": "github"
       },
       "original": {
@@ -694,7 +763,7 @@
     },
     "nixThePlanet": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "hercules-ci-effects": "hercules-ci-effects",
         "nixpkgs": [
           "nixpkgs"
@@ -1153,13 +1222,13 @@
     "rock5b": {
       "inputs": {
         "fan-control": "fan-control",
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_5",
         "kernel-src": "kernel-src",
         "nixpkgs": "nixpkgs_8",
         "nixpkgs-kernel": "nixpkgs-kernel",
         "panfork": "panfork",
         "tow-boot": "tow-boot",
-        "treefmt-nix": "treefmt-nix"
+        "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
         "lastModified": 1685695782,
@@ -1189,6 +1258,7 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "lix": "lix",
+        "lix-eval-jobs": "lix-eval-jobs",
         "lix-module": "lix-module",
         "mobile-nixos": "mobile-nixos",
         "nix-on-droid": "nix-on-droid",
@@ -1197,7 +1267,7 @@
         "nixosHardware": "nixosHardware",
         "nixpkgs": "nixpkgs_7",
         "rock5b": "rock5b",
-        "treefmt-nix": "treefmt-nix_2",
+        "treefmt-nix": "treefmt-nix_3",
         "vscode-server": "vscode-server"
       }
     },
@@ -1323,6 +1393,27 @@
       }
     },
     "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "lix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723454642,
+        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
           "rock5b",
@@ -1343,7 +1434,7 @@
         "type": "github"
       }
     },
-    "treefmt-nix_2": {
+    "treefmt-nix_3": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"

flake.nix

@@ -38,7 +38,7 @@
     };
     nix-on-droid.url = "github:nix-community/nix-on-droid";
     lix = {
-      url = "git+https://git@git.lix.systems/lix-project/lix";
+      url = "git+https://git@git.lix.systems/lix-project/lix?rev=f6077314fa6aff862758095bb55fe844e9162a1d"; # FIXME update
       flake = false;
     };
     lix-module = {
@@ -46,6 +46,11 @@
       inputs.lix.follows = "lix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    lix-eval-jobs = {
+      url = "git+https://git.lix.systems/lix-project/nix-eval-jobs";
+      inputs.lix.follows = "lix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     mobile-nixos = {
       url = "github:NixOS/mobile-nixos";
       flake = false;

hmModules/emacs/init.el

@@ -1,11 +1,10 @@
 ;; package --- My Emacs config -*- lexical-binding:t -*-
 ;; Author: Andrea Ciceri <andrea.ciceri@autistici.org>
 ;;; Commentary:
-;; TODO
+;; TODO org goodies
-;; - org-roam
+;; TODO understand how to configure cape
-;; - org goodies
+;; TODO org-roam-protocol to capture notes from the browser
-;; - persp-mode?
+;; TODO attach documents (like PDFs) to my Zettelkasten notes
-;; - understand how to configure cape
 ;;; Code:
 
 
@@ -720,7 +719,13 @@ This is meant to be an helper to be called from the window manager."
     (set-face-attribute face nil :inherit 'fixed-pitch))
   
   (org-babel-do-load-languages
-   'org-babel-load-languages '((haskell . t))))
+   'org-babel-load-languages '((haskell . t)))
+  
+  (defun ccr/org-attach-save-file-list-to-property (dir)
+    "Save list of attachments to ORG_ATTACH_FILES property."
+    (when-let* ((files (org-attach-file-list dir)))
+      (org-set-property "ORG_ATTACH_FILES" (mapconcat #'identity files ", "))))
+  (add-hook 'org-attach-after-change-hook #'ccr/org-attach-save-file-list-to-property))
 
 (use-package org-agenda
   :custom
@@ -764,7 +769,7 @@ This is meant to be an helper to be called from the window manager."
    '(
      ("d" "Generic entry" entry
       "* %?"
-      :target (file+head "%<%Y-%m-%d>.org" "#+title %<%Y-%m-%d>"))
+      :target (file+head "%<%Y-%m-%d>.org" "#+TITLE: %<%Y-%m-%d>"))
      ("b" "Billable entry" entry
       "* TODO ${Entry} :billable:${Client}:\n:PROPERTIES:\n:SPENT: ${Spent}\n:END:\n%?"
       :target (file+head "%<%Y-%m-%d>.org" "#+title %<%Y-%m-%d>")
@@ -869,7 +874,7 @@ This is meant to be an helper to be called from the window manager."
 	    (end-pos (line-end-position)))
 	(gptel-request
 	    (buffer-substring-no-properties start-pos end-pos) ;the prompt
-	  :system "You are proficient with emacs shell (eshell), translate the following to something I could directly prompt to the shell. Your responses should only be code, without explanation or formatting."
+	  :system "You are proficient with emacs shell (eshell), translate the following to something I could directly prompt to the shell. Your responses should only be code, without explanation or formatting or quoting."
 	  :buffer (current-buffer)
 	  :context (cons (set-marker (make-marker) start-pos)
 			 (set-marker (make-marker) end-pos))

hmModules/hyprland/default.nix

@@ -1,8 +1,4 @@
-{
+{ config, pkgs, ... }:
-  config,
-  pkgs,
-  ...
-}:
 let
   screenshotScript = pkgs.writeShellScriptBin "screenshot.sh" ''
     filename="$HOME/shots/$(date --iso-8601=seconds).png"
@@ -28,7 +24,7 @@ in
     ../swayidle
     ../gammastep
     # ../wezterm
-    ../wayvnc
+    # ../wayvnc
     ../swaync
     ../foot
   ];
@@ -61,11 +57,11 @@ in
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
-    # cursorTheme = {
+    cursorTheme = {
-    #   name = "catppuccin-mocha-sapphire";
+      name = "catppuccin-mocha-sapphire";
-    #   package = pkgs.catppuccin-cursors;
+      package = pkgs.catppuccin-cursors;
-    #   size = 48;
+      size = 40;
-    # };
+    };
   };
 
   qt = {

hmModules/hyprland/hyprland.conf

@@ -5,9 +5,9 @@ cursor {
 }
 
 env = HYPRCURSOR_THEME,catppuccin-mocha-sapphire
-env = HYPRCURSOR_SIZE,48
+env = HYPRCURSOR_SIZE,40
 env = XCURSOR_THEME,catppuccin-mocha-sapphire
-env = XCURSOR_SIZE,48
+env = XCURSOR_SIZE,40
 
 $mod = SUPER
 
@@ -35,6 +35,7 @@ bind = $mod, t, exec, footclient $SHELL
 bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
 bind = $mod, m, exec, emacsclient -c --eval '(notmuch-search "tag:new")'
 bind = $mod, g, exec, emacsclient -c --eval '(switch-to-buffer (gptel "*ChatGPT*"))'
+bind = $mod, c, exec, emacsclient -c --eval '(org-roam-dailies-capture-today)'
 bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0
 bind = $mod, s, exec, screenshot.sh
 bind = $mod, n, exec, logseq

hosts/kirk/default.nix

@@ -36,9 +36,7 @@
       "promtail"
       "syncthing"
     ]
-    ++ [
+    ++ [ ./disko.nix ];
-      ./disko.nix
-    ];
 
   ccr = {
     enable = true;
@@ -86,11 +84,9 @@
     "usb_storage"
     "sd_mod"
   ];
-  boot.kernelModules = [
+  boot.kernelModules = [ "kvm-intel" ];
-    "kvm-intel"
-  ];
 
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10;
+  boot.kernelPackages = pkgs.linuxPackages;
 
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot = {

hosts/picard/default.nix

@@ -43,9 +43,7 @@
       "prometheus-exporters"
       "promtail"
     ]
-    ++ [
+    ++ [ ./disko.nix ];
-      ./disko.nix
-    ];
 
   ccr = {
     enable = true;
@@ -126,17 +124,17 @@
     }))
   ];
 
-  systemd.services.ddcci = {
+  # systemd.services.ddcci = {
-    script = ''
+  #   script = ''
-      echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
+  #     echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
-    '';
+  #   '';
-    wantedBy = [ "graphical.target" ];
+  #   wantedBy = [ "graphical.target" ];
-    restartIfChanged = false;
+  #   restartIfChanged = false;
-    serviceConfig = {
+  #   serviceConfig = {
-      Type = "oneshot";
+  #     Type = "oneshot";
-      RemainAfterExit = true;
+  #     RemainAfterExit = true;
-    };
+  #   };
-  };
+  # };
 
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot = {
@@ -148,7 +146,7 @@
     configurationLimit = 20;
   };
 
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10;
+  boot.kernelPackages = pkgs.linuxPackages;
 
   networking.hostId = "5b02e763";
 

modules/nix/default.nix

@@ -5,6 +5,14 @@
   ...
 }:
 {
+  nixpkgs.overlays = [
+    (final: _: {
+      nix-eval-job = fleetFlake.inputs.lix-eval-jobs.packages.${final.system}.nix-eval-jobs // {
+        nix = final.nix;
+      };
+    })
+  ];
+
   nix = {
     optimise.automatic = true;
 

packages/emacs/packages.nix

@@ -2,89 +2,114 @@ pkgs: epkgs:
 let
   inherit (epkgs) melpaPackages nongnuPackages elpaPackages;
 
-  # *Attrset* containig extra emacs packages from flake inputs
+  buildEmacsPackage =
+    args:
+    epkgs.trivialBuild {
+      pname = args.name;
+      inherit (args) src;
+      version = args.src.rev;
+      propagatedUserEnvPkgs = args.deps;
+      buildInputs = args.deps;
+    };
+
+  # *Attrset* containig extra emacs packages
+  extraPackages = {
+    combobulate = buildEmacsPackage {
+      name = "combobulate";
+      src = pkgs.fetchFromGitHub {
+        owner = "mickeynp";
+        repo = "combobulate";
+        rev = "e9c5be84062e8183f556d7133d5a477a57e37e51";
+        hash = "sha256-r6jObsYx7RRTJUmrCN5h3+0WcHqJA67emhr4/W3rBrM=";
+      };
+      deps = [ ];
+    };
+  };
 
   # *List* containing emacs packages from (M)ELPA
   mainPackages =
-    # builtins.filter
+    builtins.filter
-    # if an extra package has the same name then give precedence to it
+      # if an extra package has the same name then give precedence to it
-    # (package: ! builtins.elem package.pname (builtins.attrNames extraPackages))
+      (package: !builtins.elem package.pname (builtins.attrNames extraPackages))
-    (with melpaPackages; [
+      (
-      meow
+        with melpaPackages;
-      meow-tree-sitter
+        [
-      dracula-theme
+          meow
-      nord-theme
+          meow-tree-sitter
-      catppuccin-theme
+          dracula-theme
-      modus-themes
+          nord-theme
-      # solaire-mode
+          catppuccin-theme
-      nerd-icons
+          modus-themes
-      nerd-icons-completion
+          # solaire-mode
-      nerd-icons-ibuffer
+          nerd-icons
-      nerd-icons-dired
+          nerd-icons-completion
-      ligature
+          nerd-icons-ibuffer
-      treemacs-nerd-icons
+          nerd-icons-dired
-      eshell-syntax-highlighting
+          ligature
-      fish-completion # fish completion for eshell
+          treemacs-nerd-icons
-      eshell-prompt-extras
+          eshell-syntax-highlighting
-      eshell-atuin
+          fish-completion # fish completion for eshell
-      eshell-command-not-found
+          eshell-prompt-extras
-      clipetty
+          eshell-atuin
-      sideline
+          eshell-command-not-found
-      consult-eglot
+          clipetty
-      # sideline-flymake
+          sideline
-      rainbow-delimiters
+          consult-eglot
-      vertico
+          # sideline-flymake
-      marginalia
+          rainbow-delimiters
-      consult
+          vertico
-      orderless
+          marginalia
-      embark
+          consult
-      embark-consult
+          orderless
-      magit
+          embark
-      magit-delta
+          embark-consult
-      magit-todos
+          magit
-      difftastic
+          magit-delta
-      with-editor
+          magit-todos
-      diff-hl
+          difftastic
-      corfu
+          with-editor
-      cape
+          diff-hl
-      which-key
+          corfu
-      nix-mode
+          cape
-      nix-ts-mode
+          which-key
-      agenix
+          nix-mode
-      zig-mode
+          nix-ts-mode
-      unisonlang-mode
+          agenix
-      purescript-mode
+          zig-mode
-      dhall-mode
+          unisonlang-mode
-      envrc
+          purescript-mode
-      inheritenv
+          dhall-mode
-      popper
+          envrc
-      paredit
+          inheritenv
-      yaml-mode
+          popper
-      hl-todo
+          paredit
-      markdown-mode
+          yaml-mode
-      haskell-mode
+          hl-todo
-      terraform-mode
+          markdown-mode
-      diredfl
+          haskell-mode
-      org-modern
+          terraform-mode
-      org-roam
+          diredfl
-      org-roam-ql
+          org-modern
-      org-roam-ui
+          org-roam
-      visual-fill-column
+          org-roam-ql
-      consult-org-roam
+          org-roam-ui
-      pass
+          visual-fill-column
-      password-store-otp
+          consult-org-roam
-      eldoc-box
+          pass
-      go-translate
+          password-store-otp
-      notmuch
+          eldoc-box
-      consult-notmuch
+          go-translate
-      poly-org
+          notmuch
-      casual-calc
+          consult-notmuch
-      gptel
+          poly-org
-      agenix
+          casual
-      solidity-mode
+          gptel
-      # org-re-reveal # FIXME very not nice hash mismatch when building
+          agenix
-      # gptel # TODO uncomment when there will be a new release including GPT-4o 
+          solidity-mode
-    ])
+          # org-re-reveal # FIXME very not nice hash mismatch when building
+          # gptel # TODO uncomment when there will be a new release including GPT-4o 
+        ]
+      )
     ++ (with elpaPackages; [
       delight
       kind-icon
@@ -98,13 +123,4 @@ let
       haskell-ts-mode
     ]);
 in
-mainPackages
+mainPackages ++ (builtins.attrValues extraPackages)
-# ++ (builtins.attrValues extraPackages)
-# Playing with EAF
-++ [
-  # Disabled because pymupdf was broken
-  # (pkgs.callPackage ./eaf.nix {
-  #   inherit (epkgs) melpaBuild;
-  #   inherit (melpaPackages) ctable deferred epc s;
-  # })
-]