Skip to content

Commit 317958f

Browse files
Update to cope with macs
1 parent 439f2f4 commit 317958f

5 files changed

Lines changed: 96 additions & 117 deletions

File tree

core/prelude-editor.el

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -378,32 +378,13 @@ indent yanked text (with prefix arg don't indent)."
378378
;; enable winner-mode to manage window configurations
379379
(winner-mode +1)
380380

381-
;; diff-hl
382-
(global-diff-hl-mode +1)
383-
(add-hook 'dired-mode-hook 'diff-hl-dired-mode)
384-
(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
385-
386381
;; easy-kill
387382
(global-set-key [remap kill-ring-save] 'easy-kill)
388383
(global-set-key [remap mark-sexp] 'easy-mark)
389384

390385
;; operate-on-number
391-
(require 'operate-on-number)
392386
(require 'smartrep)
393387

394-
(smartrep-define-key global-map "C-c ."
395-
'(("+" . apply-operation-to-number-at-point)
396-
("-" . apply-operation-to-number-at-point)
397-
("*" . apply-operation-to-number-at-point)
398-
("/" . apply-operation-to-number-at-point)
399-
("\\" . apply-operation-to-number-at-point)
400-
("^" . apply-operation-to-number-at-point)
401-
("<" . apply-operation-to-number-at-point)
402-
(">" . apply-operation-to-number-at-point)
403-
("#" . apply-operation-to-number-at-point)
404-
("%" . apply-operation-to-number-at-point)
405-
("'" . operate-on-number-at-point)))
406-
407388
(defadvice server-visit-files (before parse-numbers-in-lines (files proc &optional nowait) activate)
408389
"Open file with emacsclient with cursors positioned on requested line.
409390
Most of console-based utilities prints filename in format

modules/prelude-helm-everywhere.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
;;; Code:
3434
(require 'prelude-helm)
3535
(require 'helm-eshell)
36+
(require 'helm-descbinds)
3637

3738
(global-set-key (kbd "M-x") 'helm-M-x)
3839
(global-set-key (kbd "C-x C-m") 'helm-M-x)

personal/gemini.el

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
(require 'use-package)
2+
(require 'vterm)
3+
4+
;; 2. Bootstrap Quelpa (The Magic)
5+
(unless (package-installed-p 'quelpa)
6+
(with-temp-buffer
7+
(url-insert-file-contents "https://raw.githubusercontent.com/quelpa/quelpa/master/quelpa.el")
8+
(eval-buffer)
9+
(quelpa-self-upgrade)))
10+
11+
(unless (package-installed-p 'quelpa-use-package)
12+
(package-refresh-contents)
13+
(package-install 'quelpa-use-package))
14+
15+
(require 'quelpa-use-package)
16+
(setq quelpa-update-melpa-p nil)
17+
18+
19+
(use-package gemini-cli-mode
20+
;; The magic line:
21+
:quelpa (gemini-cli-mode :fetcher github :repo "davidpham87/gemini-cli-mode"))
22+
23+
24+
(global-set-key (kbd "C-x M-m") 'vterm)

personal/preload/swiss-keybindings.el

Lines changed: 0 additions & 98 deletions
This file was deleted.

personal/swiss-keybindings.el

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
(require 'iso-transl)
2+
(use-package paredit)
3+
4+
(global-set-key (kbd "C-§") 'other-frame)
5+
(global-set-key [remap other-window] 'other-window)
6+
(global-set-key (kbd "C-'") 'ace-window) ; key change windows
7+
(global-set-key (kbd "C-x o") 'other-window)
8+
(global-set-key (kbd "C-x C-b") 'ibuffer)
9+
10+
(delete-selection-mode t) ; Delete selection when pressing [delete] key
11+
(global-set-key (kbd "<C-dead-circumflex>") 'crux-top-join-line)
12+
(global-set-key (kbd "<M-dead-circumflex>") 'join-line)
13+
;; (global-set-key (kbd "M-j") 'join-line)
14+
;; In order to avoid to hit SPC everytime
15+
16+
;; Should be default but sometimes are overwritten
17+
(global-set-key [M-a] 'backward-sentence)
18+
(global-set-key [M-e] 'forward-sentence)
19+
(global-set-key [M-d] 'kill-sentence)
20+
21+
(let* ((km (cond
22+
((eq system-type 'darwin)
23+
'(("¥" "M-y") ("" "M-x") ("©" "M-c") ("" "M-v") ("" "M-b")
24+
("å" "M-a") ("ß" "M-s") ("" "M-d") ("ƒ" "M-f")
25+
("" "M-w") ("®" "M-r") ("" "M-t")))
26+
((eq system-type 'gnu/linux)
27+
'(("«" "M-y") ("»" "M-x") ("¢" "M-c") ("" "M-v") ("" "M-b")
28+
("æ" "M-a") ("ß" "M-s") ("ð" "M-d") ("đ" "M-f") ("ŋ" "M-g")
29+
("ł" "M-w") ("" "M-e") ("" "M-r") ("ŧ" "M-t")))))
30+
(kmc (mapcar (lambda(y) (--map (concat "C-" it) y)) km)) ; C- variant
31+
(key-mapper (lambda (it) (define-key key-translation-map
32+
(kbd (car it)) (kbd (car (cdr it)))))))
33+
(mapc key-mapper km)
34+
(mapc key-mapper kmc))
35+
36+
;; Mac settings to have the same feeling as pc keyboard
37+
(when (eq system-type 'darwin)
38+
;; ;; This is to make mac friendly
39+
(setq mac-command-modifier 'meta
40+
mac-option-modifier 'none)
41+
42+
(global-set-key (kbd "æ") '"{")
43+
(global-set-key (kbd "") '"}")
44+
(global-set-key (kbd "§") '"[")
45+
(global-set-key (kbd "") '"]")
46+
(global-set-key (kbd "C-<") '"\\")
47+
(define-key key-translation-map (kbd "M-æ") (kbd "M-{"))
48+
(define-key key-translation-map (kbd "M-¶") (kbd "M-}")))
49+
50+
;; Emacs-live rewrite
51+
(global-set-key (kbd "C-h") 'help-command)
52+
53+
;; Make C-é delete backward
54+
(global-set-key (kbd "C-é") 'delete-backward-char)
55+
(global-set-key (kbd "<C-backspace>") 'delete-backward-char)
56+
(global-set-key (kbd "M-n") 'back-to-indentation)
57+
58+
;;allow the deletion of words:
59+
;;backward kill word (forward kill word is M-d)
60+
(global-set-key (kbd "M-é") 'backward-kill-word)
61+
62+
;; Should write for console C-c C-y instead of C-c C-z
63+
(define-key key-translation-map (kbd "C-c C-y") (kbd "C-c C-z"))
64+
65+
(define-key key-translation-map (kbd "M-[") (kbd "M-{"))
66+
(define-key key-translation-map (kbd "M-]") (kbd "M-}"))
67+
68+
(define-key key-translation-map (kbd "Ŧ") (kbd "M-T"))
69+
(global-set-key (kbd "M-T") 'sp-transpose-sexp)
70+
71+
(global-set-key (kbd "C-x C-b") 'ibuffer)

0 commit comments

Comments
 (0)