Compare commits

...

10 commits

Author SHA1 Message Date
4ebe7b64bc
[CI] Forgejo tests 2024-02-11 15:43:45 +01:00
e498a8d285
No mature haskell-ts-mode apparently 😭 2024-02-11 02:01:42 +01:00
4f1d2a5931
Fix envrc 2024-02-11 02:01:42 +01:00
a7db972d7c
Unused nixConfig 2024-02-11 02:01:42 +01:00
Hercules CI Effects
d740efb6a5 flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/4a34b655ebc29a22f13b547c1fa3729f7dd42f94' (2024-02-08)
  → 'github:nix-community/emacs-overlay/eda89e24ee4ceb6e4bfcd00dabb894d6301c36db' (2024-02-09)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05)
  → 'github:NixOS/nixpkgs/f8e2ebd66d097614d51a56a755450d4ae1632df1' (2024-02-07)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/fb0c047e30b69696acc42e669d02452ca1b55755' (2024-02-06)
  → 'github:NixOS/nixpkgs/6832d0d99649db3d65a0e15fa51471537b2c56a6' (2024-02-07)
• Updated input 'extra-package-copilot':
    'github:zerolfx/copilot.el/1542d76909636bf8804dd9c770f28818a897cfdc' (2024-01-02)
  → 'github:zerolfx/copilot.el/22f0446a17753716456e0cb8ee33f47731fc4ec3' (2024-02-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05)
  → 'github:NixOS/nixpkgs/f8e2ebd66d097614d51a56a755450d4ae1632df1' (2024-02-07)
2024-02-09 13:42:07 +00:00
c01990ee02
Moving from Emacs 29 to master 2024-02-09 11:54:20 +01:00
Hercules CI Effects
237dd37096 flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/223c6e9be9ef430d3523ec9c996eb74cb329c42f' (2024-02-07)
  → 'github:nix-community/emacs-overlay/4a34b655ebc29a22f13b547c1fa3729f7dd42f94' (2024-02-08)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e' (2024-02-05)
  → 'github:NixOS/nixpkgs/fb0c047e30b69696acc42e669d02452ca1b55755' (2024-02-06)
2024-02-08 13:33:09 +00:00
Hercules CI Effects
d18b661e79 flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/5106217a5b0652bcd8f24ebf955aed45d2e7c2ad' (2024-02-06)
  → 'github:nix-community/emacs-overlay/223c6e9be9ef430d3523ec9c996eb74cb329c42f' (2024-02-07)
2024-02-07 13:33:50 +00:00
Hercules CI Effects
9f64b13770 flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/7de6a630960f81ab2bf5a12ecdd5678ffaee9f5c' (2024-02-05)
  → 'github:nix-community/emacs-overlay/5106217a5b0652bcd8f24ebf955aed45d2e7c2ad' (2024-02-06)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/e92b6015881907e698782c77641aa49298330223' (2024-02-02)
  → 'github:NixOS/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/25e3d4c0d3591c99929b1ec07883177f6ea70c9d' (2024-02-01)
  → 'github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e' (2024-02-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e92b6015881907e698782c77641aa49298330223' (2024-02-02)
  → 'github:NixOS/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05)
2024-02-06 13:34:43 +00:00
Hercules CI Effects
844a9d8903 flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/42f2c32d615b145ab47faeca4d9cfb48f7909052' (2024-02-01)
  → 'github:nix-community/emacs-overlay/7de6a630960f81ab2bf5a12ecdd5678ffaee9f5c' (2024-02-05)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652' (2024-01-29)
  → 'github:NixOS/nixpkgs/e92b6015881907e698782c77641aa49298330223' (2024-02-02)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4' (2024-01-29)
  → 'github:NixOS/nixpkgs/25e3d4c0d3591c99929b1ec07883177f6ea70c9d' (2024-02-01)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/60c614008eed1d0383d21daac177a3e036192ed8' (2024-01-29)
  → 'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9?dir=lib' (2023-12-30)
  → 'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652?dir=lib' (2024-01-29)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652' (2024-01-29)
  → 'github:NixOS/nixpkgs/e92b6015881907e698782c77641aa49298330223' (2024-02-02)
2024-02-05 14:44:28 +00:00
5 changed files with 34 additions and 37 deletions

View file

@ -0,0 +1,6 @@
on: [push]
jobs:
test:
runs-on: docker
steps:
- run: echo All Good

43
flake.lock generated
View file

@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1706777546,
"narHash": "sha256-ZOsu6wxxNXm5o6RfXTcsDHiTtXf6fxCeEEpu73RJVh0=",
"lastModified": 1707469552,
"narHash": "sha256-CPHB05n2FKAcPtjLows1+cEOA3ivDeFHs5bkvTGSgR4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "42f2c32d615b145ab47faeca4d9cfb48f7909052",
"rev": "eda89e24ee4ceb6e4bfcd00dabb894d6301c36db",
"type": "github"
},
"original": {
@ -71,17 +71,16 @@
"extra-package-copilot": {
"flake": false,
"locked": {
"lastModified": 1704184504,
"narHash": "sha256-Vt+3OZM89dyLKjFnODWNHLDwrURXAtY5MFugyfEMbho=",
"lastModified": 1707055282,
"narHash": "sha256-Drx2bB/Uiq0Alm8d575eucQrK6erFy4Z0KXsL5RsFaY=",
"owner": "zerolfx",
"repo": "copilot.el",
"rev": "1542d76909636bf8804dd9c770f28818a897cfdc",
"rev": "22f0446a17753716456e0cb8ee33f47731fc4ec3",
"type": "github"
},
"original": {
"owner": "zerolfx",
"repo": "copilot.el",
"rev": "1542d76909636bf8804dd9c770f28818a897cfdc",
"type": "github"
}
},
@ -139,11 +138,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1706569497,
"narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=",
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "60c614008eed1d0383d21daac177a3e036192ed8",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github"
},
"original": {
@ -211,11 +210,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1706550542,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"lastModified": 1707268954,
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"type": "github"
},
"original": {
@ -228,11 +227,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1703961334,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
"lastModified": 1706550542,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"type": "github"
},
"original": {
@ -245,11 +244,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1706515015,
"narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=",
"lastModified": 1707347730,
"narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4",
"rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6",
"type": "github"
},
"original": {
@ -277,11 +276,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1706550542,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"lastModified": 1707268954,
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"type": "github"
},
"original": {

View file

@ -27,9 +27,7 @@
flake = false;
};
extra-package-copilot = {
# TODO remove rev when jsonrpc 1.0.23 hits emacs 29
# https://github.com/copilot-emacs/copilot.el/issues/232
url = "github:zerolfx/copilot.el/1542d76909636bf8804dd9c770f28818a897cfdc";
url = "github:zerolfx/copilot.el";
flake = false;
};
extra-package-notmuch-notify = {
@ -50,10 +48,4 @@
./ci
];
};
# Not hitting it
# nixConfig = {
# extra-substituters = ["https://nix-community.cachix.org"];
# extra-trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
# };
}

View file

@ -453,7 +453,9 @@
;; :config
;; (global-nix-prettify-mode))
(use-package agenix)
(use-package agenix
:after envrc
:hook (agenix-pre-mode . envrc-mode))
(use-package nix-ts-mode
:custom ((nix-ts-mode--embed-bash nil))
@ -491,9 +493,7 @@
:mode "\\.ts\\'")
(use-package haskell-mode
:hook ((haskell-mode . eglot-ensure)
;; (haskell-mode . tree-sitter-hl-mode) # doesn't exist yet?
)
:hook ((haskell-mode . eglot-ensure))
:mode "\\.hs\\'")
(use-package purescript-mode
@ -553,7 +553,6 @@
(diff-hl-margin-mode 1))
(use-package envrc
:hook (agenix-pre-mode . envrc-mode)
:config
(envrc-global-mode +1))

View file

@ -20,6 +20,7 @@
}) (lib.filterAttrs (inputName: _: ! builtins.isNull (builtins.match "extra-package-.*" inputName)) inputs);
})
inputs.emacs-overlay.overlays.package
inputs.emacs-overlay.overlays.emacs
# Some tree-sitter grammars in nixpksg are built with a too new ABI
# https://github.com/NixOS/nixpkgs/issues/209114
# (_: _: {
@ -48,7 +49,7 @@
cp $f $out/"libtree-sitter-$(basename $f)"
done
'';
ccrEmacsWithoutPackages = pkgs.emacs29.override {
ccrEmacsWithoutPackages = pkgs.emacs-git.override {
withSQLite3 = true;
withWebP = true;
withPgtk = true;