diff --git a/configs/home-manager/mpd.nix b/configs/home-manager/mpd.nix
index 8390458..9b4103c 100644
--- a/configs/home-manager/mpd.nix
+++ b/configs/home-manager/mpd.nix
@@ -25,7 +25,7 @@
   services.mpd-mpris.enable = true;
 
   home.packages = with pkgs; [
-    mpc
+    mpc-cli
     playerctl
   ];
 
diff --git a/configs/home-manager/yazi.nix b/configs/home-manager/yazi.nix
index 617cab4..83b4116 100644
--- a/configs/home-manager/yazi.nix
+++ b/configs/home-manager/yazi.nix
@@ -13,7 +13,7 @@
   };
   home.packages = with pkgs; [
     ffmpeg
-    poppler-utils
+    poppler_utils
     jq
     fd
     imagemagick
diff --git a/flake.lock b/flake.lock
index dc76365..f86b4ce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763901903,
-        "narHash": "sha256-w7YsxTjldwhUBP5ypbcZvWyZgRQqp3NBfyk5BAfrFjQ=",
+        "lastModified": 1760482308,
+        "narHash": "sha256-/N7svQ+TCTXEw/C9UPKi+l1Uft7b38eH9zpaOi4Guh0=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "fb9f0441c99833ab7bc035d76b9a89021270675a",
+        "rev": "f55d8341f1de89bdea025a13f33e179090f46a4d",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762286984,
-        "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
+        "lastModified": 1756719547,
+        "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
+        "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764017209,
-        "narHash": "sha256-RoJGCtKExXXkNCZUmmxezG3eOczEOTBw38DaZGSYJC0=",
+        "lastModified": 1758287904,
+        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ec8eabe00c4ee9a2ddc50162c125f0ec2a7099e1",
+        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "flake-compat": {
       "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764007004,
-        "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=",
+        "lastModified": 1760500983,
+        "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "125e40fa68b340aee9d474a46b540907e2537b5c",
+        "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1762847253,
-        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
+        "lastModified": 1760106635,
+        "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
+        "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763946063,
-        "narHash": "sha256-mxIPAXPmkf5aG7/pj59+82gvtgw2qi8pWIolMPTswu8=",
+        "lastModified": 1760536587,
+        "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "8d8506cea352fba187cfc748078e0c920c4e2129",
+        "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea",
         "type": "github"
       },
       "original": {
@@ -196,11 +196,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763835633,
-        "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
+        "lastModified": 1760284886,
+        "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
+        "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
         "type": "github"
       },
       "original": {
@@ -233,10 +233,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1764020811,
-        "narHash": "sha256-o+DLaTUYgUI40Q7gHAdCauGTUwumUbHr/lcS8e1hvVA=",
+        "lastModified": 1758892154,
+        "narHash": "sha256-QGZe55vkmCSFHZh+TsWGgDBs0eM66IDwGsnZYqpKB/4=",
         "ref": "refs/heads/main",
-        "rev": "fecca27e9229212a7b238383993c97dc8a52e0f0",
+        "rev": "793fd016c5c44fdb44f7bebceb03ebfcb96e4d65",
         "shallow": true,
         "type": "git",
         "url": "ssh://forgejo@git.venberg.xyz/Gabe/nvim-config.git"
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763870012,
-        "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=",
+        "lastModified": 1760393368,
+        "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3",
+        "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
         "type": "github"
       },
       "original": {
diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix
index bc53c59..a150a81 100644
--- a/modules/home-manager/git.nix
+++ b/modules/home-manager/git.nix
@@ -28,28 +28,26 @@
   };
 
   config = lib.mkIf config.user.git.enable {
-    programs.delta = {
-      enable = true;
-      options = {
-        side-by-side = true;
-        line-numbers = true;
-      };
-    };
     programs.git = {
       enable = true;
-      settings = {
-        aliases = {
-          tree = "log-long-line --graph --topo-order --all --simplify-by-decoration";
-          hist = "log-long-line --graph --date-order --date=short";
-          graph = "log-long-line --graph --topo-order --all";
-          log-long-line = "log --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'";
-          recent = "branch --sort=-committerdate --format='%(committerdate:relative)%09%(refname:short)'";
-          track = "add -AN";
-        };
-        user = {
-          email = config.user.git.profile.email;
-          name = config.user.git.profile.name;
+      aliases = {
+        tree = "log-long-line --graph --topo-order --all --simplify-by-decoration";
+        hist = "log-long-line --graph --date-order --date=short";
+        graph = "log-long-line --graph --topo-order --all";
+        log-long-line = "log --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'";
+        recent = "branch --sort=-committerdate --format='%(committerdate:relative)%09%(refname:short)'";
+        track = "add -AN";
+      };
+      delta = {
+        enable = true;
+        options = {
+          side-by-side = true;
+          line-numbers = true;
         };
+      };
+      userEmail = config.user.git.profile.email;
+      userName = config.user.git.profile.name;
+      extraConfig = {
         core.hooksPath = ".githooks";
         init.defaultBranch = "main";
         push = {
diff --git a/roles/nixos/embedded-dev/default.nix b/roles/nixos/embedded-dev/default.nix
index 36c3fd8..245ce8c 100644
--- a/roles/nixos/embedded-dev/default.nix
+++ b/roles/nixos/embedded-dev/default.nix
@@ -20,7 +20,7 @@ in {
 
   services.udev.packages = [udev-rules];
 
-  users.groups.plugdev = {};
+  users.groups.plugdev={};
   users.users.${config.host.details.user}.extraGroups = ["dialout" "plugdev"];
 
   home-manager.users.${config.host.details.user} = {config, ...}: {