Compare commits
1 commit
d53b82ba84
...
21c2f11935
Author | SHA1 | Date | |
---|---|---|---|
21c2f11935 |
4 changed files with 23 additions and 53 deletions
43
flake.lock
generated
43
flake.lock
generated
|
@ -7,11 +7,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726477211,
|
||||
"narHash": "sha256-42boTsTLIUxalTeJSRWiTRCs30wfXu8KTDLbZc32BBk=",
|
||||
"lastModified": 1726390749,
|
||||
"narHash": "sha256-aZf0/NpKwrO1J3HHMYL7UEcXyrO/mTdVNGpBCxMTyHM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "f4acc62c00a67e5b71ce11e0ee2c3e1b3928c681",
|
||||
"rev": "2b8a4aeadf19c702355559b02a1593c9d09b1546",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -39,11 +39,11 @@
|
|||
"extra-package-haskell-ts-mode": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726487881,
|
||||
"narHash": "sha256-45Ah8ekUp1YGkM/i5si4K+E3/ccLWsx3/pTUieRIoZI=",
|
||||
"lastModified": 1726283223,
|
||||
"narHash": "sha256-VaLpvnLFokidx+YsD7eZACccO0V+VdnleZ+no1Yz6CM=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "a2b07815bca130713186ca4fce49c92c06905c8e",
|
||||
"revCount": 84,
|
||||
"rev": "804d0fc090b48c85b449b21e52df7401e2679064",
|
||||
"revCount": 75,
|
||||
"type": "git",
|
||||
"url": "https://codeberg.org/pranshu/haskell-ts-mode.git"
|
||||
},
|
||||
|
@ -55,11 +55,11 @@
|
|||
"extra-package-indent-bars": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726438391,
|
||||
"narHash": "sha256-qWRkJUofGZdekJEbNNiIT+KGy5BovY0AA6Btm4Cp/pY=",
|
||||
"lastModified": 1726320542,
|
||||
"narHash": "sha256-rTS6Mx/nzTSYqcrO2nsal4Tv5zzbTecR06BS7WYL7yY=",
|
||||
"owner": "jdtsmith",
|
||||
"repo": "indent-bars",
|
||||
"rev": "4a2e8e179285befaaf80ebae8d3f8016360967dc",
|
||||
"rev": "f926ed81aefb48624ed49f1bebd1e01507bba93c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -84,22 +84,6 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
|
@ -177,11 +161,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1726243404,
|
||||
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
||||
"lastModified": 1726062873,
|
||||
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
||||
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -242,7 +226,6 @@
|
|||
"extra-package-haskell-ts-mode": "extra-package-haskell-ts-mode",
|
||||
"extra-package-indent-bars": "extra-package-indent-bars",
|
||||
"extra-package-notmuch-notify": "extra-package-notmuch-notify",
|
||||
"extra-package-typst-ts-mode": "extra-package-typst-ts-mode",
|
||||
"flake-parts": "flake-parts",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
"nixpkgs": [
|
||||
|
|
|
@ -22,10 +22,6 @@
|
|||
url = "git+https://codeberg.org/pranshu/haskell-ts-mode.git";
|
||||
flake = false;
|
||||
};
|
||||
extra-package-typst-ts-mode = {
|
||||
url = "git+https://codeberg.org/meow_king/typst-ts-mode.git";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = inputs @ {flake-parts, ...}:
|
||||
|
|
28
init.el
28
init.el
|
@ -31,13 +31,6 @@
|
|||
(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
|
||||
:bind (("<mouse-4>" . scroll-down-line)
|
||||
("<mouse-5>" . scroll-up-line)
|
||||
|
@ -427,11 +420,10 @@
|
|||
(use-package magit-delta
|
||||
:hook (magit-mode . magit-delta-mode))
|
||||
|
||||
;; FIXME
|
||||
;; (use-package magit-todos
|
||||
;; :after magit
|
||||
;; :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
|
||||
;; :config (magit-todos-mode 1))
|
||||
(use-package magit-todos
|
||||
:after magit
|
||||
:custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
|
||||
:config (magit-todos-mode 1))
|
||||
|
||||
(use-package difftastic
|
||||
:demand t
|
||||
|
@ -461,6 +453,10 @@
|
|||
(require 'eglot)
|
||||
(add-to-list 'eglot-server-programs
|
||||
'(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)))
|
||||
(nix-ts-mode . electric-pair-mode)
|
||||
(nix-ts-mode . (lambda () (setq indent-bars-spacing-override 2) (indent-bars-mode)))
|
||||
|
@ -485,14 +481,10 @@
|
|||
(eglot-ensure))))
|
||||
:mode "\\.ts\\'")
|
||||
|
||||
(use-package haskell-ts-mode
|
||||
:hook ((haskell--ts-mode . eglot-ensure)
|
||||
(use-package haskell-mode
|
||||
:hook ((haskell-mode . eglot-ensure))
|
||||
:mode "\\.hs\\'")
|
||||
|
||||
(use-package typst-ts-mode
|
||||
:hook ((typst--ts-mode . eglot-ensure)
|
||||
:mode "\\.typ\\'")
|
||||
|
||||
(use-package purescript-mode
|
||||
:custom ((project-vc-extra-root-markers '("spago.dhall")))
|
||||
:hook ((purescript-mode . eglot-ensure)
|
||||
|
|
|
@ -78,7 +78,6 @@ pkgs: epkgs: let
|
|||
nix-mode
|
||||
nix-ts-mode
|
||||
agenix
|
||||
zig-mode
|
||||
unisonlang-mode
|
||||
purescript-mode
|
||||
dhall-mode
|
||||
|
|
Reference in a new issue