From 865ef29d915a40554c3ec232c5af771191b9fa01 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Fri, 24 Mar 2023 14:15:06 +0100 Subject: [PATCH] Further fixes --- modules/emacs/default.el | 4 ++-- modules/emacs/default.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/emacs/default.el b/modules/emacs/default.el index 10727f5..bc45979 100644 --- a/modules/emacs/default.el +++ b/modules/emacs/default.el @@ -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 @@ -463,8 +465,6 @@ (dap-ui-controls-mode t) (dap-tooltip-mode t)) (use-package dap-cpptools - :preface - (require 'f) :custom (dap-cpptools-debug-path elss/paths/cpptools) (dap-cpptools-debug-program elss/paths/cpptools-program)) diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 631efe9..77295fb 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -6,6 +6,7 @@ let 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" { } ''