outfoxxed/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix broken flake and daemon

Browse source
This commit is contained in:
outfoxxed 2023-01-17 12:25:01 -08:00
parent f267f5c2f1
commit 4f4d7049fb
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 46 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

89
flake.nix
View file

@ -22,8 +22,8 @@
tree-sitter-rust = super.tree-sitter-grammars.tree-sitter-rust.overrideAttrs(_: { tree-sitter-rust = super.tree-sitter-grammars.tree-sitter-rust.overrideAttrs(_: {
nativeBuildInputs = [ self.nodejs self.tree-sitter ]; nativeBuildInputs = [ self.nodejs self.tree-sitter ];
configurePhase = '' configurePhase = ''
tree-sitter generate --abi 13 src/grammar.json tree-sitter generate --abi 13 src/grammar.json
''; '';
}); });
}; };
}); });
@ -37,47 +37,47 @@
}); });
custom-emacs = custom-emacs =
with nix; with pkgs; with nix; with pkgs;
((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: with epkgs; [ ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: with epkgs; [
avy avy
company company
editorconfig editorconfig
evil evil
evil-collection evil-collection
evil-goggles evil-goggles
evil-textobj-tree-sitter evil-textobj-tree-sitter
flycheck flycheck
lsp-mode lsp-mode
lsp-treemacs lsp-treemacs
lsp-ui lsp-ui
magit magit
markdown-mode markdown-mode
nix-mode reformatter # required by nix mode nix-mode reformatter # required by nix mode
projectile projectile
rainbow-mode rainbow-mode
rustic rustic
tree-sitter tree-sitter
tree-sitter-langs tree-sitter-langs
(trivialBuild { (trivialBuild {
pname = "ts-fold"; pname = "ts-fold";
version = "0.1.0"; version = "0.1.0";
src = ts-fold; src = ts-fold;
buildInputs = [ buildInputs = [
tree-sitter tree-sitter
s s
fringe-helper fringe-helper
]; ];
}) })
treemacs treemacs
treemacs-evil treemacs-evil
treemacs-projectile treemacs-projectile
treemacs-magit treemacs-magit
use-package use-package
vertico vertico
which-key which-key
ws-butler ws-butler
])); ]));
in { in {
packages.${system} = { packages.${system} = {
default = custom-emacs; default = custom-emacs;
@ -86,7 +86,10 @@
with nix; { with nix; {
home.packages = [ custom-emacs ]; home.packages = [ custom-emacs ];
services.emacs.enable = true; services.emacs = {
enable = true;
package = custom-emacs;
};
xdg.configFile."emacs".source = with pkgs; xdg.configFile."emacs".source = with pkgs;
runCommandNoCC ".emacs.d" { runCommandNoCC ".emacs.d" {