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

Compare commits

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

1 commit
d53b82ba84 ... 21c2f11935

Author SHA1 Message Date
Seven of Nine
21c2f11935 flake.lock: Update
All checks were successful
/ test (push) Successful in 11m46s
Details 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/758aa1deb09d8d2dce7bd3a016434e8fcedfab89' (2024-08-21)
  → 'github:nix-community/emacs-overlay/2b8a4aeadf19c702355559b02a1593c9d09b1546' (2024-09-15)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba' (2024-08-18)
  → 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11)
• 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=804d0fc090b48c85b449b21e52df7401e2679064' (2024-09-14)
• Updated input 'extra-package-indent-bars':
    'github:jdtsmith/indent-bars/b72fa098d7c48d61fb4b508071bd77d054268f4e' (2024-08-18)
  → 'github:jdtsmith/indent-bars/f926ed81aefb48624ed49f1bebd1e01507bba93c' (2024-09-14)
• 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-15 13:16:43 +00:00
4 changed files with 23 additions and 53 deletions
Show stats Expand all files Collapse all files

43
flake.lock generated
View file

@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1726477211, "lastModified": 1726390749,
"narHash": "sha256-42boTsTLIUxalTeJSRWiTRCs30wfXu8KTDLbZc32BBk=", "narHash": "sha256-aZf0/NpKwrO1J3HHMYL7UEcXyrO/mTdVNGpBCxMTyHM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f4acc62c00a67e5b71ce11e0ee2c3e1b3928c681", "rev": "2b8a4aeadf19c702355559b02a1593c9d09b1546",
"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": 1726487881, "lastModified": 1726283223,
"narHash": "sha256-45Ah8ekUp1YGkM/i5si4K+E3/ccLWsx3/pTUieRIoZI=", "narHash": "sha256-VaLpvnLFokidx+YsD7eZACccO0V+VdnleZ+no1Yz6CM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a2b07815bca130713186ca4fce49c92c06905c8e", "rev": "804d0fc090b48c85b449b21e52df7401e2679064",
"revCount": 84, "revCount": 75,
"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": 1726438391, "lastModified": 1726320542,
"narHash": "sha256-qWRkJUofGZdekJEbNNiIT+KGy5BovY0AA6Btm4Cp/pY=", "narHash": "sha256-rTS6Mx/nzTSYqcrO2nsal4Tv5zzbTecR06BS7WYL7yY=",
"owner": "jdtsmith", "owner": "jdtsmith",
"repo": "indent-bars", "repo": "indent-bars",
"rev": "4a2e8e179285befaaf80ebae8d3f8016360967dc", "rev": "f926ed81aefb48624ed49f1bebd1e01507bba93c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,22 +84,6 @@
"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"
@ -177,11 +161,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726062873,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,7 +226,6 @@
"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,10 +22,6 @@
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,13 +31,6 @@
(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)
@ -427,11 +420,10 @@
(use-package magit-delta (use-package magit-delta
:hook (magit-mode . magit-delta-mode)) :hook (magit-mode . magit-delta-mode))
;; FIXME (use-package magit-todos
;; (use-package magit-todos :after magit
;; :after magit :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
;; :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?") :config (magit-todos-mode 1))
;; :config (magit-todos-mode 1))
(use-package difftastic (use-package difftastic
:demand t :demand t
@ -461,6 +453,10 @@
(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)))
@ -485,14 +481,10 @@
(eglot-ensure)))) (eglot-ensure))))
:mode "\\.ts\\'") :mode "\\.ts\\'")
(use-package haskell-ts-mode (use-package haskell-mode
:hook ((haskell--ts-mode . eglot-ensure) :hook ((haskell-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,7 +78,6 @@ 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