diff --git a/flake.lock b/flake.lock index e891a5b..89b051b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717146521, - "narHash": "sha256-tO5THLapCBZ7IGEeROvPitB1FYTlZK4RO/uCoTn+0q4=", + "lastModified": 1717060122, + "narHash": "sha256-6dEQVBJks7RWEwTHcahF8k3UAL8dDJ0Mq0LV6pirJzM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b95883a0b9701e7d716e5c298e5d7961076301cd", + "rev": "6162935b3e287a34e4432d35dbbccbddc5491cfe", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "extra-package-indent-bars": { "flake": false, "locked": { - "lastModified": 1717080421, - "narHash": "sha256-I+W3zXk7lza8XTuw/O7sXlXfn8wALtO6kMlj+nF5nfE=", + "lastModified": 1716985595, + "narHash": "sha256-avjK2u5qyXZ9nEc1qQ7bSqu05qtLk9ZiILK0Pw65o7Q=", "owner": "jdtsmith", "repo": "indent-bars", - "rev": "2216793de857cc21a1faba95361446dacdc8f3f5", + "rev": "c516788fe3af69dec343a551b0c158335d756fab", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1716769173, + "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { diff --git a/init.el b/init.el index e486c4f..fc6e1a0 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))) )) diff --git a/packages/eaf.nix b/packages/eaf.nix index 2f5aee9..136b16e 100644 --- a/packages/eaf.nix +++ b/packages/eaf.nix @@ -20,15 +20,12 @@ let # TODO: Package nodejs environment pythonEnv = ((python3.withPackages(ps: [ - # ps.pyqtwebengine - ps.pyqt6 - ps.pyqt6-webengine + ps.pyqtwebengine + ps.pyqt5 ps.qrcode ps.qtconsole ps.retry ps.pymupdf - ps.sexpdata - ps.epc # Wrap native dependencies in python env $PATH pkgs.aria2 ])).override { ignoreCollisions = true; }); @@ -38,27 +35,6 @@ 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; @@ -66,25 +42,15 @@ in melpaBuild { src = fetchFromGitHub { owner = "emacs-eaf"; repo = "emacs-application-framework"; - rev = "9bf8caba36e27fafcef5d8e68969a1a8eb5432ed"; - sha256 = "sha256-4CPhEO4d66GzD3vOcNyRl6DmRDYiiIeRhX/9RUPZ+PM="; + rev = "d55fef029d9a8fa529d2290f2da178dc8ff3d6f7"; + sha256 = "sha256-0UGeo4I4JB95A8W870x4IS6Syh6roMomjTTNQNGbS3E"; }; 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 = '' @@ -94,7 +60,7 @@ in melpaBuild { recipe = writeText "recipe" '' (eaf - :repo "emacs-eaf/emacs-application-framework" + :repo "manateelazycat/emacs-application-framework" :fetcher github :files ("*") ''; diff --git a/packages/packages.nix b/packages/packages.nix index a9536cb..8373098 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -107,9 +107,7 @@ 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; + })]