aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home-manager/git/default.nix7
-rw-r--r--home-manager/ssh-agent/default.nix12
-rw-r--r--modules/client/cinnamon/default.nix5
3 files changed, 7 insertions, 17 deletions
diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix
index 35a7175..8caf732 100644
--- a/home-manager/git/default.nix
+++ b/home-manager/git/default.nix
@@ -4,11 +4,10 @@
programs.git = {
enable = true;
- userName = "aethrvmn";
- userEmail = "me@aethrvmn.gr";
-
- extraConfig = {
+ settings = {
core.editor = "hx";
+ user.name = "aethrvmn";
+ user.email = "me@aethrvmn.gr";
};
signing = {
diff --git a/home-manager/ssh-agent/default.nix b/home-manager/ssh-agent/default.nix
index 882f86f..c128c4f 100644
--- a/home-manager/ssh-agent/default.nix
+++ b/home-manager/ssh-agent/default.nix
@@ -1,21 +1,13 @@
{ config, ... }:
{
- # Comments are for NixOS 25.11
programs.ssh = {
enable = true;
- #-------------------------
- # Ths will be removed
- addKeysToAgent = "yes";
- # this will be enabled
- # enableDefaultConfig = false;
- #-------------------------
+ enableDefaultConfig = false;
matchBlocks = {
"*" = {
- #---- This will be enabled
- # addKeysToAgent = "yes";
- #-------------------------
+ addKeysToAgent = "yes";
forwardAgent = false;
serverAliveInterval = 0;
serverAliveCountMax = 3;
diff --git a/modules/client/cinnamon/default.nix b/modules/client/cinnamon/default.nix
index 16c60d0..7cc5395 100644
--- a/modules/client/cinnamon/default.nix
+++ b/modules/client/cinnamon/default.nix
@@ -18,10 +18,9 @@
};
## Just in case this isn't automatically enabled
# cinnamon.apps.enable = true;
- # ----- below is for 25.11 ----------------------
+
# disable gNOME's "usecase?" ssh-agent
- # gnome.gcr-ssh-agent.enable = lib.mkForce false;
- # -----------------------------------------------
+ gnome.gcr-ssh-agent.enable = lib.mkForce false;
};
# Exclude specific packages
Directive (EU) 2019/790, Article 4(3); all rights regarding Text and Data Mining (TDM) are reserved.