pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Restore emacs service, start with graphical session

Browse source
This commit is contained in:
Evie Litherland-Smith 2024-03-15 11:44:32 +00:00
parent b04886a27b
commit 4d15621f4f
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
home/emacs/default.nix
View file

@ -4,7 +4,7 @@
... ...
}: { }: {
imports = [../git/default.nix ../prog/default.nix]; imports = [../git/default.nix ../prog/default.nix];
programs.git.extraConfig.core.editor = "${config.programs.emacs.finalPackage}/bin/emacs"; programs.git.extraConfig.core.editor = "$EDITOR";
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 ~/.config/emacs
@ -127,7 +127,16 @@
elfeed-tube-mpv elfeed-tube-mpv
]; ];
}; };
services.git-sync.repositories = with config.xdg.userDirs; { services = {
emacs = {
enable = true;
package = config.programs.emacs.finalPackage;
defaultEditor = true;
client.enable = true;
socketActivation.enable = false;
startWithUserSession = "graphical";
};
git-sync.repositories = with config.xdg.userDirs; {
org = { org = {
path = "${documents}/Org"; path = "${documents}/Org";
uri = "git+https://git.xenia.me.uk/xenia/org.git"; uri = "git+https://git.xenia.me.uk/xenia/org.git";
@ -137,6 +146,7 @@
uri = "git+https://git.xenia.me.uk/xenia/references.git"; uri = "git+https://git.xenia.me.uk/xenia/references.git";
}; };
}; };
};
home.packages = with pkgs; [ home.packages = with pkgs; [
# Emacs requirements # Emacs requirements
imagemagick imagemagick

4
home/hyprland/default.nix
View file

@ -277,8 +277,8 @@
# Common program shortcuts # Common program shortcuts
"SUPER, Return, exec, ${alacritty.package}/bin/alacritty" "SUPER, Return, exec, ${alacritty.package}/bin/alacritty"
"SUPER, E, exec, [workspace 1] ${emacs.finalPackage}/bin/emacsclient -c -a \"${emacs.finalPackage}/bin/emacs -f server-start\"" "SUPER, E, exec, [workspace 1 silent] ${emacs.finalPackage}/bin/emacsclient -c"
"SUPER, W, exec, [workspace 2] ${pkgs.firefox}/bin/firefox" "SUPER, W, exec, [workspace 2 silent] ${pkgs.firefox}/bin/firefox"
# Rofi binds # Rofi binds
"SUPER, Space, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show drun" "SUPER, Space, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show drun"