diff --git a/flake.nix b/flake.nix index b376a48..7503830 100644 --- a/flake.nix +++ b/flake.nix @@ -138,21 +138,19 @@ nixosConfigurations = { thor = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - modules = - commonModules - ++ [ - { nixpkgs.config = config // { cudaSupport = true; }; } - ./thor/hardware-configuration.nix - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-pc-ssd - ./thor/configuration.nix + modules = commonModules ++ [ + { nixpkgs.config = config // { cudaSupport = true; }; } + ./thor/hardware-configuration.nix + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-pc-ssd + ./thor/configuration.nix - ./nixos_modules/pro_audio.nix - ./nixos_modules/sesar.nix - ./nixos_modules/pentablet.nix + ./nixos_modules/pro_audio.nix + ./nixos_modules/sesar.nix + ./nixos_modules/pentablet.nix - { home-manager.users.bertof = import ./thor/hm.nix; } - ]; + { home-manager.users.bertof = import ./thor/hm.nix; } + ]; }; }; }; @@ -177,23 +175,17 @@ rec { odin-nvidia = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - modules = - commonModules - ++ odinCommonModules - ++ [ - { nixpkgs.config = config // { cudaSupport = true; }; } - ./odin/configuration-nvidia.nix - ]; + modules = commonModules ++ odinCommonModules ++ [ + { nixpkgs.config = config // { cudaSupport = true; }; } + ./odin/configuration-nvidia.nix + ]; }; odin-intel = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - modules = - commonModules - ++ odinCommonModules - ++ [ - ./odin/configuration-intel.nix - ]; + modules = commonModules ++ odinCommonModules ++ [ + ./odin/configuration-intel.nix + ]; }; odin = odin-intel; @@ -204,14 +196,12 @@ # nixosConfigurations = rec { # freya = nixpkgs.lib.nixosSystem rec { # system = "aarch64-linux"; - # modules = - # commonModules - # ++ [ - # nixos-hardware.nixosModules.raspberry-pi-4 - # ./freya/hardware-configuration.nix - # ./freya/configuration.nix - # { home-manager.users.bertof = import ./freya/hm.nix; } - # ]; + # modules = commonModules ++ [ + # nixos-hardware.nixosModules.raspberry-pi-4 + # ./freya/hardware-configuration.nix + # ./freya/configuration.nix + # { home-manager.users.bertof = import ./freya/hm.nix; } + # ]; # }; # }; # }; @@ -220,15 +210,13 @@ # nixosConfigurations = rec { # baldur = nixpkgs.lib.nixosSystem rec { # system = "x86_64-linux"; - # modules = - # commonModules - # ++ [ - # # nixos-hardware.nixosModules.common-cpu-amd - # # nixos-hardware.nixosModules.common-pc-ssd - # ./baldur/hardware-configuration.nix - # ./baldur/configuration.nix - # { home-manager.users.bertof = import ./baldur/hm.nix; } - # ]; + # modules = commonModules ++ [ + # # nixos-hardware.nixosModules.common-cpu-amd + # # nixos-hardware.nixosModules.common-pc-ssd + # ./baldur/hardware-configuration.nix + # ./baldur/configuration.nix + # { home-manager.users.bertof = import ./baldur/hm.nix; } + # ]; # }; # }; # }; @@ -237,15 +225,13 @@ nixosConfigurations = rec { loki = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - modules = - commonModules - ++ [ - nixos-hardware.nixosModules.common-cpu-intel - nixos-hardware.nixosModules.common-pc-ssd - ./loki/hardware-configuration.nix - ./loki/configuration.nix - { home-manager.users.bertof = import ./loki/hm.nix; } - ]; + modules = commonModules ++ [ + nixos-hardware.nixosModules.common-cpu-intel + nixos-hardware.nixosModules.common-pc-ssd + ./loki/hardware-configuration.nix + ./loki/configuration.nix + { home-manager.users.bertof = import ./loki/hm.nix; } + ]; }; }; };