Remove emacs server, add doom to path

This commit is contained in:
Evie Litherland-Smith 2023-09-12 11:59:27 +01:00
parent 4e0bed434a
commit 4282e34bb2
4 changed files with 6 additions and 25 deletions

View file

@ -77,7 +77,7 @@
homeModules = [ homeModules = [
./home/accounts/service.nix ./home/accounts/service.nix
./home/alacritty/default.nix ./home/alacritty/default.nix
./home/emacs/server.nix ./home/emacs/default.nix
./home/firefox/default.nix ./home/firefox/default.nix
./home/git/default.nix ./home/git/default.nix
./home/hyprland/default.nix ./home/hyprland/default.nix

View file

@ -1,17 +1,10 @@
{ pkgs, inputs, ... }: { pkgs, inputs, ... }:
let
sessionVariables = { {
DOOMLOCALDIR = "$HOME/.local/share/doomemacs"; # imports = [ ../accounts/default.nix ../git/default.nix ];
DOOMPROFILELOADFILE = "$HOME/.local/share/doomemacs/profiles/load.el";
};
in {
imports = [ ../accounts/default.nix ../git/default.nix ];
xdg.configFile.emacs.source = inputs.doom-emacs;
systemd.user = { inherit sessionVariables; };
programs.emacs.enable = true; programs.emacs.enable = true;
home = { home = {
inherit sessionVariables; sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ];
sessionPath = [ "${inputs.doom-emacs}/bin" ];
packages = with pkgs; [ packages = with pkgs; [
# Emacs dependencies # Emacs dependencies
ripgrep ripgrep

View file

@ -1,12 +0,0 @@
{ config, ... }:
{
imports = [ ./default.nix ];
services.emacs = {
enable = true;
package = config.programs.emacs.package;
defaultEditor = true;
client.enable = true;
startWithUserSession = true;
};
}

View file

@ -85,7 +85,7 @@
bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu
# Common program shortcuts # Common program shortcuts
bind = SUPER, E, exec, emacsclient -c -a 'emacs' bind = SUPER, E, exec, emacs
bind = SUPER, B, exec, pkill rofi || rofi -show filebrowser bind = SUPER, B, exec, pkill rofi || rofi -show filebrowser
bind = SUPER, Space, exec, pkill rofi || rofi -show combi bind = SUPER, Space, exec, pkill rofi || rofi -show combi
bind = SUPER, Return, exec, alacritty bind = SUPER, Return, exec, alacritty