Disable Emacs service, set EDITOR and VISUAL to Emacs in zsh

This commit is contained in:
Evie Litherland-Smith 2024-06-04 11:39:14 +01:00
parent f6849b2e6d
commit 3a7f7fecee
2 changed files with 5 additions and 22 deletions

View file

@ -1,12 +1,11 @@
{ {
config,
pkgs, pkgs,
fonts, fonts,
... ...
}: { }: {
programs.emacs = { programs.emacs = {
# Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
# git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.config/emacs # git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.emacs.d
enable = true; enable = true;
package = pkgs.emacs29-pgtk; package = pkgs.emacs29-pgtk;
extraConfig = let extraConfig = let
@ -121,26 +120,6 @@
elfeed-tube elfeed-tube
]; ];
}; };
services = {
emacs = {
enable = true;
package = config.programs.emacs.finalPackage;
defaultEditor = true;
client.enable = true;
socketActivation.enable = true;
startWithUserSession = false;
};
git-sync.repositories = with config.xdg.userDirs; {
org = {
path = "${documents}/Org";
uri = "git+https://git.xenia.me.uk/xenia/org.git";
};
references = {
path = "${documents}/References";
uri = "git+https://git.xenia.me.uk/xenia/references.git";
};
};
};
home.packages = with pkgs; [ home.packages = with pkgs; [
# Emacs requirements # Emacs requirements
imagemagick imagemagick

View file

@ -65,6 +65,10 @@
ignoreSpace = true; ignoreSpace = true;
expireDuplicatesFirst = true; expireDuplicatesFirst = true;
}; };
localVariables = {
"EDITOR" = "emacs -nw";
"VISUAL" = "emacs";
};
shellAliases = { shellAliases = {
nixos-switch = "sudo nixos-rebuild switch --flake flake:my-nixos --show-trace"; nixos-switch = "sudo nixos-rebuild switch --flake flake:my-nixos --show-trace";
home-manager-switch = "nix run flake:my-home-manager -- switch --flake flake:my-home-manager --show-trace"; home-manager-switch = "nix run flake:my-home-manager -- switch --flake flake:my-home-manager --show-trace";