mikael/nixfiles-emily
1
0
Fork 0
forked from emily/nixfiles
Code Pull requests Activity

fixed typos

Browse source
This commit is contained in:
emily 2024-01-09 16:23:24 +01:00
parent a042d6bfe6
commit 19b0e9a5bb
Signed by untrusted user: emily
GPG key ID: F6F4C66207FCF995
6 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/common/default.nix
View file

@ -11,7 +11,7 @@ with lib; {
kitty.terminfo kitty.terminfo
bat bat
ripgrep ripgrep
utils-coreutils uutils-coreutils
git git
bmon bmon
bottom bottom

9
config/hosts/web02/configuration.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
extraConfig = '' extraConfig = ''
add_header Strict-Transport-Security $hsts_header; add_header Strict-Transport-Security $hsts_header;
@ -26,7 +26,7 @@ let
useACMEHost = vhostCfg.redirectTo; useACMEHost = vhostCfg.redirectTo;
globalRedirect = vhostCfg.redirectTo; globalRedirect = vhostCfg.redirectTo;
} else ( } else (
optionalAttrs !(builtins.hasAttr "useACMEHost" vhostCfg) { optionalAttrs (!(builtins.hasAttr "useACMEHost" vhostCfg)) {
enableACME = true; enableACME = true;
}); });
extraCfg = if builtins.hasAttr "extraConfig" vhostCfg extraCfg = if builtins.hasAttr "extraConfig" vhostCfg
@ -39,8 +39,8 @@ let
in { in {
networking = { networking = {
hostName = "web02"; hostName = "web02";
firewall.allowedTCPPort = [ 80 443 ]; firewall.allowedTCPPorts = [ 80 443 ];
firewall.allowedUDPPort = [ 443 ]; firewall.allowedUDPPorts = [ 443 ];
}; };
systemd.network.networks."98-eth-default" = { systemd.network.networks."98-eth-default" = {
address = [ address = [
@ -144,7 +144,6 @@ in {
}; };
}; };
}; };
};
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults = { defaults = {

3
config/lxc.nix
View file

@ -9,10 +9,7 @@ with lib; {
manageHostName = true; manageHostName = true;
}; };
time.timeZone = mkDefault "Europe/Berlin";
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
system.stateVersion = "23.05";
nix.optimise.automatic = true; nix.optimise.automatic = true;
nix.gc.automatic = true; nix.gc.automatic = true;
nix.gc.options = "--delete-older-than 2d"; nix.gc.options = "--delete-older-than 2d";

2
config/users/emily/default.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { { config, pkgs, ... }: {
users.users.emily = { users.users.emily = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.bash;
extraGroups = [ "wheel" ]; extraGroups = [ "wheel" ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/+iN407+HsfHbbC3tfdA8Yf4TZ08qXQMb4tb/SDAs+ emily@card" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/+iN407+HsfHbbC3tfdA8Yf4TZ08qXQMb4tb/SDAs+ emily@card"

18
flake.nix
View file

@ -16,15 +16,15 @@
./config/hosts/web02/configuration.nix ./config/hosts/web02/configuration.nix
]; ];
}; };
ryuuko = nixpkgs.lib.nixosSystem { # ryuuko = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; # system = "x86_64-linux";
specialArgs = attrs; # specialArgs = attrs;
modules = [ # modules = [
./config/common # ./config/common
./config/x1.nix # ./config/x1.nix
./config/hosts/ryuuko/configuration.nix # ./config/hosts/ryuuko/configuration.nix
]; # ];
}; # };
}; };
}; };
} }

4
modules/vhost/default.nix
View file

@ -28,7 +28,7 @@ with lib; let
useACMEHost = vhostCfg.redirectTo; useACMEHost = vhostCfg.redirectTo;
globalRedirect = vhostCfg.redirectTo; globalRedirect = vhostCfg.redirectTo;
} else ( } else (
optionalAttrs !(builtins.hasAttr "useACMEHost" vhostCfg) { optionalAttrs (!(builtins.hasAttr "useACMEHost" vhostCfg)) {
enableACME = true; enableACME = true;
}); });
extraCfg = if builtins.hasAttr "extraConfig" vhostCfg extraCfg = if builtins.hasAttr "extraConfig" vhostCfg
@ -46,7 +46,7 @@ in {
}; };
}; };
config = { config = {
services.nginx.virtualHosts = createHostFunc (cfg); services.nginx.virtualHosts = mkIf (cfg != null) (createHostFunc (cfg));
}; };
} }