summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--init.el3
-rw-r--r--settings/sane-defaults.el3
-rw-r--r--settings/setup-dap-mode.el6
-rw-r--r--settings/setup-plz-mode.el4
-rw-r--r--settings/setup-rustic-mode.el9
-rw-r--r--templates/snippets/rustic-mode/assert4
-rw-r--r--templates/snippets/rustic-mode/assert_eq5
-rw-r--r--templates/snippets/rustic-mode/derive_debug5
-rw-r--r--templates/snippets/rustic-mode/print_debug5
-rw-r--r--templates/snippets/rustic-mode/test8
10 files changed, 43 insertions, 9 deletions
diff --git a/init.el b/init.el
index 456de03..e147796 100644
--- a/init.el
+++ b/init.el
@@ -80,6 +80,7 @@
haskell-mode
hasklig-mode
highlight-escape-sequences
+ hl-todo
ido-vertical-mode
jinja2-mode
json
@@ -157,6 +158,7 @@
(require 'setup-c++-mode)
(require 'setup-clojure-mode)
(require 'setup-company-mode)
+(require 'setup-dap-mode)
(require 'setup-dockerfile-mode)
(require 'setup-flycheck)
(require 'setup-go-mode)
@@ -170,7 +172,6 @@
;;(require 'setup-mu4e)
(require 'setup-multiple-cursors)
(require 'setup-org-mode)
-(require 'setup-plz-mode)
(require 'setup-projectile-mode)
(require 'setup-protobuf-mode)
(require 'setup-purescript-mode)
diff --git a/settings/sane-defaults.el b/settings/sane-defaults.el
index cf17758..204f939 100644
--- a/settings/sane-defaults.el
+++ b/settings/sane-defaults.el
@@ -41,6 +41,9 @@
;; Transparently open compressed files
(auto-compression-mode t)
+;; Enable todo mode everywhere
+(add-hook 'prog-mode-hook #'hl-todo-mode)
+
;; Answering just 'y' or 'n' will do
(defalias 'yes-or-no-p 'y-or-n-p)
diff --git a/settings/setup-dap-mode.el b/settings/setup-dap-mode.el
new file mode 100644
index 0000000..208e1c8
--- /dev/null
+++ b/settings/setup-dap-mode.el
@@ -0,0 +1,6 @@
+;;; setup-dap-mode.el --- -*- lexical-binding: t; -*-
+(with-eval-after-load 'dap-mode
+ (define-key dap-mode-map (kbd "C-c d d") 'dap-hydra))
+
+(provide 'setup-dap-mode)
+;;; setup-dap-mode.el ends here
diff --git a/settings/setup-plz-mode.el b/settings/setup-plz-mode.el
deleted file mode 100644
index 677a7bb..0000000
--- a/settings/setup-plz-mode.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'auto-mode-alist '(".plz\\'" . sh-mode))
-
-(provide 'setup-plz-mode)
-;;; setup-plz-mode.el ends here
diff --git a/settings/setup-rustic-mode.el b/settings/setup-rustic-mode.el
index 74ceb29..75c8464 100644
--- a/settings/setup-rustic-mode.el
+++ b/settings/setup-rustic-mode.el
@@ -1,21 +1,22 @@
(require 'dap-lldb)
(require 'dap-gdb-lldb)
-
+;; installs .extension/vscode
(dap-gdb-lldb-setup)
(dap-register-debug-template
- "Rust::LLDB Run Configuration"
+ "Rust::LLDB"
(list :type "lldb"
:request "launch"
- :name "GDB::Run"
+ :name "LLDB::Run"
:gdbpath "rust-lldb"
:target nil
- :cwd nil))
+ :cwd (projectile-project-root)))
(defun rk/rustic-mode-hook ()
;; so that run C-c C-c C-r works without having to confirm
(setq-local buffer-save-without-query t))
(setq rustic-format-on-save t)
+(setq lsp-rust-analyzer-server-display-inlay-hints t)
(add-hook 'rustic-mode-hook 'rk/rustic-mode-hook)
(provide 'setup-rustic-mode)
diff --git a/templates/snippets/rustic-mode/assert b/templates/snippets/rustic-mode/assert
new file mode 100644
index 0000000..4d823f3
--- /dev/null
+++ b/templates/snippets/rustic-mode/assert
@@ -0,0 +1,4 @@
+me : assert
+#key : as
+# --
+assert!(${1:truth});
diff --git a/templates/snippets/rustic-mode/assert_eq b/templates/snippets/rustic-mode/assert_eq
new file mode 100644
index 0000000..18e9e8b
--- /dev/null
+++ b/templates/snippets/rustic-mode/assert_eq
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+#name : assert_eq
+#key : ase
+# --
+assert_eq!(${1:a}, ${2:b});
diff --git a/templates/snippets/rustic-mode/derive_debug b/templates/snippets/rustic-mode/derive_debug
new file mode 100644
index 0000000..6d64312
--- /dev/null
+++ b/templates/snippets/rustic-mode/derive_debug
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: derive-debug
+# key: debug
+# --
+#[derive(Debug)]
diff --git a/templates/snippets/rustic-mode/print_debug b/templates/snippets/rustic-mode/print_debug
new file mode 100644
index 0000000..5ae259f
--- /dev/null
+++ b/templates/snippets/rustic-mode/print_debug
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: println!("{:#?}", value);
+# key: log
+# --
+println!("{:#?}", ${1:value});
diff --git a/templates/snippets/rustic-mode/test b/templates/snippets/rustic-mode/test
new file mode 100644
index 0000000..837276f
--- /dev/null
+++ b/templates/snippets/rustic-mode/test
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: test
+# key: test
+# --
+#[test]
+fn it_works() {
+ assert_eq!(2 + 2, 4);
+}