mirror of
https://github.com/tuxdotrs/tawm.git
synced 2025-07-05 20:56:33 +05:30
refactor: move email to global variable
This commit is contained in:
19
flake.nix
19
flake.nix
@ -41,6 +41,7 @@
|
||||
"x86_64-linux"
|
||||
];
|
||||
username = "tux";
|
||||
email = "t@tux.rs";
|
||||
in {
|
||||
packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
|
||||
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
|
||||
@ -52,42 +53,42 @@
|
||||
# 'nixos-rebuild switch --flake .#your-hostname'
|
||||
nixosConfigurations = {
|
||||
arcturus = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/arcturus];
|
||||
};
|
||||
|
||||
canopus = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/canopus];
|
||||
};
|
||||
|
||||
alpha = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/alpha];
|
||||
};
|
||||
|
||||
sirius = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/sirius];
|
||||
};
|
||||
|
||||
vega = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/vega];
|
||||
};
|
||||
|
||||
capella = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/capella];
|
||||
};
|
||||
|
||||
vps = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/vps];
|
||||
};
|
||||
|
||||
isoImage = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs username;};
|
||||
specialArgs = {inherit inputs outputs username email;};
|
||||
modules = [./hosts/isoImage];
|
||||
};
|
||||
};
|
||||
@ -97,7 +98,7 @@
|
||||
homeConfigurations = {
|
||||
"${username}@canopus" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
extraSpecialArgs = {inherit inputs outputs username;};
|
||||
extraSpecialArgs = {inherit inputs outputs username email;};
|
||||
modules = [
|
||||
./modules/home-manager
|
||||
];
|
||||
|
@ -2,6 +2,7 @@
|
||||
pkgs,
|
||||
username,
|
||||
config,
|
||||
email,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
@ -48,7 +49,7 @@
|
||||
|
||||
acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "0xtux@pm.me";
|
||||
defaults.email = "${email}";
|
||||
certs = {
|
||||
"tux.rs" = {
|
||||
domain = "*.tux.rs";
|
||||
|
@ -2,6 +2,7 @@
|
||||
pkgs,
|
||||
username,
|
||||
config,
|
||||
email,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
@ -84,7 +85,7 @@
|
||||
|
||||
acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "0xtux@pm.me";
|
||||
defaults.email = "${email}";
|
||||
certs = {
|
||||
"tux.rs" = {
|
||||
domain = "*.tux.rs";
|
||||
|
@ -5,6 +5,7 @@
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
email,
|
||||
...
|
||||
}: let
|
||||
# Sops needs acess to the keys before the persist dirs are even mounted; so
|
||||
@ -118,7 +119,7 @@ in {
|
||||
isNormalUser = true;
|
||||
extraGroups = ["networkmanager" "wheel" "storage"];
|
||||
openssh.authorizedKeys.keys = [
|
||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D 0xtux@pm.me''
|
||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D ${email}''
|
||||
];
|
||||
};
|
||||
};
|
||||
@ -126,7 +127,7 @@ in {
|
||||
home-manager = {
|
||||
backupFileExtension = "backup";
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = {inherit inputs outputs username;};
|
||||
extraSpecialArgs = {inherit inputs outputs username email;};
|
||||
users.${username} = {
|
||||
imports = [
|
||||
./home.nix
|
||||
|
@ -4,6 +4,7 @@
|
||||
outputs,
|
||||
pkgs,
|
||||
username,
|
||||
email,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
@ -110,7 +111,7 @@
|
||||
isNormalUser = true;
|
||||
extraGroups = ["networkmanager" "wheel" "storage"];
|
||||
openssh.authorizedKeys.keys = [
|
||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D 0xtux@pm.me''
|
||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D ${email}''
|
||||
];
|
||||
};
|
||||
};
|
||||
|
@ -1,9 +1,13 @@
|
||||
{pkgs, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
email,
|
||||
...
|
||||
}: {
|
||||
programs.rbw = {
|
||||
enable = true;
|
||||
settings = {
|
||||
base_url = "https://bw.tux.rs";
|
||||
email = "0xtux@pm.me";
|
||||
email = "${email}";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
{...}: {
|
||||
{email, ...}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "tuxdotrs";
|
||||
userEmail = "t@tux.rs";
|
||||
userEmail = "${email}";
|
||||
signing = {
|
||||
key = "~/.ssh/id_ed25519.pub";
|
||||
signByDefault = true;
|
||||
|
@ -2,11 +2,12 @@
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
email,
|
||||
...
|
||||
}: {
|
||||
security = {
|
||||
acme = {
|
||||
defaults.email = "0xtux@pm.me";
|
||||
defaults.email = "${email}";
|
||||
acceptTerms = true;
|
||||
};
|
||||
};
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
username,
|
||||
email,
|
||||
...
|
||||
}: {
|
||||
services = {
|
||||
@ -10,7 +11,7 @@
|
||||
server.http_port = 8888;
|
||||
security = {
|
||||
admin_user = "${username}";
|
||||
admin_email = "0xtux@pm.me";
|
||||
admin_email = "${email}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
email,
|
||||
...
|
||||
}: {
|
||||
services = {
|
||||
@ -16,8 +17,8 @@
|
||||
|
||||
adminUser = {
|
||||
activate = true;
|
||||
email = "${email}";
|
||||
name = "tux";
|
||||
email = "0xtux@pm.me";
|
||||
passwordFile = config.sops.secrets.plausible_password.path;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user