aciceri/emacs
Archived
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: aciceri:21c2f1193512e8c8f7ca49200cf48559becd5547
Branches Tags
aciceri:master
aciceri:update-flake-lock
...
compare: aciceri:d53b82ba84e77073742d06cfbc45f62fac22117a
Branches Tags
aciceri:master
aciceri:update-flake-lock

2 commits
21c2f11935 ... d53b82ba84

Author SHA1 Message Date
Seven of Nine
d53b82ba84 flake.lock: Update
All checks were successful
/ test (push) Successful in 6m21s
Details 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/758aa1deb09d8d2dce7bd3a016434e8fcedfab89' (2024-08-21)
  → 'github:nix-community/emacs-overlay/f4acc62c00a67e5b71ce11e0ee2c3e1b3928c681' (2024-09-16)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba' (2024-08-18)
  → 'github:NixOS/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/f1bad50880bae73ff2d82fafc22010b4fc097a9c' (2024-08-19)
  → 'github:NixOS/nixpkgs/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49' (2024-09-14)
• Updated input 'extra-package-copilot':
    'github:zerolfx/copilot.el/535ef61e82f09d744cd5b097b1fc99f08cce175c' (2024-08-16)
  → 'github:zerolfx/copilot.el/8ddfbee370d4c6705b3bbd9532d0c722a78ba844' (2024-09-06)
• Updated input 'extra-package-haskell-ts-mode':
    'git+https://codeberg.org/pranshu/haskell-ts-mode.git?ref=refs/heads/main&rev=5d3bd04e43066164feaa864953d30e53e0e137e3' (2024-08-25)
  → 'git+https://codeberg.org/pranshu/haskell-ts-mode.git?ref=refs/heads/main&rev=a2b07815bca130713186ca4fce49c92c06905c8e' (2024-09-16)
• Updated input 'extra-package-indent-bars':
    'github:jdtsmith/indent-bars/b72fa098d7c48d61fb4b508071bd77d054268f4e' (2024-08-18)
  → 'github:jdtsmith/indent-bars/4a2e8e179285befaaf80ebae8d3f8016360967dc' (2024-09-15)
• Added input 'extra-package-typst-ts-mode':
    'git+https://codeberg.org/meow_king/typst-ts-mode.git?ref=refs/heads/main&rev=30f54090584a77057463d4bd7972e4cc3cbba4e7' (2024-09-09)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01)
  → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12)
• Updated input 'flake-parts/nixpkgs-lib':
    'a5d394176e.tar.gz?narHash=sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q%3D' (2024-08-01)
  → '356624c120.tar.gz?narHash=sha256-Ss8QWLXdr2JCBPcYChJhz4xJm%2Bh/xjl4G0c0XlP6a74%3D' (2024-09-01)
• Updated input 'hercules-ci-effects':
    'github:hercules-ci/hercules-ci-effects/11e4b8dc112e2f485d7c97e1cee77f9958f498f5' (2024-06-24)
  → 'github:hercules-ci/hercules-ci-effects/dba4367b9a9d9615456c430a6d6af716f6e84cef' (2024-08-29)
 2024-09-16 12:30:16 +00:00
Andrea Ciceri
6cc0c0f094
Things
Some checks failed
/ test (push) Failing after 14s
Details
2024-09-16 09:47:49 +02:00
4 changed files with 69 additions and 39 deletions
Show stats Expand all files Collapse all files

75
flake.lock generated
View file

@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1724231640, "lastModified": 1726477211,
"narHash": "sha256-1FnV0jk8GAItH71zVTzrhULylMKyXsb4FNmtn9b46Ug=", "narHash": "sha256-42boTsTLIUxalTeJSRWiTRCs30wfXu8KTDLbZc32BBk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "758aa1deb09d8d2dce7bd3a016434e8fcedfab89", "rev": "f4acc62c00a67e5b71ce11e0ee2c3e1b3928c681",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
"extra-package-copilot": { "extra-package-copilot": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723778577, "lastModified": 1725661679,
"narHash": "sha256-/ZDnEZWUFcKnUtFrd/4C7LX16GAdUQncU8ZnYzntKS0=", "narHash": "sha256-iMstEFd/Des5AGJY26S1MsC/lxceVr0WGFkLJpIUUZg=",
"owner": "zerolfx", "owner": "zerolfx",
"repo": "copilot.el", "repo": "copilot.el",
"rev": "535ef61e82f09d744cd5b097b1fc99f08cce175c", "rev": "8ddfbee370d4c6705b3bbd9532d0c722a78ba844",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"extra-package-haskell-ts-mode": { "extra-package-haskell-ts-mode": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724558409, "lastModified": 1726487881,
"narHash": "sha256-dmY9tE5xKB+8od/EJkcUsAZGFBsRiGmz26StbWxfXxo=", "narHash": "sha256-45Ah8ekUp1YGkM/i5si4K+E3/ccLWsx3/pTUieRIoZI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "5d3bd04e43066164feaa864953d30e53e0e137e3", "rev": "a2b07815bca130713186ca4fce49c92c06905c8e",
"revCount": 46, "revCount": 84,
"type": "git", "type": "git",
"url": "https://codeberg.org/pranshu/haskell-ts-mode.git" "url": "https://codeberg.org/pranshu/haskell-ts-mode.git"
}, },
@ -55,11 +55,11 @@
"extra-package-indent-bars": { "extra-package-indent-bars": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724025552, "lastModified": 1726438391,
"narHash": "sha256-xBwtj991wy2O764ATBEILsGk597f7pkCmDfbF+tbjns=", "narHash": "sha256-qWRkJUofGZdekJEbNNiIT+KGy5BovY0AA6Btm4Cp/pY=",
"owner": "jdtsmith", "owner": "jdtsmith",
"repo": "indent-bars", "repo": "indent-bars",
"rev": "b72fa098d7c48d61fb4b508071bd77d054268f4e", "rev": "4a2e8e179285befaaf80ebae8d3f8016360967dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,16 +84,32 @@
"type": "github" "type": "github"
} }
}, },
"extra-package-typst-ts-mode": {
"flake": false,
"locked": {
"lastModified": 1725890782,
"narHash": "sha256-8fkyK9KxE90oej2WxxKavFIHwPiL/VyPQ/WZx9B/Hr8=",
"ref": "refs/heads/main",
"rev": "30f54090584a77057463d4bd7972e4cc3cbba4e7",
"revCount": 211,
"type": "git",
"url": "https://codeberg.org/meow_king/typst-ts-mode.git"
},
"original": {
"type": "git",
"url": "https://codeberg.org/meow_king/typst-ts-mode.git"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1722555600, "lastModified": 1726153070,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +162,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1719226092, "lastModified": 1724947644,
"narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +177,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723991338, "lastModified": 1726243404,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba", "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -177,23 +193,23 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1722555339, "lastModified": 1725233747,
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1724098845, "lastModified": 1726320982,
"narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,6 +242,7 @@
"extra-package-haskell-ts-mode": "extra-package-haskell-ts-mode", "extra-package-haskell-ts-mode": "extra-package-haskell-ts-mode",
"extra-package-indent-bars": "extra-package-indent-bars", "extra-package-indent-bars": "extra-package-indent-bars",
"extra-package-notmuch-notify": "extra-package-notmuch-notify", "extra-package-notmuch-notify": "extra-package-notmuch-notify",
"extra-package-typst-ts-mode": "extra-package-typst-ts-mode",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"nixpkgs": [ "nixpkgs": [

4
flake.nix
View file

@ -22,6 +22,10 @@
url = "git+https://codeberg.org/pranshu/haskell-ts-mode.git"; url = "git+https://codeberg.org/pranshu/haskell-ts-mode.git";
flake = false; flake = false;
}; };
extra-package-typst-ts-mode = {
url = "git+https://codeberg.org/meow_king/typst-ts-mode.git";
flake = false;
};
}; };
outputs = inputs @ {flake-parts, ...}: outputs = inputs @ {flake-parts, ...}:

28
init.el
View file

@ -31,6 +31,13 @@
(eglot-connect-timeout nil) ; never timeout (eglot-connect-timeout nil) ; never timeout
) )
(use-package consult-eglot
:after (consult eglot embark)
:config
(require 'consult-eglot-embark)
(consult-eglot-embark-mode)
)
(use-package emacs (use-package emacs
:bind (("<mouse-4>" . scroll-down-line) :bind (("<mouse-4>" . scroll-down-line)
("<mouse-5>" . scroll-up-line) ("<mouse-5>" . scroll-up-line)
@ -420,10 +427,11 @@
(use-package magit-delta (use-package magit-delta
:hook (magit-mode . magit-delta-mode)) :hook (magit-mode . magit-delta-mode))
(use-package magit-todos ;; FIXME
:after magit ;; (use-package magit-todos
:custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?") ;; :after magit
:config (magit-todos-mode 1)) ;; :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
;; :config (magit-todos-mode 1))
(use-package difftastic (use-package difftastic
:demand t :demand t
@ -453,10 +461,6 @@
(require 'eglot) (require 'eglot)
(add-to-list 'eglot-server-programs (add-to-list 'eglot-server-programs
'(nix-ts-mode . ("nixd"))) '(nix-ts-mode . ("nixd")))
;; FIXME `nixd' completion not working, will give it a second try in the future
;; '(nix-ts-mode . ("nixd" :initializationOptions (:eval (:depth 10 :workers 4)
;; :formatting (:command "alejandra")
;; :options (:enable t :target (:installable "" :args ["--epxr" "(import \"${(builtins.getFlake \"n\")}/nixos\" {}).options" "--json"]))))))
(eglot-ensure))) (eglot-ensure)))
(nix-ts-mode . electric-pair-mode) (nix-ts-mode . electric-pair-mode)
(nix-ts-mode . (lambda () (setq indent-bars-spacing-override 2) (indent-bars-mode))) (nix-ts-mode . (lambda () (setq indent-bars-spacing-override 2) (indent-bars-mode)))
@ -481,10 +485,14 @@
(eglot-ensure)))) (eglot-ensure))))
:mode "\\.ts\\'") :mode "\\.ts\\'")
(use-package haskell-mode (use-package haskell-ts-mode
:hook ((haskell-mode . eglot-ensure)) :hook ((haskell--ts-mode . eglot-ensure)
:mode "\\.hs\\'") :mode "\\.hs\\'")
(use-package typst-ts-mode
:hook ((typst--ts-mode . eglot-ensure)
:mode "\\.typ\\'")
(use-package purescript-mode (use-package purescript-mode
:custom ((project-vc-extra-root-markers '("spago.dhall"))) :custom ((project-vc-extra-root-markers '("spago.dhall")))
:hook ((purescript-mode . eglot-ensure) :hook ((purescript-mode . eglot-ensure)

1
packages/packages.nix
View file

@ -78,6 +78,7 @@ pkgs: epkgs: let
nix-mode nix-mode
nix-ts-mode nix-ts-mode
agenix agenix
zig-mode
unisonlang-mode unisonlang-mode
purescript-mode purescript-mode
dhall-mode dhall-mode