fix: deprecated git settings

2 files changed, 18 insertions, 11 deletions

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 0b0d2eb..2219e36 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -13,13 +13,6 @@
     home-manager.users.${username} = {
       programs.git = {
         enable = true;
-        userName = "schererleander";
-        userEmail = "leander@schererleander.de";
-        aliases = {
-          st = "status";
-          co = "checkout";
-          br = "branch";
-        };
         signing = {
           key = "506793F115464BB4";
           signByDefault = true;
@@ -28,12 +21,22 @@
           "*~"
           ".DS_Store"
         ];
-        diff-highlight.enable = true;
-        extraConfig = {
+        settings = {
+          user.name = "schererleander";
+          user.email = "leander@schererleander.de";
+          alias = {
+            st = "status";
+            co = "checkout";
+            br = "branch";
+          };
           pull.rebase = true;
           url."git@github.com:".insteadOf = "https://github.com";
         };
       };
+      programs.diff-highlight = {
+        enable = true;
+        enableGitIntegration = true;
+      };
     };
   };
 }
diff --git a/modules/services/polkit.nix b/modules/services/polkit.nix
index 4cc5fce..abd050f 100644
--- a/modules/services/polkit.nix
+++ b/modules/services/polkit.nix
@@ -7,15 +7,19 @@
 {
   options.nx.services.polkit.enable = lib.mkEnableOption "Enable and setup polkit service";
   config = lib.mkIf config.nx.services.polkit.enable {
+    environment.systemPackages = with pkgs; [
+      polkit
+      polkit_gnome
+    ];
     security.polkit.enable = true;
-    systemd.services.polkit-gnome-authenticator-agent-1 = {
+    systemd.user.services.polkit-gnome-authentication-agent-1 = {
       description = "polkit-gnome-authentication-agent-1";
       wantedBy = [ "graphical-session.target" ];
       wants = [ "graphical-session.target" ];
       after = [ "graphical-session.target" ];
       serviceConfig = {
         Type = "simple";
-        ExecStart = "${pkgs.polkit_gnome}/bin/polkit-gnome-authentication-agent-1";
+        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
         Restart = "on-failure";
         RestartSec = 1;
         TimeoutStopSec = 10;