Restore emacs service, start with graphical session
This commit is contained in:
parent
b04886a27b
commit
4d15621f4f
|
@ -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,14 +127,24 @@
|
||||||
elfeed-tube-mpv
|
elfeed-tube-mpv
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
services.git-sync.repositories = with config.xdg.userDirs; {
|
services = {
|
||||||
org = {
|
emacs = {
|
||||||
path = "${documents}/Org";
|
enable = true;
|
||||||
uri = "git+https://git.xenia.me.uk/xenia/org.git";
|
package = config.programs.emacs.finalPackage;
|
||||||
|
defaultEditor = true;
|
||||||
|
client.enable = true;
|
||||||
|
socketActivation.enable = false;
|
||||||
|
startWithUserSession = "graphical";
|
||||||
};
|
};
|
||||||
references = {
|
git-sync.repositories = with config.xdg.userDirs; {
|
||||||
path = "${documents}/References";
|
org = {
|
||||||
uri = "git+https://git.xenia.me.uk/xenia/references.git";
|
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; [
|
||||||
|
|
|
@ -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"
|
||||||
|
|
Loading…
Reference in a new issue