Skip to content

Darwin support #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
onetom wants to merge 1 commit into
base: feature/disko-setup
Choose a base branch
from
Open

Darwin support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 38 additions & 26 deletions modules/features/emacs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
let
extraEmacsPackages = epkgs: [
epkgs.auto-dark
epkgs.batppuccin
epkgs.cider
epkgs.clojure-mode
epkgs.clojure-ts-mode
epkgs.corfu
epkgs.eat
epkgs.gptel
epkgs.magit
epkgs.nix-mode
epkgs.nix-ts-mode
epkgs.orderless
epkgs.ox-reveal
epkgs.paredit
epkgs.pdf-tools
epkgs.rainbow-delimiters
epkgs.solarized-theme
epkgs.terraform-mode
(epkgs.treesit-grammars.with-grammars (p: [
p.tree-sitter-java
p.tree-sitter-json
p.tree-sitter-nix
p.tree-sitter-yaml
]))
];
in
{
flake.modules.homeManager.emacs =
{ pkgs, ... }:
{
programs.emacs = {
enable = true;
package = pkgs.emacs-pgtk;
extraPackages = epkgs: [
epkgs.auto-dark
epkgs.batppuccin
epkgs.cider
epkgs.clojure-mode
epkgs.clojure-ts-mode
epkgs.corfu
epkgs.eat
epkgs.gptel
epkgs.magit
epkgs.nix-mode
epkgs.nix-ts-mode
epkgs.orderless
epkgs.ox-reveal
epkgs.paredit
epkgs.pdf-tools
epkgs.rainbow-delimiters
epkgs.solarized-theme
epkgs.terraform-mode
(epkgs.treesit-grammars.with-grammars (p: [
p.tree-sitter-java
p.tree-sitter-json
p.tree-sitter-nix
p.tree-sitter-yaml
]))
];
extraPackages = extraEmacsPackages;
};

services.emacs = {
Expand All @@ -40,4 +43,13 @@
socketActivation.enable = true;
};
};

perSystem =
{ pkgs, ... }:
let
basePackage = if pkgs.stdenv.isDarwin then pkgs.emacs else pkgs.emacs-pgtk;
in
{
packages.emacs = (pkgs.emacsPackagesFor basePackage).emacsWithPackages extraEmacsPackages;
};
}
1 change: 1 addition & 0 deletions modules/flake/systems.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
];
}