Compare commits
No commits in common. "4ebe7b64bcb603fb2969f3208eb98821f193a522" and "3c475f3ec478e85db3b4282e7d1cc8f7ac96ddbd" have entirely different histories.
4ebe7b64bc
...
3c475f3ec4
5 changed files with 37 additions and 34 deletions
|
|
@ -1,6 +0,0 @@
|
|||
on: [push]
|
||||
jobs:
|
||||
test:
|
||||
runs-on: docker
|
||||
steps:
|
||||
- run: echo All Good
|
||||
43
flake.lock
generated
43
flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707469552,
|
||||
"narHash": "sha256-CPHB05n2FKAcPtjLows1+cEOA3ivDeFHs5bkvTGSgR4=",
|
||||
"lastModified": 1706777546,
|
||||
"narHash": "sha256-ZOsu6wxxNXm5o6RfXTcsDHiTtXf6fxCeEEpu73RJVh0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "eda89e24ee4ceb6e4bfcd00dabb894d6301c36db",
|
||||
"rev": "42f2c32d615b145ab47faeca4d9cfb48f7909052",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -71,16 +71,17 @@
|
|||
"extra-package-copilot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1707055282,
|
||||
"narHash": "sha256-Drx2bB/Uiq0Alm8d575eucQrK6erFy4Z0KXsL5RsFaY=",
|
||||
"lastModified": 1704184504,
|
||||
"narHash": "sha256-Vt+3OZM89dyLKjFnODWNHLDwrURXAtY5MFugyfEMbho=",
|
||||
"owner": "zerolfx",
|
||||
"repo": "copilot.el",
|
||||
"rev": "22f0446a17753716456e0cb8ee33f47731fc4ec3",
|
||||
"rev": "1542d76909636bf8804dd9c770f28818a897cfdc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "zerolfx",
|
||||
"repo": "copilot.el",
|
||||
"rev": "1542d76909636bf8804dd9c770f28818a897cfdc",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -138,11 +139,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706830856,
|
||||
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
|
||||
"lastModified": 1706569497,
|
||||
"narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
|
||||
"rev": "60c614008eed1d0383d21daac177a3e036192ed8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -210,11 +211,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"lastModified": 1706550542,
|
||||
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -227,11 +228,11 @@
|
|||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1706550542,
|
||||
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
|
||||
"lastModified": 1703961334,
|
||||
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
|
||||
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -244,11 +245,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1707347730,
|
||||
"narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=",
|
||||
"lastModified": 1706515015,
|
||||
"narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6",
|
||||
"rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -276,11 +277,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"lastModified": 1706550542,
|
||||
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -27,7 +27,9 @@
|
|||
flake = false;
|
||||
};
|
||||
extra-package-copilot = {
|
||||
url = "github:zerolfx/copilot.el";
|
||||
# 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";
|
||||
flake = false;
|
||||
};
|
||||
extra-package-notmuch-notify = {
|
||||
|
|
@ -48,4 +50,10 @@
|
|||
./ci
|
||||
];
|
||||
};
|
||||
|
||||
# Not hitting it
|
||||
# nixConfig = {
|
||||
# extra-substituters = ["https://nix-community.cachix.org"];
|
||||
# extra-trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
9
init.el
9
init.el
|
|
@ -453,9 +453,7 @@
|
|||
;; :config
|
||||
;; (global-nix-prettify-mode))
|
||||
|
||||
(use-package agenix
|
||||
:after envrc
|
||||
:hook (agenix-pre-mode . envrc-mode))
|
||||
(use-package agenix)
|
||||
|
||||
(use-package nix-ts-mode
|
||||
:custom ((nix-ts-mode--embed-bash nil))
|
||||
|
|
@ -493,7 +491,9 @@
|
|||
:mode "\\.ts\\'")
|
||||
|
||||
(use-package haskell-mode
|
||||
:hook ((haskell-mode . eglot-ensure))
|
||||
:hook ((haskell-mode . eglot-ensure)
|
||||
;; (haskell-mode . tree-sitter-hl-mode) # doesn't exist yet?
|
||||
)
|
||||
:mode "\\.hs\\'")
|
||||
|
||||
(use-package purescript-mode
|
||||
|
|
@ -553,6 +553,7 @@
|
|||
(diff-hl-margin-mode 1))
|
||||
|
||||
(use-package envrc
|
||||
:hook (agenix-pre-mode . envrc-mode)
|
||||
:config
|
||||
(envrc-global-mode +1))
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
}) (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
|
||||
# (_: _: {
|
||||
|
|
@ -49,7 +48,7 @@
|
|||
cp $f $out/"libtree-sitter-$(basename $f)"
|
||||
done
|
||||
'';
|
||||
ccrEmacsWithoutPackages = pkgs.emacs-git.override {
|
||||
ccrEmacsWithoutPackages = pkgs.emacs29.override {
|
||||
withSQLite3 = true;
|
||||
withWebP = true;
|
||||
withPgtk = true;
|
||||
|
|
|
|||
Reference in a new issue