mirror of
https://github.com/librephoenix/nixos-config
synced 2025-04-20 17:24:35 +05:30
Fixes flake not building when flake.nix editor is vim, nvim or nano
This commit is contained in:
parent
bbd20d3091
commit
8700cb8779
|
@ -30,7 +30,7 @@
|
||||||
# EDITOR and TERM session variables must be set in home.nix or other module
|
# EDITOR and TERM session variables must be set in home.nix or other module
|
||||||
# I set the session variable SPAWNEDITOR to this in my home.nix for convenience
|
# I set the session variable SPAWNEDITOR to this in my home.nix for convenience
|
||||||
spawnEditor = if (editor == "emacsclient") then "emacsclient -c -a 'emacs'"
|
spawnEditor = if (editor == "emacsclient") then "emacsclient -c -a 'emacs'"
|
||||||
else (if (editor == ("vim" || "nvim" || "nano")) then "$TERM -e $EDITOR" else editor);
|
else (if ((editor == "vim") || (editor == "nvim") || (editor == "nano")) then "exec " + term + " -e " + editor else editor);
|
||||||
|
|
||||||
# create patched nixpkgs
|
# create patched nixpkgs
|
||||||
nixpkgs-patched = (import nixpkgs { inherit system; }).applyPatches {
|
nixpkgs-patched = (import nixpkgs { inherit system; }).applyPatches {
|
||||||
|
|
|
@ -61,10 +61,6 @@ in
|
||||||
markdown
|
markdown
|
||||||
]))];
|
]))];
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
EDITOR = "emacsclient";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/eaf" = {
|
home.file.".emacs.d/eaf" = {
|
||||||
source = "${eaf}";
|
source = "${eaf}";
|
||||||
recursive = true;
|
recursive = true;
|
||||||
|
|
|
@ -1862,10 +1862,6 @@ in
|
||||||
markdown
|
markdown
|
||||||
]))];
|
]))];
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
EDITOR = "emacsclient";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/eaf" = {
|
home.file.".emacs.d/eaf" = {
|
||||||
source = "${eaf}";
|
source = "${eaf}";
|
||||||
recursive = true;
|
recursive = true;
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
nmcli n on
|
nmcli n on
|
||||||
fi
|
fi
|
||||||
'')
|
'')
|
||||||
|
vim neovim
|
||||||
];
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
Loading…
Reference in a new issue