diff --git a/flake.nix b/flake.nix index a6720a8..7fd0c28 100644 --- a/flake.nix +++ b/flake.nix @@ -185,8 +185,6 @@ ./instances/freya/hardware-configuration.nix ./instances/freya/configuration.nix - # ./modules/nixos/garage.nix - # ./modules/nixos/minio.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./instances/freya/hm.nix; } ]; @@ -225,8 +223,6 @@ ./instances/loki/hardware-configuration.nix ./instances/loki/configuration.nix - # ./modules/nixos/garage.nix - # ./modules/nixos/minio.nix ./modules/nixos/users/tiziano.nix ] ++ homeManagerModules ++ [{ home-manager.users.bertof = import ./instances/loki/hm.nix; @@ -244,11 +240,11 @@ # Map nodes to Deploy-rs deployments deploy.nodes = { - thor = { hostname = "thor.local"; 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; }; }; - loki = { hostname = "loki.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki; }; }; + thor = { hostname = "thor.zto"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor; }; }; + odin = { hostname = "odin.zto"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin; }; }; + 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; }; }; - 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; }; }; }; }; diff --git a/instances/baldur/configuration.nix b/instances/baldur/configuration.nix index fb01523..9715338 100644 --- a/instances/baldur/configuration.nix +++ b/instances/baldur/configuration.nix @@ -1,10 +1,5 @@ { 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 = { growPartition = true; kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; diff --git a/instances/baldur/hm.nix b/instances/baldur/hm.nix index 75ce819..7b9e507 100644 --- a/instances/baldur/hm.nix +++ b/instances/baldur/hm.nix @@ -8,27 +8,6 @@ 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 = [ ../../modules/hm/__basic.nix diff --git a/instances/baldur/hm_tiziano.nix b/instances/baldur/hm_tiziano.nix index 9430ca5..a95c36a 100644 --- a/instances/baldur/hm_tiziano.nix +++ b/instances/baldur/hm_tiziano.nix @@ -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 = [ ../../modules/hm/__basic.nix diff --git a/instances/freya/configuration.nix b/instances/freya/configuration.nix index 85827e9..fe27d64 100644 --- a/instances/freya/configuration.nix +++ b/instances/freya/configuration.nix @@ -1,11 +1,5 @@ { 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"; }; environment = { diff --git a/instances/freya/hm.nix b/instances/freya/hm.nix index 1d8f109..bc78026 100644 --- a/instances/freya/hm.nix +++ b/instances/freya/hm.nix @@ -1,4 +1,4 @@ -{ pkgs, nixosConfig, ... }: { +{ pkgs, ... }: { home = { language.base = "it_IT.UTF-8"; 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 = [ ../../modules/hm/__basic.nix diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix index 316a79c..561a739 100644 --- a/instances/loki/configuration.nix +++ b/instances/loki/configuration.nix @@ -1,11 +1,6 @@ { pkgs, 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 = { binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; # kernelPackages = pkgs.linuxPackages_latest; diff --git a/instances/loki/hardware-configuration.nix b/instances/loki/hardware-configuration.nix index 48441aa..66182e1 100644 --- a/instances/loki/hardware-configuration.nix +++ b/instances/loki/hardware-configuration.nix @@ -40,18 +40,6 @@ 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" = { # device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc"; # fsType = "btrfs"; diff --git a/instances/loki/hm.nix b/instances/loki/hm.nix index f83ac41..5490099 100644 --- a/instances/loki/hm.nix +++ b/instances/loki/hm.nix @@ -1,4 +1,4 @@ -{ pkgs, nixosConfig, ... }: { +{ home = { language.base = "it_IT.UTF-8"; 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 = [ ../../modules/hm/__basic.nix diff --git a/instances/loki/hm_tiziano.nix b/instances/loki/hm_tiziano.nix index c47f7a7..6522c9e 100644 --- a/instances/loki/hm_tiziano.nix +++ b/instances/loki/hm_tiziano.nix @@ -1,4 +1,4 @@ -{ pkgs, nixosConfig, ... }: { +{ home = { language.base = "it_IT.UTF-8"; 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 = [ ../../modules/hm/__basic.nix diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix index 22aaa99..4e34d9a 100644 --- a/instances/odin/common_configuration.nix +++ b/instances/odin/common_configuration.nix @@ -2,7 +2,6 @@ with lib; { age.secrets = { - garage_bertof_odin_key = { file = ../../secrets/garage_bertof_odin_key.age; owner = "bertof"; }; odin_wg_priv = { file = ../../secrets/odin_wg_priv.age; }; }; diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 837afa9..76df938 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -2,7 +2,6 @@ with lib; { age.secrets = { - garage_bertof_thor_key = { file = ../../secrets/garage_bertof_thor_key.age; owner = "bertof"; }; thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; }; };