flake.lock: Update

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)
Refactor magit
2024-05-12 21:40:44 +00:00 · 2024-05-12 01:00:01 +02:00 · 2024-05-12 00:59:46 +02:00
2 changed files with 35 additions and 45 deletions
--- a/flake.lock
+++ b/flake.lock
@ -7,11 +7,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1714528291,
-        "narHash": "sha256-eZe8RbeCwvBU4MO9tyIGBZ0TPUeBuqH0zvjyT0ANAo4=",
+        "lastModified": 1715533419,
+        "narHash": "sha256-PDlWxvgHqWEJdfAxMYLmoof+ohJrOHx9IZIxvHKE24U=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "2a294b099b479a62a5e37964dfe5ceb75e74fdd8",
+        "rev": "dc94f94b49abb487f80e91978a1392e3e2b19fae",
        "type": "github"
      },
      "original": {
@ -55,11 +55,11 @@
    "extra-package-copilot": {
      "flake": false,
      "locked": {
-        "lastModified": 1713189314,
-        "narHash": "sha256-53BGX2llkrM5mDmFSVe+O/Vo4F2gDJTFh/4TqBuQme8=",
+        "lastModified": 1714572852,
+        "narHash": "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0=",
        "owner": "zerolfx",
        "repo": "copilot.el",
-        "rev": "edf517a57f539eb41eaa2f92c6752538f3a62b72",
+        "rev": "733bff26450255e092c10873580e9abfed8a81b8",
        "type": "github"
      },
      "original": {
@ -71,11 +71,11 @@
    "extra-package-indent-bars": {
      "flake": false,
      "locked": {
-        "lastModified": 1713707934,
-        "narHash": "sha256-KGqP80JC0/uPol6diU8XcuHfK7i0hlKY6NoqAZh4QFY=",
+        "lastModified": 1715116344,
+        "narHash": "sha256-fTbDjWHO7DRGtlsbU1YXat/lLACxqdXU2tNuZMagkh0=",
        "owner": "jdtsmith",
        "repo": "indent-bars",
-        "rev": "4974f6c16c7fcc8bbe53fbcd93c74794877287a1",
+        "rev": "74c08d82fd5c7cc01085504c92aef12c95823379",
        "type": "github"
      },
      "original": {
@ -122,11 +122,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "lastModified": 1714641030,
+        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
        "type": "github"
      },
      "original": {
@ -194,11 +194,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1715447595,
+        "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
        "type": "github"
      },
      "original": {
@ -210,29 +210,23 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "dir": "lib",
-        "lastModified": 1711703276,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
-        "type": "github"
+        "lastModified": 1714640452,
+        "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
      },
      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1714409183,
-        "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=",
+        "lastModified": 1715395895,
+        "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "576ecd43d3b864966b4423a853412d6177775e8b",
+        "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff",
        "type": "github"
      },
      "original": {
--- a/init.el
+++ b/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)