From efb678ad9292a2ede6147f49d2255bb1f100965a Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 23 Sep 2025 16:34:29 +0200 Subject: [PATCH] WIP: switch to open modules --- flake.nix | 50 ++++--------------------------- instances/heimdall/hm_tiziano.nix | 24 +++++++++++++++ 2 files changed, 29 insertions(+), 45 deletions(-) create mode 100644 instances/heimdall/hm_tiziano.nix diff --git a/flake.nix b/flake.nix index 3842bcc..6306f53 100644 --- a/flake.nix +++ b/flake.nix @@ -34,18 +34,8 @@ nix-config = { allowUnfree = true; extraOptions = "experimental-features = nix-command flakes"; - permittedInsecurePackages = [ - # "electron-27.3.11" # LogSeq - # "aspnetcore-runtime-6.0.36" # Sonarr - # "aspnetcore-runtime-wrapped-6.0.36" # Sonarr - # "dotnet-sdk-6.0.428" # Sonarr - # "dotnet-sdk-wrapped-6.0.428" # Sonarr - ]; + permittedInsecurePackages = [ ]; }; - - # cute-api = builtins.getFlake "gitlab:bertof/cute-api/0.2.1-3"; - - in inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = import inputs.systems; @@ -55,8 +45,8 @@ inherit system; config = nix-config; overlays = [ - # inputs.nix-rice.overlays.default inputs.self.overlays.packages + inputs.self.overlays.overrides ]; }; @@ -301,12 +291,9 @@ inputs.nixos-hardware.nixosModules.common-gpu-amd inputs.nixos-hardware.nixosModules.common-pc-ssd self.nixosModules.server - ./instances/heimdall/hardware-configuration.nix ./instances/heimdall/configuration.nix - self.nixosModules.tiziano - ./nixos/ip_forwarding.nix ./nixos/torrentbox.nix ./nixos/minio_server.nix @@ -314,6 +301,7 @@ ./nixos/immich.nix ./nixos/forgejo.nix + self.nixosModules.tiziano { home-manager.users.bertof = import ./instances/heimdall/hm.nix; age.secrets = { @@ -352,6 +340,8 @@ ./instances/baldur/hardware-configuration.nix ./instances/baldur/configuration.nix + ./nixos/ip_forwarding.nix + self.nixosModules.tiziano { home-manager.users.bertof = import ./instances/baldur/hm.nix; @@ -378,36 +368,6 @@ }; }; - # # Deploy-rs checks - # checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib; - - # Map nodes to Deploy-rs deployments - deploy.nodes = { - baldur = { - hostname = "baldur.bertof.net"; - profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.baldur; }; - }; - freya = { - hostname = "freya.tsn"; - profiles.system = { user = "root"; path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos inputs.self.nixosConfigurations.freya; }; - }; - heimdall = { - hostname = "heimdall.tsn"; - profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.heimdall; }; - }; - loki = { - hostname = "loki.tsn"; - profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.loki; }; - }; - odin = { - hostname = "odin.tsn"; - profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.odin; }; - }; - thor = { - hostname = "thor.tsn"; - profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.thor; }; - }; - }; }; }; } diff --git a/instances/heimdall/hm_tiziano.nix b/instances/heimdall/hm_tiziano.nix new file mode 100644 index 0000000..a95bda5 --- /dev/null +++ b/instances/heimdall/hm_tiziano.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: { + home = { + language.base = "it_IT.UTF-8"; + keyboard = { + layout = "it"; + options = [ + "terminate:ctrl_alt_bksp" + "compose:rctrl" + ]; + }; + packages = [ pkgs.retroarch-free pkgs.heroic ]; + }; + + imports = [ + ../../hm/combined/basics.nix + + ../../hm/syncthing_tiziano.nix + + ../../hm/shell_aliases.nix + ../../hm/rclone-mount-tiziano.nix + ]; + + home.stateVersion = "23.05"; +}