From c9a4f52c31938b653543cebab6739ec76afcc23e Mon Sep 17 00:00:00 2001
From: Miguel Palhas <mpalhas@gmail.com>
Date: Wed, 22 Oct 2025 11:20:03 +0100
Subject: [PATCH] fixes

---
 flake.lock                           | 12 +++----
 home/common/features/ledger.nix      |  6 ----
 home/common/programs/git/default.nix | 52 +++++++++++++++-------------
 home/desktop/default.nix             |  1 -
 4 files changed, 33 insertions(+), 38 deletions(-)
 delete mode 100644 home/common/features/ledger.nix

diff --git a/flake.lock b/flake.lock
index d144ea8..521859d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -151,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758786164,
-        "narHash": "sha256-o1WyZI2T7yPywiY06Swt8AZH/ewKU1nLqDw8fw1fwPc=",
+        "lastModified": 1761081701,
+        "narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "232454052008027c8e925979d13a951e92729781",
+        "rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315",
         "type": "github"
       },
       "original": {
@@ -317,11 +317,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1760524057,
-        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
+        "lastModified": 1760878510,
+        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
+        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
         "type": "github"
       },
       "original": {
diff --git a/home/common/features/ledger.nix b/home/common/features/ledger.nix
deleted file mode 100644
index e264d73..0000000
--- a/home/common/features/ledger.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    ledger-live-desktop
-  ];
-}
diff --git a/home/common/programs/git/default.nix b/home/common/programs/git/default.nix
index 36c47c0..c5148ce 100644
--- a/home/common/programs/git/default.nix
+++ b/home/common/programs/git/default.nix
@@ -5,31 +5,33 @@
 
   programs.git = {
     enable = true;
-    userName = "Miguel Palhas";
-    userEmail = "mpalhas@gmail.com";
-    aliases = {
-      ls = "log --color --graph --oneline --decorate --topo-order --pretty=format:'%C(yellow)%d%Creset %Cgreen(%cr)%Creset %C(bold blue)[%an]%Creset %s %Cred(%h)%Creset' --abbrev-commit";
-      ll = ''log --reverse --pretty=format:"%C(yellow)%h%Cred%d\ %Creset%s%Cblue\ [%an]" --decorate --numstat'';
-      conf = "diff --name-only --diff-filter=U";
-      ba = "branch -a";
-      pb = "publish";
-      ps = "push -u";
-      pr = "pull-request";
-      ppr = "push-pr";
-      cpr = "close-pr";
-      opr = "open-pr";
-      f = "fetch";
-      c = "commit --verbose";
-      d = "diff";
-      dc = "diff --cached";
-      co = "checkout";
-      s = "status -sb";
-      b = "better-branch";
-      rb = "rebase";
-      rbc = "rebase --continue";
-      w = "commit -am 'wip'";
-    };
-    extraConfig = {
+    settings = {
+      user = {
+        name = "Miguel Palhas";
+        email = "mpalhas@gmail.com";
+      };
+      alias = {
+        ls = "log --color --graph --oneline --decorate --topo-order --pretty=format:'%C(yellow)%d%Creset %Cgreen(%cr)%Creset %C(bold blue)[%an]%Creset %s %Cred(%h)%Creset' --abbrev-commit";
+        ll = ''log --reverse --pretty=format:"%C(yellow)%h%Cred%d\ %Creset%s%Cblue\ [%an]" --decorate --numstat'';
+        conf = "diff --name-only --diff-filter=U";
+        ba = "branch -a";
+        pb = "publish";
+        ps = "push -u";
+        pr = "pull-request";
+        ppr = "push-pr";
+        cpr = "close-pr";
+        opr = "open-pr";
+        f = "fetch";
+        c = "commit --verbose";
+        d = "diff";
+        dc = "diff --cached";
+        co = "checkout";
+        s = "status -sb";
+        b = "better-branch";
+        rb = "rebase";
+        rbc = "rebase --continue";
+        w = "commit -am 'wip'";
+      };
       init = {
         defaultBranch = "main";
       };
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index a07b1b1..a625822 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -23,7 +23,6 @@
     ../common/programs/3d.nix
     ../common/features/xdg.nix
     ../common/features/bluetooth.nix
-    ../common/features/ledger.nix
     ./monitors.nix
   ];