diff --git a/flake.nix b/flake.nix index aa38d84..61ce006 100644 --- a/flake.nix +++ b/flake.nix @@ -123,22 +123,22 @@ in { - packages.${system} = pkgs; + packages.${system} = unstablePkgs; nixosConfigurations = rec { thor = thor-unstable; - # thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ]; - thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ]; - thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ]; + # thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix]; + thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; + thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ./nixos_modules/sesar.nix ]; odin = odin-intel-unstable; - odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ]; - odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ]; - # odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ]; - # odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ]; + odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; + odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; + # odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix]; + # odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix]; }; }; } diff --git a/home_manager/thor.nix b/home_manager/thor.nix index 5fcace7..73ad23e 100644 --- a/home_manager/thor.nix +++ b/home_manager/thor.nix @@ -93,6 +93,7 @@ pentablet-driver procps ripgrep + shotwell skypeforlinux # slack spotify diff --git a/nixos_modules/sesar.nix b/nixos_modules/sesar.nix new file mode 100644 index 0000000..39d19b5 --- /dev/null +++ b/nixos_modules/sesar.nix @@ -0,0 +1,11 @@ +{ + networking = { + hosts = { + "datanode1" = [ "172.20.28.210" ]; + "datanode2" = [ "172.20.28.210" ]; + "datanode3" = [ "172.20.28.210" ]; + "*.engine.sesar.int" = [ "172.20.28.210" ]; + "vcenter.sesar.int" = [ "159.149.147.137" ]; + }; + }; +} diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index ba6ffc5..8eec21a 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -34,10 +34,6 @@ # firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # firewall.enable = false; - hosts = { - "*.engine.sesar.int" = [ "172.20.28.210" ]; - "vcenter.sesar.int" = [ "159.149.147.137" ]; - }; }; # Set your time zone. diff --git a/thor/configuration.nix b/thor/configuration.nix index 33e4d4f..2a54081 100644 --- a/thor/configuration.nix +++ b/thor/configuration.nix @@ -67,10 +67,6 @@ }; networkmanager.enable = true; useDHCP = false; - hosts = { - "*.engine.sesar.int" = [ "172.20.28.210" ]; - "vcenter.sesar.int" = [ "172.20.28.20" ]; - }; }; time.timeZone = "Europe/Rome";