walkah/athens
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

🏗️ no more nfs (smb for parthenon)

Browse Source
This commit is contained in:
James Walker 2023-09-10 16:16:14 -04:00
parent 4066c2b6a9
commit ba4eaf1d2e
Signed by: walkah
GPG Key ID: 3C127179D6086E93
5 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@ -216,11 +216,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1694338541, "lastModified": 1694375657,
"narHash": "sha256-+ZtaNbOwlO1QgYOEvWdhi5wkWjW5Csrboz4xy0WucDg=", "narHash": "sha256-32X8dcty4vPXx+D4yJPQZBo5hJ1NQikALhevGv6elO4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9041d12a90e8bc0c90e03be2ebe26a6c6e6fd70", "rev": "f7848d3e5f15ed02e3f286029697e41ee31662d7",
"type": "github" "type": "github"
}, },
"original": { "original": {

42
hosts/plato/configuration.nix
View File

@ -1,4 +1,9 @@
{ pkgs, ... }: { { pkgs, config, ... }:
let
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
inherit (config.sops) secrets;
in
{
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
@ -16,26 +21,21 @@
../../modules/traefik ../../modules/traefik
]; ];
boot = { boot = {
binfmt.emulatedSystems = [ "aarch64-linux" ];
loader = { loader = {
binfmt.emulatedSystems = [ "aarch64-linux" ];
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot = { systemd-boot = {
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
enable = true; enable = true;
configurationLimit = 3; configurationLimit = 3;
}; };
tmp.cleanOnBoot = true;
}; };
tmp.cleanOnBoot = true;
}; };
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
# Set your time zone. # Set your time zone.
time.timeZone = "America/Toronto"; time.timeZone = "America/Toronto";
networking = { networking = {
hostName = "plato"; # Define your hostname. hostName = "plato"; # Define your hostname.
useDHCP = false; useDHCP = false;
interfaces = { interfaces = {
@ -58,21 +58,33 @@
]; ];
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
environment.systemPackages = with pkgs; [ pinentry weechat ]; environment.systemPackages = with pkgs; [ cifs-utils pinentry weechat ];
fileSystems = { fileSystems = {
"/mnt/downloads" = { "/mnt/downloads" = {
device = "192.168.6.100:/volume1/Downloads"; device = "//parthenon/Downloads";
fsType = "nfs"; fsType = "cifs";
options = [
"${automount_opts},credentials=${secrets.filesystems-parthenon.path}"
];
}; };
"/mnt/music" = { "/mnt/music" = {
device = "192.168.6.100:/volume1/Music"; device = "//parthenon/Music";
fsType = "nfs"; fsType = "cifs";
options = [
"${automount_opts},credentials=${secrets.filesystems-parthenon.path}"
];
}; };
"/mnt/video" = { "/mnt/video" = {
device = "192.168.6.100:/volume1/Video"; device = "//parthenon/Video";
fsType = "nfs"; fsType = "cifs";
options = [
"${automount_opts},credentials=${secrets.filesystems-parthenon.path}"
];
}; };
}; };
sops.secrets.filesystems-parthenon = { };
power.ups = { power.ups = {
enable = true; enable = true;

6
hosts/socrates/configuration.nix
View File

@ -39,10 +39,8 @@
security = { security = {
sudo.wheelNeedsPassword = false; sudo.wheelNeedsPassword = false;
security = { acme.acceptTerms = true;
acme.acceptTerms = true; acme.defaults.email = "walkah@walkah.net";
acme.defaults.email = "walkah@walkah.net";
};
}; };
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [

2
modules/coredns/walkah.lab.zone
View File

@ -1,6 +1,6 @@
$ORIGIN walkah.lab. $ORIGIN walkah.lab.
@ 3600 IN SOA plato.walkah.lab. walkah.walkah.net. ( @ 3600 IN SOA plato.walkah.lab. walkah.walkah.net. (
2021070700 ; serial 2023091000 ; serial
7200 ; refresh (2 hours) 7200 ; refresh (2 hours)
3600 ; retry (1 hour) 3600 ; retry (1 hour)
1209600 ; expire (2 weeks) 1209600 ; expire (2 weeks)

5
secrets/secrets.yaml
View File

@ -8,6 +8,7 @@ akkoma-signing-salt: ENC[AES256_GCM,data:KtOdcHM8XLY=,iv:RXvLlSyPzK6HYFxwyKEnDw1
akkoma-vapid-private-key: ENC[AES256_GCM,data:D8Dh53yOgKrcsttJ36xyV1locXBV2BB2EG/rOfIctCbOItdsodtpMCAwRg==,iv:xzheaTo0b3szYGvZmc3ucPi9lYXJStznAUyWNQ9TATE=,tag:tHV5DUFuvq2F9yRFmHrQXQ==,type:str] akkoma-vapid-private-key: ENC[AES256_GCM,data:D8Dh53yOgKrcsttJ36xyV1locXBV2BB2EG/rOfIctCbOItdsodtpMCAwRg==,iv:xzheaTo0b3szYGvZmc3ucPi9lYXJStznAUyWNQ9TATE=,tag:tHV5DUFuvq2F9yRFmHrQXQ==,type:str]
akkoma-vapid-public-key: ENC[AES256_GCM,data:HnUAyTq7dwa+A9L1X3YyxkiJ71BoZis5TdEPHJZkFRoiU5ZYu21xJW4R1H8xsCUDTaFTKLzdSNImVStIg1A+ex6UXLvsJwqM55P8ZnUm87V5KIsCimEm,iv:vVNoYubajEgqZIg6j9k6HjY/j4ib8A7MHGWPrJnkpCw=,tag:GBr2z4EGbn5vmFMWtY013w==,type:str] akkoma-vapid-public-key: ENC[AES256_GCM,data:HnUAyTq7dwa+A9L1X3YyxkiJ71BoZis5TdEPHJZkFRoiU5ZYu21xJW4R1H8xsCUDTaFTKLzdSNImVStIg1A+ex6UXLvsJwqM55P8ZnUm87V5KIsCimEm,iv:vVNoYubajEgqZIg6j9k6HjY/j4ib8A7MHGWPrJnkpCw=,tag:GBr2z4EGbn5vmFMWtY013w==,type:str]
akkoma-joken-signer: ENC[AES256_GCM,data:6GbXC7teDXxr0z7eBLm9EvJv59Bvd1FqRuBGntAH9YzM79MVUMsx4JnCZ+bPR9hLiIVgITeAc5djk2tiJewh6w==,iv:q7A8f7kocb1Go7acFkVSxdmhObPxpGlfbPgfrOXHEjg=,tag:lS4UNS1ivVZdmm8AMS/1MQ==,type:str] akkoma-joken-signer: ENC[AES256_GCM,data:6GbXC7teDXxr0z7eBLm9EvJv59Bvd1FqRuBGntAH9YzM79MVUMsx4JnCZ+bPR9hLiIVgITeAc5djk2tiJewh6w==,iv:q7A8f7kocb1Go7acFkVSxdmhObPxpGlfbPgfrOXHEjg=,tag:lS4UNS1ivVZdmm8AMS/1MQ==,type:str]
filesystems-parthenon: ENC[AES256_GCM,data:dYO+QjvWhR3oXrDfAEaUvTLx147NIDFcPUa7p3Jv558ynqmmEnVZ3+fVMUQVIw==,iv:ASmXqNA8/TZvSRo31CFAzt6StsZzZpVFvz15LN5+QmQ=,tag:Wx6kDCXqZ1iSmxpggBKVxA==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -77,8 +78,8 @@ sops:
dFZacUhiZDFxK0xZMDJJeCtQUmtuSGcKVz2TOsyw5F4mpFgbZnkWPjQPB7nSKkzd dFZacUhiZDFxK0xZMDJJeCtQUmtuSGcKVz2TOsyw5F4mpFgbZnkWPjQPB7nSKkzd
96r8RHs8CrlSpBUP6TG6Q+Tz77G1XIgcZrN9EVyYCQB7zOukIdZ5zw== 96r8RHs8CrlSpBUP6TG6Q+Tz77G1XIgcZrN9EVyYCQB7zOukIdZ5zw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-07-21T16:24:17Z" lastmodified: "2023-09-10T19:04:22Z"
mac: ENC[AES256_GCM,data:Lr5eATX46pS0oyRBL/lFqaNWUroRmZ35jPHQlMTsO8PMGy4gnpOr5ILRvTqKraOLkJDF/dEutA5bI5/nOzvkcaC6qFstQVbwpg30ComKki8NHs8RMsSvMNMt6UDIa9U2/wjkiEyBP7yeopZZDaGmLFQMf/jh7lj/JpopQaw0JKw=,iv:soT0OwadNhHJBMmjVoRrYu4AalE/p6VXMHDI8m6Vdz8=,tag:dhYxzB9f5vtXYQSC6SRwPA==,type:str] mac: ENC[AES256_GCM,data:iWDumyB3K7Dh7it441tcxz9g2/rO224/9GjNdk5ywSSAm2aL+MdcJUFxy0yicTUiNx28acmn9ae4wg+5J/AmKXy27nrt+h1tRuMLw7mTd6bwwMx1zF4ttL25SltItsjMYQ6Nzq4dzCCNJvRlCEGnyto02EITVeXNC8AqSm7swJk=,iv:QAgJysbZWLquWLUQj6ghdwiOMeszk0uPSdUlLgei2JA=,tag:h24013I2U4TZ0qw50H3ijQ==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.7.3 version: 3.7.3