mirror of
https://github.com/ellmau/nixos.git
synced 2025-12-19 09:29:36 +01:00
Dap mode (#7)
* Fix dap-mode for emacs * Fix formatting * Further fixes * Fix dap-cpptools config --------- Co-authored-by: Maximilian Marx <mmarx@wh2.tu-dresden.de>
This commit is contained in:
parent
1034e3fe25
commit
9ce9939eff
@ -85,6 +85,7 @@
|
||||
"steam-runtime"
|
||||
"skypeforlinux"
|
||||
"teams"
|
||||
"vscode-extension-ms-vscode-cpptools"
|
||||
"zoom"
|
||||
];
|
||||
};
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
;;(setq package-enable-at-startup nil)
|
||||
;;(package-initialize)
|
||||
|
||||
(require 'local-settings)
|
||||
|
||||
;; (load-theme 'spacemacs-dark t)
|
||||
;; (load-theme 'wombat t)
|
||||
(use-package solarized-theme
|
||||
@ -456,14 +458,17 @@
|
||||
;; dap
|
||||
(use-package dap-mode
|
||||
:ensure
|
||||
:after lsp-mode
|
||||
:requires (dap-cpptools)
|
||||
:config
|
||||
(dap-ui-mode)
|
||||
(dap-ui-controls-mode 1)
|
||||
:after (lsp-mode dap-cpptools)
|
||||
:custom
|
||||
(dap-mode t)
|
||||
(dap-ui-mode t))
|
||||
(dap-ui-mode t)
|
||||
(dap-ui-controls-mode t)
|
||||
(dap-tooltip-mode t))
|
||||
(use-package dap-cpptools
|
||||
:custom
|
||||
(dap-cpptools-debug-path elss/paths/cpptools)
|
||||
(dap-cpptools-debug-program `(,elss/paths/cpptools-program)))
|
||||
|
||||
|
||||
;; flycheck
|
||||
(use-package flycheck
|
||||
|
||||
@ -1,40 +1,31 @@
|
||||
{
|
||||
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-program "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7")
|
||||
(provide 'local-settings)
|
||||
'';
|
||||
|
||||
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
|
||||
@ -96,13 +87,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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user