summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.el196
-rw-r--r--packages.el11
2 files changed, 3 insertions, 204 deletions
diff --git a/config.el b/config.el
index f9736bd..2931e99 100644
--- a/config.el
+++ b/config.el
@@ -45,24 +45,6 @@
("it-en" . "~/org/dict/it-en-enwiktionary.txt"))))
-
-;; Use carp-mode for .carp files
-;(add-to-list 'auto-mode-alist '("\\.carp\\'" . carp-mode))
-
-
-;; carp-mode and stuff
-(add-to-list 'load-path "~/.config/nixpkgs/doom.d/carp-emacs")
-
-;; (require 'carp-mode)
-;; (require 'inf-carp-mode)
-;; (require 'carp-flycheck)
-;; ;; Use carp-mode for .carp files
-;; (add-to-list 'auto-mode-alist '("\\.carp\\'" . carp-mode))
-;; ;; flycheck mode for better type errors
-;; (add-hook 'carp-mode-hook
-;; (lambda ()
-;; (flycheck-mode 1)))
-
;; hide all these annoying popups that clutter the view
(setq lsp-ui-doc-enable nil)
(setq lsp-ui-sideline-show-code-actions nil)
@@ -107,9 +89,6 @@
"a" #'helm-lsp-code-actions-custom))
-
-
-
(use-package! isar-mode
:mode "\\.thy\\'"
:config
@@ -127,177 +106,8 @@
(lambda ()
(yas-minor-mode))))
-(use-package! lsp-isar-parse-args
- :custom
- (lsp-isar-parse-args-nollvm nil))
-
-(use-package! lsp-isar
- :commands lsp-isar-define-client-and-start
- :custom
- (lsp-isar-output-use-async t)
- (lsp-isar-output-time-before-printing-goal nil)
- (lsp-isar-experimental t)
- (lsp-isar-split-pattern 'lsp-isar-split-pattern-three-columns)
- (lsp-isar-decorations-delayed-printing t)
- :init
- (add-hook 'lsp-isar-init-hook 'lsp-isar-open-output-and-progress-right-spacemacs)
- (add-hook 'isar-mode-hook #'lsp-isar-define-client-and-start)
-
- (push (concat "/home/stuebinm/clones/isabelle-emacs/src/Tools/emacs-lsp/yasnippet")
- yas-snippet-dirs)
- (setq lsp-isar-path-to-isabelle "/home/stuebinm/clones/isabelle-emacs"))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-(require 'exwm)
-;; (if (boundp 'inexwm)
-;; (progn
-
-
-
-(defvar desktop-environment-mode-map
- (let ((desktop-environment--keybindings
- `(;; Brightness
- (,(kbd "<XF86MonBrightnessUp>") . ,(function desktop-environment-brightness-increment))
- (,(kbd "<XF86MonBrightnessDown>") . ,(function desktop-environment-brightness-decrement))
- (,(kbd "S-<XF86MonBrightnessUp>") . ,(function desktop-environment-brightness-increment-slowly))
- (,(kbd "S-<XF86MonBrightnessDown>") . ,(function desktop-environment-brightness-decrement-slowly))
- ;; Volume
- (,(kbd "<XF86AudioRaiseVolume>") . ,(function desktop-environment-volume-increment))
- (,(kbd "<XF86AudioLowerVolume>") . ,(function desktop-environment-volume-decrement))
- (,(kbd "S-<XF86AudioRaiseVolume>") . ,(function desktop-environment-volume-increment-slowly))
- (,(kbd "S-<XF86AudioLowerVolume>") . ,(function desktop-environment-volume-decrement-slowly))
- (,(kbd "<XF86AudioMute>") . ,(function desktop-environment-toggle-mute))
- (,(kbd "<XF86AudioMicMute>") . ,(function desktop-environment-toggle-microphone-mute))
- ;; Screenshot
- (,(kbd "S-<print>") . ,(function desktop-environment-screenshot-part))
- (,(kbd "<print>") . ,(function desktop-environment-screenshot))
- ;; Screen locking
- (,(kbd "s-c") . ,(function desktop-environment-lock-screen))
- (,(kbd "<XF86ScreenSaver>") . ,(function desktop-environment-lock-screen))
- ;; Wifi controls
- (,(kbd "<XF86WLAN>") . ,(function desktop-environment-toggle-wifi))
- ;; Bluetooth controls
- (,(kbd "<XF86Bluetooth>") . ,(function desktop-environment-toggle-bluetooth))
- ;; Music controls
- (,(kbd "<XF86AudioPlay>") . ,(function desktop-environment-toggle-music))
- (,(kbd "<XF86AudioPrev>") . ,(function desktop-environment-music-previous))
- (,(kbd "<XF86AudioNext>") . ,(function desktop-environment-music-next))
- (,(kbd "<XF86AudioStop>") . ,(function desktop-environment-music-stop))))
- (map (make-sparse-keymap)))
- (dolist (keybinding desktop-environment--keybindings)
- (define-key map (car keybinding) (cdr keybinding)))
- map)
- "Keymap for `desktop-environment-mode'.")
-
-(defun desktop-environment-exwm-set-global-keybindings (enable)
- (when (featurep 'exwm-input)
- (when enable
- (map-keymap (lambda (event definition)
- (exwm-input-set-key (vector event) definition))
- desktop-environment-mode-map))))
-
-
-;; set up desktop env keybindings with exwm
-;(setq desktop-environment-update-global-keys :global)
-;(desktop-environment-mode)
-(desktop-environment-exwm-set-global-keybindings t)
-
-;; keybindings for exwm
-(exwm-input-set-key (kbd "s-l") 'evil-window-right)
-(exwm-input-set-key (kbd "s-k") 'evil-window-up)
-(exwm-input-set-key (kbd "s-j") 'evil-window-down)
-(exwm-input-set-key (kbd "s-h") 'evil-window-left)
-(exwm-input-set-key (kbd "s-L") '+evil/window-move-right)
-(exwm-input-set-key (kbd "s-K") '+evil/window-move-up)
-(exwm-input-set-key (kbd "s-J") '+evil/window-move-down)
-(exwm-input-set-key (kbd "s-H") '+evil/window-move-left)
-(exwm-input-set-key (kbd "s-q") 'evil-quit)
-(exwm-input-set-key (kbd "s-o") 'delete-other-windows)
-(exwm-input-set-key (kbd "s-SPC") 'switch-to-buffer)
-(exwm-input-set-key (kbd "s-v") 'evil-window-vsplit)
-(exwm-input-set-key (kbd "s-b") 'evil-window-split)
-(exwm-input-set-key (kbd "s-V") '+evil/window-vsplit-and-follow)
-(exwm-input-set-key (kbd "s-B") '+evil/window-split-and-follow)
-
-(exwm-input-set-key (kbd "<XF86AudioLowerVolume>")
- 'pulseaudio-control-decrease-volume)
-(exwm-input-set-key (kbd "<XF86AudioRaiseVolume>")
- 'pulseaudio-control-increase-volume)
-(exwm-input-set-key (kbd "<XF86AudioMute>")
- 'pulseaudio-control-toggle-current-sink-mute)
-(exwm-input-set-key (kbd "<s-XF86AudioMute>")
- 'pulseaudio-control-select-sink-by-name)
-
-(exwm-input-set-key (kbd "s-c") 'desktop-environment-lock-screen)
-(exwm-input-set-key (kbd "s-x") 'counsel-M-x)
-
-(exwm-input-set-key (kbd "<XF86MonBrightnessDown>")
- 'desktop-environment-brightness-decrement)
-(exwm-input-set-key (kbd "<XF86MonBrightnessUp>")
- 'desktop-environment-brightness-increment)
-(exwm-input-set-key (kbd "<M-XF86MonBrightnessDown>")
- 'desktop-environment-brightness-decrement-slowly)
-(exwm-input-set-key (kbd "<M-XF86MonBrightnessUp>")
- 'desktop-environment-brightness-increment-slowly)
-
;; icons in the tray
- (setq display-time-24hr-format 1)
- (display-time-mode)
- (display-battery-mode)
- ;; ))
-
-
- ;; stuff for executing other programs
- (require 'simple)
-
- (defvar execute-command-alist '()
- "An association list of (command-call . process-object) for all commands executed.")
-
- (defconst execute-list-buffer "*Execute Cmd List*"
- "Name of the execute listing buffer.")
-
- (defun execute-program (command)
- "Execute the COMMAND asynchronously and track it so later can be listed using `execute-list'."
- (interactive (list (read-shell-command "execute command:")))
- (let* ((proc-obj
- (start-process-shell-command "execute-process" "execute-process-buffer" command)))
- (when proc-obj ; Add to the alist
- (setq execute-command-alist
- (cons (cons command proc-obj) execute-command-alist))
- (display-buffer (process-buffer proc-obj)))))
-
- (defun execute-list ()
- "List all the commands executed."
- (interactive)
- (with-current-buffer (get-buffer-create execute-list-buffer)
- (delete-region (point-min) (point-max))
- (switch-to-buffer (current-buffer))
- (dolist (e execute-command-alist)
- (when (process-status (cdr e))
- (insert (format "%d: '%s' - %s - %s\n"
- (process-id (cdr e))
- (car e)
- (process-status (cdr e))
- (process-buffer (cdr e))))))))
-
-
- (substitute-key-definition 'shell-command 'execute-program (current-global-map))
- (exwm-input-set-key (kbd "s-s") 'execute-program)
- (exwm-input-set-key (kbd "s-t") '(lambda ()
- "open a kitty terminal"
- (interactive)
- (execute-program "kitty")))
+(setq display-time-24hr-format 1)
+(display-time-mode)
+(display-battery-mode)
diff --git a/packages.el b/packages.el
index a1ffc3e..0fa3b07 100644
--- a/packages.el
+++ b/packages.el
@@ -25,17 +25,6 @@
(package! desktop-environment)
-(package! isar-mode
- :recipe (:host github :repo "m-fleury/isar-mode"))
-
-(package! isar-goal-mode
- :recipe (:host github :repo "m-fleury/simp-isar-mode"))
-
-(package! lsp-isar
- :recipe (:local-repo "/home/stuebinm/clones/isabelle-emacs/src/Tools/emacs-lsp/lsp-isar"))
-
-(package! lsp-isar-parse-args
- :recipe (:local-repo "/home/stuebinm/clones/isabelle-emacs/src/Tools/emacs-lsp/lsp-isar"))
(package! session-async)