Compare commits
3 commits
94c716c8b9
...
551aa591a9
Author | SHA1 | Date | |
---|---|---|---|
551aa591a9 | |||
cd9fc69f3d | |||
2df8189c91 |
2 changed files with 20 additions and 24 deletions
18
flake.lock
generated
18
flake.lock
generated
|
@ -7,11 +7,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715447076,
|
||||
"narHash": "sha256-uEvbf9BrovJdJsJ31a1nPEN8thj3JIy65fWerNna29A=",
|
||||
"lastModified": 1715533419,
|
||||
"narHash": "sha256-PDlWxvgHqWEJdfAxMYLmoof+ohJrOHx9IZIxvHKE24U=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "1f7112047b60e5a5719721b357477178675f8c5e",
|
||||
"rev": "dc94f94b49abb487f80e91978a1392e3e2b19fae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -194,11 +194,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1715266358,
|
||||
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
|
||||
"lastModified": 1715447595,
|
||||
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
|
||||
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -222,11 +222,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1715218190,
|
||||
"narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
|
||||
"lastModified": 1715395895,
|
||||
"narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9a9960b98418f8c385f52de3b09a63f9c561427a",
|
||||
"rev": "71bae31b7dbc335528ca7e96f479ec93462323ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
26
init.el
26
init.el
|
@ -68,7 +68,7 @@
|
|||
(defun ccr/reload-emacs ()
|
||||
(interactive)
|
||||
(load-file "~/.config/emacs/init.el"))
|
||||
(load-theme 'modus-operandi 't)
|
||||
(load-theme 'dracula 't)
|
||||
(defun ccr/nixos-rebuild ()
|
||||
(interactive)
|
||||
(let* ((operation (completing-read "nixos-rebuild " '("switch" "boot" "test" "dry-activate")))
|
||||
|
@ -87,13 +87,6 @@
|
|||
(tramp-use-ssh-controlmaster-options nil) ;; makes tramp use ~/.ssh/config
|
||||
)
|
||||
|
||||
;; (use-package dracula-theme
|
||||
;; :config
|
||||
;; (add-hook 'after-make-frame-functions (defun ccr/theme-init (_)
|
||||
;; (load-theme 'dracula 't)
|
||||
;; (meow--prepare-face)
|
||||
;; (remove-hook 'after-make-frame-functions 'ccr/theme-init))))
|
||||
|
||||
(use-package ligature
|
||||
:config
|
||||
(ligature-set-ligatures 't '("www"))
|
||||
|
@ -416,18 +409,21 @@
|
|||
(which-key-setup-side-window-right))
|
||||
|
||||
(use-package magit
|
||||
:hook ((magit-mode . magit-delta-mode))
|
||||
:custom
|
||||
(magit-todos-keyword-suffix "([^)]+):")
|
||||
:config
|
||||
(magit-todos-mode +1)
|
||||
:bind (("C-c o g" . magit)))
|
||||
|
||||
(use-package magit-delta
|
||||
:hook (magit-mode . magit-delta-mode))
|
||||
|
||||
(use-package magit-todos
|
||||
:after magit
|
||||
:custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
|
||||
:config (magit-todos-mode 1))
|
||||
|
||||
(use-package difftastic
|
||||
:demand t
|
||||
:bind (:map magit-blame-read-only-mode-map
|
||||
("D" . difftastic-magit-show)
|
||||
("S" . difftastic-magit-show))
|
||||
("D" . difftastic-magit-show)
|
||||
("S" . difftastic-magit-show))
|
||||
:config
|
||||
(eval-after-load 'magit-diff
|
||||
'(transient-append-suffix 'magit-diff '(-1 -1)
|
||||
|
|
Reference in a new issue