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