Compare commits

..

3 commits

Author SHA1 Message Date
551aa591a9 flake.lock: Update
All checks were successful
/ test (push) Successful in 5m23s
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/2a294b099b479a62a5e37964dfe5ceb75e74fdd8' (2024-05-01)
  → 'github:nix-community/emacs-overlay/dc94f94b49abb487f80e91978a1392e3e2b19fae' (2024-05-12)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27)
  → 'github:NixOS/nixpkgs/062ca2a9370a27a35c524dc82d540e6e9824b652' (2024-05-11)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/576ecd43d3b864966b4423a853412d6177775e8b' (2024-04-29)
  → 'github:NixOS/nixpkgs/71bae31b7dbc335528ca7e96f479ec93462323ff' (2024-05-11)
• Updated input 'extra-package-copilot':
    'github:zerolfx/copilot.el/edf517a57f539eb41eaa2f92c6752538f3a62b72' (2024-04-15)
  → 'github:zerolfx/copilot.el/733bff26450255e092c10873580e9abfed8a81b8' (2024-05-01)
• Updated input 'extra-package-indent-bars':
    'github:jdtsmith/indent-bars/4974f6c16c7fcc8bbe53fbcd93c74794877287a1' (2024-04-21)
  → 'github:jdtsmith/indent-bars/74c08d82fd5c7cc01085504c92aef12c95823379' (2024-05-07)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
  → 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089?dir=lib' (2024-03-29)
  → '50eb7ecf4c.tar.gz?narHash=sha256-QBx10%2Bk6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94%3D' (2024-05-02)
2024-05-12 21:40:44 +00:00
cd9fc69f3d
Refactor magit
All checks were successful
/ test (push) Successful in 23s
2024-05-12 01:00:01 +02:00
2df8189c91
dracula as default theme (again) 2024-05-12 00:59:46 +02:00
2 changed files with 20 additions and 24 deletions

18
flake.lock generated
View file

@ -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
View file

@ -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)