From 909339b3d90b17d3314cfab79a7bb9ce4856435f Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Fri, 24 Mar 2023 13:59:08 +0100
Subject: [PATCH] Fix formatting

---
 modules/emacs/default.nix | 170 +++++++++++++++++---------------------
 1 file changed, 76 insertions(+), 94 deletions(-)

diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 8da4943..631efe9 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -1,113 +1,95 @@
-{
-  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;
-        [
-          ac-helm
-          academic-phrases
-          add-hooks
-          alert
-          all-the-icons
-          all-the-icons-dired
-          apheleia
-          beacon
-          bln-mode
-          cargo-mode
-          company
-          company-auctex
-          company-bibtex
-          company-flx
-          company-quickhelp
-          company-reftex
-          cov
-          dap-mode
-          diminish
-          direnv
-          dockerfile-mode
-          docker-compose-mode
-          flycheck
-          free-keys
-          highlight-indentation
-          helm
-          #helm-bbdb
-          helm-company
-          helm-flx
-          helm-descbinds
-          helm-lsp
-          helm-projectile
-          helm-rg
-          json-mode
-          less-css-mode
-          lsp-mode
-          lsp-ui
-          magit
-          markdown-mode
-          moe-theme
-          multiple-cursors
-          nix-mode
-          nixpkgs-fmt
-          org-bullets
-          org-roam
-          #org-roam-server
-          pasp-mode
-          pdf-tools
-          projectile
-          projectile-ripgrep
-          rustic
-          spacemacs-theme
-          solarized-theme
-          sparql-mode
-          sudo-edit
-          use-package
-          #vscode-dark-plus-theme
-          yaml-mode
-          yasnippet
-          #zenburn-theme
-        ]
-        ++ (with lpkgs; [
-          org-roam-ui
-          ligatures
-        ])));
+    in [ defaultConfig ]
+    ++ [ (with epkgs.elpaPackages; [ auctex org flymake ]) ]
+    ++ (with epkgs.melpaStablePackages; [ ]) ++ (with epkgs.melpaPackages;
+      [
+        ac-helm
+        academic-phrases
+        add-hooks
+        alert
+        all-the-icons
+        all-the-icons-dired
+        apheleia
+        beacon
+        bln-mode
+        cargo-mode
+        company
+        company-auctex
+        company-bibtex
+        company-flx
+        company-quickhelp
+        company-reftex
+        cov
+        dap-mode
+        diminish
+        direnv
+        dockerfile-mode
+        docker-compose-mode
+        flycheck
+        free-keys
+        highlight-indentation
+        helm
+        #helm-bbdb
+        helm-company
+        helm-flx
+        helm-descbinds
+        helm-lsp
+        helm-projectile
+        helm-rg
+        json-mode
+        less-css-mode
+        lsp-mode
+        lsp-ui
+        magit
+        markdown-mode
+        moe-theme
+        multiple-cursors
+        nix-mode
+        nixpkgs-fmt
+        org-bullets
+        org-roam
+        #org-roam-server
+        pasp-mode
+        pdf-tools
+        projectile
+        projectile-ripgrep
+        rustic
+        spacemacs-theme
+        solarized-theme
+        sparql-mode
+        sudo-edit
+        use-package
+        #vscode-dark-plus-theme
+        yaml-mode
+        yasnippet
+        #zenburn-theme
+      ] ++ (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;