From 9263b2b3349d2a3a9256096e0f5daa694d892c37 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 30 May 2024 20:26:39 +0200
Subject: [PATCH 1/3] Experimentes with EAF
---
packages/eaf.nix | 46 +++++++++++++++++++++++++++++++++++++------
packages/packages.nix | 10 ++++++----
2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/packages/eaf.nix b/packages/eaf.nix
index 136b16e..2f5aee9 100644
--- a/packages/eaf.nix
+++ b/packages/eaf.nix
@@ -20,12 +20,15 @@ let
# TODO: Package nodejs environment
pythonEnv = ((python3.withPackages(ps: [
- ps.pyqtwebengine
- ps.pyqt5
+ # ps.pyqtwebengine
+ ps.pyqt6
+ ps.pyqt6-webengine
ps.qrcode
ps.qtconsole
ps.retry
ps.pymupdf
+ ps.sexpdata
+ ps.epc
# Wrap native dependencies in python env $PATH
pkgs.aria2
])).override { ignoreCollisions = true; });
@@ -35,6 +38,27 @@ let
pname = "eaf";
version = "20210309.0";
+ eaf-terminal = fetchFromGitHub {
+ owner = "emacs-eaf";
+ repo = "eaf-terminal";
+ rev = "b7ddb82baf9604cb52a83d6e0631e6a5edc415b1";
+ hash = "sha256-4TRIAcReJs9a91DMKD+puApmSstxYLgLHV300GFDufQ=";
+ };
+
+ eaf-browser = fetchFromGitHub {
+ owner = "emacs-eaf";
+ repo = "eaf-browser";
+ rev = "9761f7bd22aa69f144a0a032643b0834dde6cb60";
+ hash = "sha256-jcCn16lXqcq1UcekekJiTfRBjjgaY0Hkz69ycElSzuA=";
+ };
+
+ eaf-pdf-viewer = fetchFromGitHub {
+ owner = "emacs-eaf";
+ repo = "eaf-pdf-viewer";
+ rev = "0b79e9000551200b6a0d2206de14b87d9ed3c9c9";
+ hash = "sha256-Co5RWWI0OC1w5JrCVpbwafuEEluh48JDzkMQp5QdIbE=";
+};
+
in melpaBuild {
inherit pname version;
@@ -42,15 +66,25 @@ in melpaBuild {
src = fetchFromGitHub {
owner = "emacs-eaf";
repo = "emacs-application-framework";
- rev = "d55fef029d9a8fa529d2290f2da178dc8ff3d6f7";
- sha256 = "sha256-0UGeo4I4JB95A8W870x4IS6Syh6roMomjTTNQNGbS3E";
+ rev = "9bf8caba36e27fafcef5d8e68969a1a8eb5432ed";
+ sha256 = "sha256-4CPhEO4d66GzD3vOcNyRl6DmRDYiiIeRhX/9RUPZ+PM=";
};
dontConfigure = true;
dontBuild = true;
postPatch = ''
-
+ substituteInPlace eaf.el \
+ --replace '"xdotool' '"${xdotool}/bin/xdotool' \
+ --replace '"wmctrl' '"${wmctrl}'
+ sed -i s#'defcustom eaf-python-command .*'#'defcustom eaf-python-command "${pythonEnv.interpreter}"'# eaf.el
+ mkdir app
+ cp -r ${eaf-terminal} app/terminal
+ cp -r ${eaf-pdf-viewer} app/pdf-viewer
+ cp -r ${eaf-browser} app/browser
+ substituteInPlace app/terminal/buffer.py --replace-warn \
+ '"node"' \
+ '"${node}"'
'';
installPhase = ''
@@ -60,7 +94,7 @@ in melpaBuild {
recipe = writeText "recipe" ''
(eaf
- :repo "manateelazycat/emacs-application-framework"
+ :repo "emacs-eaf/emacs-application-framework"
:fetcher github
:files ("*")
'';
diff --git a/packages/packages.nix b/packages/packages.nix
index 8373098..a9536cb 100644
--- a/packages/packages.nix
+++ b/packages/packages.nix
@@ -107,7 +107,9 @@ in
mainPackages
++ (builtins.attrValues extraPackages)
# Playing with EAF
- ++ [(pkgs.callPackage ./eaf.nix {
- inherit (epkgs) melpaBuild;
- inherit (melpaPackages) ctable deferred epc s;
- })]
+ ++ [
+ (pkgs.callPackage ./eaf.nix {
+ inherit (epkgs) melpaBuild;
+ inherit (melpaPackages) ctable deferred epc s;
+ })
+ ]
From 4995f3359120cc7dd03264d040a68077bc6923c2 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 30 May 2024 20:26:57 +0200
Subject: [PATCH 2/3] Disable tree-sitter for terraform
---
init.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init.el b/init.el
index fc6e1a0..e486c4f 100644
--- a/init.el
+++ b/init.el
@@ -512,7 +512,7 @@
(add-to-list 'eglot-server-programs
'(terraform-mode . ("terraform-lsp")))
:hook ((terraform-mode . eglot-ensure)
- (terraform-mode . tree-sitter-hl-mode)
+ ;; (terraform-mode . tree-sitter-hl-mode)
(terraform-mode . (lambda () (setq indent-bars-spacing-override 2) (indent-bars-mode)))
))
From d691f908fca60f8a3232b12ec9c60b141b3d67cb Mon Sep 17 00:00:00 2001
From: Seven of Nine <sevenofnine@stronzi.org>
Date: Fri, 31 May 2024 12:30:53 +0000
Subject: [PATCH 3/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/2a294b099b479a62a5e37964dfe5ceb75e74fdd8' (2024-05-01)
→ 'github:nix-community/emacs-overlay/b95883a0b9701e7d716e5c298e5d7961076301cd' (2024-05-31)
• Updated input 'emacs-overlay/nixpkgs':
'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27)
→ 'github:NixOS/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b' (2024-05-29)
• Updated input 'emacs-overlay/nixpkgs-stable':
'github:NixOS/nixpkgs/576ecd43d3b864966b4423a853412d6177775e8b' (2024-04-29)
→ 'github:NixOS/nixpkgs/25cf937a30bf0801447f6bf544fc7486c6309234' (2024-05-29)
• Updated input 'extra-package-copilot':
'github:zerolfx/copilot.el/edf517a57f539eb41eaa2f92c6752538f3a62b72' (2024-04-15)
→ 'github:zerolfx/copilot.el/733bff26450255e092c10873580e9abfed8a81b8' (2024-05-01)
• Updated input 'extra-package-indent-bars':
'github:jdtsmith/indent-bars/4974f6c16c7fcc8bbe53fbcd93c74794877287a1' (2024-04-21)
→ 'github:jdtsmith/indent-bars/2216793de857cc21a1faba95361446dacdc8f3f5' (2024-05-30)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
→ 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9' (2024-05-16)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089?dir=lib' (2024-03-29)
→ 'https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz?narHash=sha256-QBx10%2Bk6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94%3D' (2024-05-02)
---
flake.lock | 54 ++++++++++++++++++++++++------------------------------
1 file changed, 24 insertions(+), 30 deletions(-)
diff --git a/flake.lock b/flake.lock
index 151020f..e891a5b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1714528291,
- "narHash": "sha256-eZe8RbeCwvBU4MO9tyIGBZ0TPUeBuqH0zvjyT0ANAo4=",
+ "lastModified": 1717146521,
+ "narHash": "sha256-tO5THLapCBZ7IGEeROvPitB1FYTlZK4RO/uCoTn+0q4=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "2a294b099b479a62a5e37964dfe5ceb75e74fdd8",
+ "rev": "b95883a0b9701e7d716e5c298e5d7961076301cd",
"type": "github"
},
"original": {
@@ -55,11 +55,11 @@
"extra-package-copilot": {
"flake": false,
"locked": {
- "lastModified": 1713189314,
- "narHash": "sha256-53BGX2llkrM5mDmFSVe+O/Vo4F2gDJTFh/4TqBuQme8=",
+ "lastModified": 1714572852,
+ "narHash": "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0=",
"owner": "zerolfx",
"repo": "copilot.el",
- "rev": "edf517a57f539eb41eaa2f92c6752538f3a62b72",
+ "rev": "733bff26450255e092c10873580e9abfed8a81b8",
"type": "github"
},
"original": {
@@ -71,11 +71,11 @@
"extra-package-indent-bars": {
"flake": false,
"locked": {
- "lastModified": 1713707934,
- "narHash": "sha256-KGqP80JC0/uPol6diU8XcuHfK7i0hlKY6NoqAZh4QFY=",
+ "lastModified": 1717080421,
+ "narHash": "sha256-I+W3zXk7lza8XTuw/O7sXlXfn8wALtO6kMlj+nF5nfE=",
"owner": "jdtsmith",
"repo": "indent-bars",
- "rev": "4974f6c16c7fcc8bbe53fbcd93c74794877287a1",
+ "rev": "2216793de857cc21a1faba95361446dacdc8f3f5",
"type": "github"
},
"original": {
@@ -122,11 +122,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1712014858,
- "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+ "lastModified": 1715865404,
+ "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+ "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
@@ -194,11 +194,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1714253743,
- "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+ "lastModified": 1716948383,
+ "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+ "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github"
},
"original": {
@@ -210,29 +210,23 @@
},
"nixpkgs-lib": {
"locked": {
- "dir": "lib",
- "lastModified": 1711703276,
- "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
- "type": "github"
+ "lastModified": 1714640452,
+ "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
},
"original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1714409183,
- "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=",
+ "lastModified": 1716991068,
+ "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "576ecd43d3b864966b4423a853412d6177775e8b",
+ "rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
"type": "github"
},
"original": {