new hm defaults, keepalived now using the first interface
This commit is contained in:
+2
-2
@@ -4,7 +4,7 @@
|
||||
vrrpInstances = {
|
||||
V4 = {
|
||||
priority = config.vars.ka_priority;
|
||||
interface = lib.head config.vars.interfaces;
|
||||
interface = (lib.head config.vars.interfaces).name;
|
||||
virtualRouterId = 69;
|
||||
useVmac = true;
|
||||
virtualIps = [
|
||||
@@ -15,7 +15,7 @@
|
||||
};
|
||||
V6 = {
|
||||
priority = config.vars.ka_priority;
|
||||
interface = lib.head config.vars.interfaces;
|
||||
interface = (lib.head config.vars.interfaces).name;
|
||||
virtualRouterId = 96;
|
||||
useVmac = true;
|
||||
virtualIps = [
|
||||
|
||||
+14
-4
@@ -1,6 +1,6 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
|
||||
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -10,7 +10,7 @@ in
|
||||
home-manager.users.root = {
|
||||
home.stateVersion = config.vars.stateVersion; # Set to your current home-manager version
|
||||
|
||||
programs.git = {
|
||||
programs.git.settings = {
|
||||
enable = true;
|
||||
userName = config.vars.hm_git_username;
|
||||
userEmail = config.vars.usermail;
|
||||
@@ -49,7 +49,7 @@ in
|
||||
/* The home.stateVersion option does not have a default and must be set */
|
||||
home.stateVersion = config.vars.stateVersion;
|
||||
/* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
|
||||
programs.git = {
|
||||
programs.git.settings = {
|
||||
enable = true;
|
||||
userName = config.vars.hm_git_username;
|
||||
userEmail = config.vars.usermail;
|
||||
@@ -63,8 +63,18 @@ in
|
||||
programs.zoxide.enableZshIntegration = true;
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
addKeysToAgent = "yes";
|
||||
enableDefaultConfig = false; # Disable old defaults
|
||||
matchBlocks = {
|
||||
# Global settings for all hosts
|
||||
"*" = {
|
||||
addKeysToAgent = "yes"; # Moved from top-level
|
||||
forwardAgent = false;
|
||||
compression = false;
|
||||
serverAliveInterval = 0;
|
||||
serverAliveCountMax = 3;
|
||||
hashKnownHosts = false;
|
||||
controlMaster = "no";
|
||||
};
|
||||
"nixconf" = {
|
||||
hostname = "github.com";
|
||||
user = "${config.vars.usermail}";
|
||||
|
||||
Reference in New Issue
Block a user