steffen/nixconf
1
0
Fork 0
Code Pull Requests Actions Packages Releases Wiki Activity

new hm defaults, keepalived now using the first interface

Browse Source
This commit is contained in:
Steffen Illium
2026-02-14 09:14:42 +01:00
parent 0baf117914
commit c0a3213781
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keepalived.nix
+2 -2
View File
@@ -4,7 +4,7 @@
vrrpInstances = { vrrpInstances = {
V4 = { V4 = {
priority = config.vars.ka_priority; priority = config.vars.ka_priority;
interface = lib.head config.vars.interfaces; interface = (lib.head config.vars.interfaces).name;
virtualRouterId = 69; virtualRouterId = 69;
useVmac = true; useVmac = true;
virtualIps = [ virtualIps = [
@@ -15,7 +15,7 @@
}; };
V6 = { V6 = {
priority = config.vars.ka_priority; priority = config.vars.ka_priority;
interface = lib.head config.vars.interfaces; interface = (lib.head config.vars.interfaces).name;
virtualRouterId = 96; virtualRouterId = 96;
useVmac = true; useVmac = true;
virtualIps = [ virtualIps = [
program-homemanager.nix
+14 -4
View File
@@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let 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 in
{ {
imports = [ imports = [
@@ -10,7 +10,7 @@ in
home-manager.users.root = { home-manager.users.root = {
home.stateVersion = config.vars.stateVersion; # Set to your current home-manager version home.stateVersion = config.vars.stateVersion; # Set to your current home-manager version
programs.git = { programs.git.settings = {
enable = true; enable = true;
userName = config.vars.hm_git_username; userName = config.vars.hm_git_username;
userEmail = config.vars.usermail; userEmail = config.vars.usermail;
@@ -49,7 +49,7 @@ in
/* The home.stateVersion option does not have a default and must be set */ /* The home.stateVersion option does not have a default and must be set */
home.stateVersion = config.vars.stateVersion; home.stateVersion = config.vars.stateVersion;
/* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */ /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
programs.git = { programs.git.settings = {
enable = true; enable = true;
userName = config.vars.hm_git_username; userName = config.vars.hm_git_username;
userEmail = config.vars.usermail; userEmail = config.vars.usermail;
@@ -63,8 +63,18 @@ in
programs.zoxide.enableZshIntegration = true; programs.zoxide.enableZshIntegration = true;
programs.ssh = { programs.ssh = {
enable = true; enable = true;
addKeysToAgent = "yes"; enableDefaultConfig = false; # Disable old defaults
matchBlocks = { 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" = { "nixconf" = {
hostname = "github.com"; hostname = "github.com";
user = "${config.vars.usermail}"; user = "${config.vars.usermail}";