configurations: update
This commit is contained in:
parent
fbcd102ea1
commit
614dea0e57
|
@ -13,7 +13,6 @@
|
|||
enableTerminalExtra = lib.mkDefault true;
|
||||
enableNixDevel = lib.mkDefault true;
|
||||
editor.code.fhs.enable = true;
|
||||
|
||||
editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in[
|
||||
llvmpkgs.clang
|
||||
llvmpkgs.llvm
|
||||
|
@ -62,6 +61,8 @@
|
|||
dub
|
||||
]);
|
||||
|
||||
editor.emacs.enable = true;
|
||||
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
{ config, lib, pkgs, materusPkgs, ... }:
|
||||
let
|
||||
cfg = config.materus.profile.editor.emacs;
|
||||
emacsPkgs = with pkgs;[
|
||||
python3
|
||||
lua
|
||||
];
|
||||
in
|
||||
{
|
||||
options.materus.profile.editor.emacs.enable = materusPkgs.lib.mkBoolOpt false "Enable emacs with materus cfg";
|
||||
|
@ -9,17 +13,44 @@ in
|
|||
#TODO: Make config
|
||||
/*home.activation.doomEmacs = lib.hm.dag.entryBetween [ "onFilesChange" ] [ "writeBoundry" ] ''
|
||||
if [ ! -d ~/.emacs.d ] ;
|
||||
then ${pkgs.git}/bin/git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.emacs.d
|
||||
then ${pkgs.git}/bin/git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.emacs.d
|
||||
fi
|
||||
PATH="${config.programs.git.package}/bin:${config.programs.emacs.package}/bin:$PATH"
|
||||
~/.emacs.d/bin/doom sync
|
||||
'';
|
||||
'';
|
||||
|
||||
home.file.doomEmacs.source = "${materusArg.flakeData.extraFiles}/config/emacs/doom";
|
||||
home.file.doomEmacs.target = "${config.xdg.configHome}/doom";*/
|
||||
home.file.doomEmacs.source = "${materusArg.flakeData.extraFiles}/config/emacs/doom";
|
||||
home.file.doomEmacs.target = "${config.xdg.configHome}/doom";*/
|
||||
|
||||
programs.emacs.enable = true;
|
||||
programs.emacs.package = with pkgs; lib.mkDefault (if pkgs ? emacsUnstablePgtk then emacsUnstablePgtk else emacs-gtk);
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
package = with pkgs; lib.mkDefault (if pkgs ? emacs-pgtk then emacs-pgtk else emacs-gtk);
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
magit
|
||||
evil
|
||||
helm
|
||||
avy
|
||||
corfu
|
||||
vterm
|
||||
centaur-tabs
|
||||
treemacs
|
||||
|
||||
lsp-mode
|
||||
d-mode
|
||||
|
||||
org
|
||||
markdown-mode
|
||||
json-mode
|
||||
];
|
||||
extraConfig = ''
|
||||
;;;; Set emacs PATH
|
||||
|
||||
(setenv "PATH" (concat (getenv "PATH") ":${lib.makeBinPath emacsPkgs}"))
|
||||
${builtins.concatStringsSep "\n" (builtins.map (x: "(setq exec-path (append exec-path '(\""+x+"/bin\")))" ) emacsPkgs)}
|
||||
|
||||
;;;; Done setting PATH
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,10 +11,7 @@ in
|
|||
viAlias = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
withNodeJs = true;
|
||||
withPython3 = true;
|
||||
withRuby = true;
|
||||
defaultEditor = true;
|
||||
|
||||
|
||||
extraConfig = ''
|
||||
set number
|
||||
|
@ -22,7 +19,6 @@ in
|
|||
|
||||
|
||||
plugins = with pkgs.vimPlugins;[
|
||||
nerdtree
|
||||
syntastic
|
||||
|
||||
vim-fugitive
|
||||
|
@ -32,21 +28,6 @@ in
|
|||
nvim-fzf
|
||||
nvim-treesitter.withAllGrammars
|
||||
|
||||
coc-clangd
|
||||
coc-python
|
||||
coc-pyright
|
||||
coc-sh
|
||||
coc-git
|
||||
coc-css
|
||||
coc-yaml
|
||||
coc-toml
|
||||
coc-json
|
||||
coc-html
|
||||
coc-highlight
|
||||
coc-java
|
||||
coc-cmake
|
||||
coc-vimlsp
|
||||
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue