diff --git a/modules/git.nix b/modules/git.nix index b9e74ee..46496e8 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -1,7 +1,7 @@ # https://blog.gitbutler.com/how-git-core-devs-configure-git/ {pkgs, ...}: { - programs.git-credential-oauth.enable = true; + programs.git-credential-oauth.enable = false; programs.git = { enable = true; userEmail = "yadunand@yadunut.com"; @@ -39,10 +39,10 @@ rebase.updateRefs = true; - - + credential.helper = [ + "${pkgs.git-credential-oauth}/bin/git-credential-oauth" + ]; gpg.format = "ssh"; - # credential.helper = "oauth"; credential = { "https://git.yadunut.dev" = { oauthClientId = "a4792ccc-144e-407e-86c9-5e7d8d9c3269"; diff --git a/penguin/configuration.nix b/penguin/configuration.nix index e68cb2b..0913468 100644 --- a/penguin/configuration.nix +++ b/penguin/configuration.nix @@ -84,6 +84,13 @@ defaultNetwork.settings.dns_enabled = true; }; + # gnome keyring + services.gnome.gnome-keyring.enable = true; + security.pam.services = { + greetd.enableGnomeKeyring = true; + login.enableGnomeKeyring = true; + }; + fonts.packages = with pkgs;[ nerd-fonts.jetbrains-mono font-awesome noto-fonts noto-fonts-emoji diff --git a/penguin/home.nix b/penguin/home.nix index 5e01986..2e6c961 100644 --- a/penguin/home.nix +++ b/penguin/home.nix @@ -1,4 +1,4 @@ -{pkgs, ...}:{ +{pkgs, lib, ...}:{ home.username = "yadunut"; home.homeDirectory = "/home/yadunut"; @@ -8,6 +8,7 @@ ]; services.darkman.enable = true; + services.hyprpolkitagent.enable = true; imports = [ (import ../modules/zsh.nix) @@ -29,6 +30,13 @@ zed-editor.enable = true; firefox.enable = true; }; + programs.git.extraConfig = { + user.signingkey = "~/.ssh/id_ed25519.pub"; + credential.helper = lib.mkForce [ + "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret" + "${pkgs.git-credential-oauth}/bin/git-credential-oauth" + ]; + }; home.stateVersion = "25.11"; programs.home-manager.enable = true; }