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

Compare commits

base: aciceri:4ebe7b64bcb603fb2969f3208eb98821f193a522
Branches Tags
aciceri:master
aciceri:update-flake-lock
..
compare: aciceri:3c475f3ec478e85db3b4282e7d1cc8f7ac96ddbd
Branches Tags
aciceri:master
aciceri:update-flake-lock

No commits in common. "4ebe7b64bcb603fb2969f3208eb98821f193a522" and "3c475f3ec478e85db3b4282e7d1cc8f7ac96ddbd" have entirely different histories.
4ebe7b64bc ... 3c475f3ec4

5 changed files with 37 additions and 34 deletions
Show stats Expand all files Collapse all files

6
.forgejo/workflows/build.yaml
View file

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

10
flake.nix
View file

@ -27,7 +27,9 @@
flake = false; flake = false;
}; };
extra-package-copilot = { 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; flake = false;
}; };
extra-package-notmuch-notify = { extra-package-notmuch-notify = {
@ -48,4 +50,10 @@
./ci ./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
View file

@ -453,9 +453,7 @@
;; :config ;; :config
;; (global-nix-prettify-mode)) ;; (global-nix-prettify-mode))
(use-package agenix (use-package agenix)
:after envrc
:hook (agenix-pre-mode . envrc-mode))
(use-package nix-ts-mode (use-package nix-ts-mode
:custom ((nix-ts-mode--embed-bash nil)) :custom ((nix-ts-mode--embed-bash nil))
@ -493,7 +491,9 @@
:mode "\\.ts\\'") :mode "\\.ts\\'")
(use-package haskell-mode (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\\'") :mode "\\.hs\\'")
(use-package purescript-mode (use-package purescript-mode
@ -553,6 +553,7 @@
(diff-hl-margin-mode 1)) (diff-hl-margin-mode 1))
(use-package envrc (use-package envrc
:hook (agenix-pre-mode . envrc-mode)
:config :config
(envrc-global-mode +1)) (envrc-global-mode +1))

3
packages/default.nix
View file

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