bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove old configurations

Browse source
This commit is contained in:
Filippo Berto 2023-07-29 17:34:24 +02:00
parent 3e1b7adfc8
commit 23b41ac173
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
6 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
instances/freya/configuration.nix
View file

@ -99,18 +99,5 @@
};
};
systemd.services.bertof-garage = {
description = "Mount S3 bucket in bertof's home";
wantedBy = [ "default.target" ];
wants = [ "network.target" "network-online.target" ];
after = [ "network.target" "network-online.target" "local-fs.target" ];
serviceConfig = {
AssertPathIsDirectory = "/home/bertof/s3";
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=/home/bertof/s3_secret,use_path_request_style,url=http://localhost:3900";
Type = "exec";
User = "bertof";
};
};
system.stateVersion = "22.11";
}

13
instances/loki/configuration.nix
View file

@ -527,18 +527,5 @@ with lib; {
Defaults pwfeedback
'';
systemd.services.bertof-garage = {
description = "Mount S3 bucket in bertof's home";
wantedBy = [ "default.target" ];
wants = [ "network.target" "network-online.target" ];
after = [ "network.target" "network-online.target" "local-fs.target" ];
serviceConfig = {
AssertPathIsDirectory = "/home/bertof/s3";
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=/home/bertof/s3_secret,use_path_request_style,url=http://localhost:3900";
Type = "exec";
User = "bertof";
};
};
system.stateVersion = "22.11";
}

17
instances/odin/common_configuration.nix
View file

@ -1,6 +1,10 @@
{ config, pkgs, lib, ... }:
with lib; {
age.secrets = {
garage_bertof_odin_key = { file = ../../secrets/garage_bertof_odin_key.age; owner = "bertof"; };
};
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -93,19 +97,6 @@ with lib; {
keyMap = "it";
};
systemd.services.bertof-garage = {
description = "Mount S3 bucket in bertof's home";
wantedBy = [ "default.target" ];
wants = [ "network.target" "network-online.target" ];
after = [ "network.target" "network-online.target" "local-fs.target" ];
serviceConfig = {
AssertPathIsDirectory = "/home/bertof/s3";
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=/home/bertof/s3_secret,use_path_request_style,url=http://localhost:3900";
Type = "exec";
User = "bertof";
};
};
# X11 windowing system.
services.xserver = {
enable = true;

19
instances/odin/hm.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{ pkgs, nixosConfig, ... }: {
home = {
language.base = "it_IT.UTF-8";
keyboard = {
@ -42,6 +42,23 @@
'';
};
systemd.user.services.garage-home-s3 = {
Unit = {
After = [ "network.target" "network-online.target" "local-fs.target" ];
AssertPathIsDirectory = "/home/bertof/s3";
AssertPathIsReadWrite = "/home/bertof/s3";
Description = "Mount S3 bucket in bertof's home";
Wants = [ "network.target" "network-online.target" ];
};
Service = {
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_odin_key.path},use_path_request_style,url=http://localhost:3900";
Type = "exec";
};
Install = {
WantedBy = [ "default.target" ];
};
};
imports = [
../../modules/hm/__basic.nix

BIN
secrets/garage_bertof_odin_key.age Normal file
View file

Binary file not shown.

1
secrets/secrets.nix
View file

@ -19,6 +19,7 @@ in
"garage_bertof_baldur_key.age".publicKeys = devUsers ++ [ baldur ];
"garage_bertof_freya_key.age".publicKeys = devUsers ++ [ freya ];
"garage_bertof_loki_key.age".publicKeys = devUsers ++ [ loki ];
"garage_bertof_odin_key.age".publicKeys = devUsers ++ [ odin ];
"garage_tiziano_baldur_key.age".publicKeys = devUsers ++ [ baldur ];
"garage_tiziano_loki_key.age".publicKeys = devUsers ++ [ loki ];
"baldur_wg_priv.age".publicKeys = devUsers ++ systems;