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

Remove unused garage

Browse source
This commit is contained in:
Filippo Berto 2023-10-28 02:04:53 +02:00
parent c98867d0b4
commit 9266a2dd90
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
12 changed files with 7 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -185,8 +185,6 @@
./instances/freya/hardware-configuration.nix ./instances/freya/hardware-configuration.nix
./instances/freya/configuration.nix ./instances/freya/configuration.nix
# ./modules/nixos/garage.nix
# ./modules/nixos/minio.nix
] ++ homeManagerModules ++ [ ] ++ homeManagerModules ++ [
{ home-manager.users.bertof = import ./instances/freya/hm.nix; } { home-manager.users.bertof = import ./instances/freya/hm.nix; }
]; ];
@ -225,8 +223,6 @@
./instances/loki/hardware-configuration.nix ./instances/loki/hardware-configuration.nix
./instances/loki/configuration.nix ./instances/loki/configuration.nix
# ./modules/nixos/garage.nix
# ./modules/nixos/minio.nix
./modules/nixos/users/tiziano.nix ./modules/nixos/users/tiziano.nix
] ++ homeManagerModules ++ [{ ] ++ homeManagerModules ++ [{
home-manager.users.bertof = import ./instances/loki/hm.nix; home-manager.users.bertof = import ./instances/loki/hm.nix;
@ -244,11 +240,11 @@
# Map nodes to Deploy-rs deployments # Map nodes to Deploy-rs deployments
deploy.nodes = { deploy.nodes = {
thor = { hostname = "thor.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor; }; }; thor = { hostname = "thor.zto"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor; }; };
odin = { hostname = "odin.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin; }; }; odin = { hostname = "odin.zto"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin; }; };
loki = { hostname = "loki.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki; }; }; loki = { hostname = "loki.zto"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki; }; };
baldur = { hostname = "baldur.bertof.net"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.baldur; }; }; baldur = { hostname = "baldur.bertof.net"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.baldur; }; };
freya = { hostname = "freya.local"; profiles.system = { user = "root"; path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.freya; }; }; freya = { hostname = "freya.zto"; profiles.system = { user = "root"; path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.freya; }; };
}; };
}; };

5
instances/baldur/configuration.nix
View file

@ -1,10 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }: {
age.secrets = {
garage_bertof_baldur_key = { file = ../../secrets/garage_bertof_baldur_key.age; owner = "bertof"; };
garage_tiziano_baldur_key = { file = ../../secrets/garage_tiziano_baldur_key.age; owner = "tiziano"; };
};
boot = { boot = {
growPartition = true; growPartition = true;
kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];

21
instances/baldur/hm.nix
View file

@ -8,27 +8,6 @@
packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; }; packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; };
}; };
# 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";
# StartLimitBurst = 5;
# StartLimitInterval = 200;
# 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_baldur_key.path},use_path_request_style,url=http://freya.local:3900";
# Restart = "always";
# RestartSec = 30;
# Type = "exec";
# };
# Install = {
# WantedBy = [ "default.target" ];
# };
# };
imports = [ imports = [
../../modules/hm/__basic.nix ../../modules/hm/__basic.nix

21
instances/baldur/hm_tiziano.nix
View file

@ -7,27 +7,6 @@
}; };
}; };
# systemd.user.services.garage-home-s3 = {
# Unit = {
# After = [ "network.target" "network-online.target" "local-fs.target" ];
# AssertPathIsDirectory = "/home/tiziano/s3";
# AssertPathIsReadWrite = "/home/tiziano/s3";
# Description = "Mount S3 bucket in tiziano's home";
# StartLimitBurst = 5;
# StartLimitInterval = 200;
# Wants = [ "network.target" "network-online.target" ];
# };
# Service = {
# ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d tiziano /home/tiziano/s3 -o passwd_file=${nixosConfig.age.secrets.garage_tiziano_baldur_key.path},use_path_request_style,url=http://freya.local:3900";
# Restart = "always";
# RestartSec = 30;
# Type = "exec";
# };
# Install = {
# WantedBy = [ "default.target" ];
# };
# };
imports = [ imports = [
../../modules/hm/__basic.nix ../../modules/hm/__basic.nix

6
instances/freya/configuration.nix
View file

@ -1,11 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }: {
age.secrets = {
garage_bertof_freya_key = { file = ../../secrets/garage_bertof_freya_key.age; owner = "bertof"; };
# garage_tiziano_loki_key = { file = ../../secrets/garage_tiziano_loki_key.age; owner = "tiziano"; };
};
console = { font = "Lat2-Terminus16"; keyMap = "it"; }; console = { font = "Lat2-Terminus16"; keyMap = "it"; };
environment = { environment = {

23
instances/freya/hm.nix
View file

@ -1,4 +1,4 @@
{ pkgs, nixosConfig, ... }: { { pkgs, ... }: {
home = { home = {
language.base = "it_IT.UTF-8"; language.base = "it_IT.UTF-8";
keyboard = { keyboard = {
@ -11,27 +11,6 @@
}; };
}; };
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";
StartLimitBurst = 5;
StartLimitInterval = 200;
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_freya_key.path},use_path_request_style,url=http://localhost:3900";
Restart = "always";
RestartSec = 30;
Type = "exec";
};
Install = {
WantedBy = [ "default.target" ];
};
};
imports = [ imports = [
../../modules/hm/__basic.nix ../../modules/hm/__basic.nix

5
instances/loki/configuration.nix
View file

@ -1,11 +1,6 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
with lib; { with lib; {
age.secrets = {
garage_bertof_loki_key = { file = ../../secrets/garage_bertof_loki_key.age; owner = "bertof"; };
garage_tiziano_loki_key = { file = ../../secrets/garage_tiziano_loki_key.age; owner = "tiziano"; };
};
boot = { boot = {
binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
# kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;

12
instances/loki/hardware-configuration.nix
View file

@ -40,18 +40,6 @@
options = [ "subvol=@condiviso" "compress=lzo" ]; options = [ "subvol=@condiviso" "compress=lzo" ];
}; };
fileSystems."/var/lib/garage/data" = {
device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc";
fsType = "btrfs";
options = [ "subvol=@garage" "compress=lzo" ];
};
fileSystems."/var/lib/garage/meta" = {
device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc";
fsType = "btrfs";
options = [ "subvol=@garage-metadata" "compress=lzo" ];
};
# fileSystems."/var/lib/minio/data" = { # fileSystems."/var/lib/minio/data" = {
# device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc"; # device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc";
# fsType = "btrfs"; # fsType = "btrfs";

23
instances/loki/hm.nix
View file

@ -1,4 +1,4 @@
{ pkgs, nixosConfig, ... }: { {
home = { home = {
language.base = "it_IT.UTF-8"; language.base = "it_IT.UTF-8";
keyboard = { keyboard = {
@ -7,27 +7,6 @@
}; };
}; };
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";
StartLimitBurst = 5;
StartLimitInterval = 200;
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_loki_key.path},use_path_request_style,url=http://localhost:3900";
Restart = "always";
RestartSec = 30;
Type = "exec";
};
Install = {
WantedBy = [ "default.target" ];
};
};
imports = [ imports = [
../../modules/hm/__basic.nix ../../modules/hm/__basic.nix

23
instances/loki/hm_tiziano.nix
View file

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

1
instances/odin/common_configuration.nix
View file

@ -2,7 +2,6 @@
with lib; { with lib; {
age.secrets = { age.secrets = {
garage_bertof_odin_key = { file = ../../secrets/garage_bertof_odin_key.age; owner = "bertof"; };
odin_wg_priv = { file = ../../secrets/odin_wg_priv.age; }; odin_wg_priv = { file = ../../secrets/odin_wg_priv.age; };
}; };

1
instances/thor/configuration.nix
View file

@ -2,7 +2,6 @@
with lib; { with lib; {
age.secrets = { age.secrets = {
garage_bertof_thor_key = { file = ../../secrets/garage_bertof_thor_key.age; owner = "bertof"; };
thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; }; thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; };
}; };