Add isServer option and conditionally enable Git signing
Some checks failed
Ansible Lint Check / check-ansible (push) Successful in 4s
Nix Format Check / check-format (push) Successful in 1m14s
Python Lint Check / check-python (push) Failing after 6s

This commit is contained in:
2025-09-23 14:07:10 +00:00
parent cfb80bd819
commit 29a439d095
2 changed files with 26 additions and 14 deletions

View File

@@ -12,7 +12,7 @@
# Basic configuration # Basic configuration
userName = "Menno van Leeuwen"; userName = "Menno van Leeuwen";
userEmail = "menno@vleeuwen.me"; userEmail = "menno@vleeuwen.me";
signing = { signing = lib.mkIf (!config.isServer) {
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr"; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr";
}; };
@@ -86,14 +86,14 @@
}; };
# Security # Security
gpg = { gpg = lib.mkIf (!config.isServer) {
format = "ssh"; format = "ssh";
ssh = { ssh = {
program = "/opt/1Password/op-ssh-sign"; program = "/opt/1Password/op-ssh-sign";
}; };
}; };
commit = { commit = lib.mkIf (!config.isServer) {
gpgsign = true; gpgsign = true;
}; };

View File

@@ -1,16 +1,17 @@
{ {
config, config,
lib,
isServer ? false, isServer ? false,
opnix, opnix,
... ...
}: }:
{ {
programs.home-manager.enable = true; options = {
isServer = lib.mkOption {
nixpkgs.config = { type = lib.types.bool;
allowUnfree = true; default = false;
allowUnfreePredicate = pkg: true; };
}; };
imports = [ imports = [
@@ -31,12 +32,23 @@
] ]
); );
home = { config = {
username = "menno"; isServer = isServer;
homeDirectory = "/home/menno";
stateVersion = "25.05"; programs.home-manager.enable = true;
sessionVariables = {
PATH = "${config.home.homeDirectory}/go/bin:$PATH"; nixpkgs.config = {
allowUnfree = true;
allowUnfreePredicate = pkg: true;
};
home = {
username = "menno";
homeDirectory = "/home/menno";
stateVersion = "25.05";
sessionVariables = {
PATH = "${config.home.homeDirectory}/go/bin:$PATH";
};
}; };
}; };
} }