diff --git a/configs/home-manager/mpd.nix b/configs/home-manager/mpd.nix index 9b4103c..8390458 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-cli + mpc playerctl ]; diff --git a/configs/home-manager/yazi.nix b/configs/home-manager/yazi.nix index 83b4116..617cab4 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 f86b4ce..1c61ddd 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1760482308, - "narHash": "sha256-/N7svQ+TCTXEw/C9UPKi+l1Uft7b38eH9zpaOi4Guh0=", + "lastModified": 1763901903, + "narHash": "sha256-w7YsxTjldwhUBP5ypbcZvWyZgRQqp3NBfyk5BAfrFjQ=", "owner": "9001", "repo": "copyparty", - "rev": "f55d8341f1de89bdea025a13f33e179090f46a4d", + "rev": "fb9f0441c99833ab7bc035d76b9a89021270675a", "type": "github" }, "original": { @@ -36,11 +36,11 @@ ] }, "locked": { - "lastModified": 1756719547, - "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", + "lastModified": 1762286984, + "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", + "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", "type": "github" }, "original": { @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1763651264, + "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1764007004, + "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "125e40fa68b340aee9d474a46b540907e2537b5c", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1760536587, - "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", + "lastModified": 1763946063, + "narHash": "sha256-mxIPAXPmkf5aG7/pj59+82gvtgw2qi8pWIolMPTswu8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea", + "rev": "8d8506cea352fba187cfc748078e0c920c4e2129", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1760393368, - "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", + "lastModified": 1763870012, + "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", "owner": "mic92", "repo": "sops-nix", - "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", + "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", "type": "github" }, "original": { diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index a150a81..bc53c59 100644 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -28,26 +28,28 @@ }; config = lib.mkIf config.user.git.enable { + programs.delta = { + enable = true; + options = { + side-by-side = true; + line-numbers = true; + }; + }; programs.git = { enable = true; - 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; + 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; }; - }; - 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 245ce8c..36c3fd8 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, ...}: {