ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2023-03-24 13:59:08 +01:00
parent 5898a9938d
commit 909339b3d9
Signed by: ellmau
GPG Key ID: C804A9C1B7AF8256
1 changed files with 76 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
modules/emacs/default.nix
View File

@ -1,45 +1,30 @@
{
config,
lib,
pkgs,
...
}:
with lib; let
{ config, lib, pkgs, ... }:
with lib;
let
defaultEl = ./default.el;
environment.systemPackages = [pkgs.gdb]; # use gdb for dap-mode
environment.systemPackages = [ pkgs.gdb ]; # use gdb for dap-mode
localsettings = pkgs.writeText "local-settings.el" ''
(defconst elss/paths/cpptools "{$pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools")
(defconst elss/paths/cpptools "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools")
(defconst elss/paths/cpptools-program "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7")
'';
defaultConfig = pkgs.runCommand "default.el" {} ''
defaultConfig = pkgs.runCommand "default.el" { } ''
mkdir -p $out/share/emacs/site-lisp
cp ${defaultEl} $out/share/emacs/site-lisp/default.el
cp ${localsettings} $out/share/emacs/site-lisp/local-settings.el
'';
emacsPackage =
(pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages
(epkgs: let
lpkgs = import ./packages.nix {
inherit config lib pkgs epkgs;
};
in
emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs:
let
lpkgs = import ./packages.nix { inherit config lib pkgs epkgs; };
#[ (defaultConfig lpkgs) ] ++ (with pkgs; [
# aspell
# emacs-all-the-icons-fonts
# gnupg
# nixpkgs-fmt
#])
[defaultConfig]
++ [
(with epkgs.elpaPackages; [
auctex
org
flymake
])
]
++ (with epkgs.melpaStablePackages; [])
++ (with epkgs.melpaPackages;
in [ defaultConfig ]
++ [ (with epkgs.elpaPackages; [ auctex org flymake ]) ]
++ (with epkgs.melpaStablePackages; [ ]) ++ (with epkgs.melpaPackages;
[
ac-helm
academic-phrases
@ -101,13 +86,10 @@ with lib; let
yaml-mode
yasnippet
#zenburn-theme
]
++ (with lpkgs; [
org-roam-ui
ligatures
])));
] ++ (with lpkgs; [ org-roam-ui ligatures ])));
in {
options.elss.programs.emacs.enable = mkEnableOption "Setup emacs package and install it";
options.elss.programs.emacs.enable =
mkEnableOption "Setup emacs package and install it";
config = mkIf config.elss.programs.emacs.enable {
services.emacs = {
enable = true;