From 7b0b8220a2d061713fdb49a958606b481967e83c Mon Sep 17 00:00:00 2001 From: twoneis Date: Fri, 26 Apr 2024 14:47:33 +0200 Subject: [PATCH] changend names of systems --- devices/{surface => akarso}/default.nix | 2 +- devices/{surface => akarso}/hardware-config.nix | 0 devices/{surface => akarso}/options.nix | 0 devices/{zotac-mini => creosote}/default.nix | 2 +- .../hardware-config.nix | 0 devices/{desktop => ellaca}/default.nix | 2 +- devices/{desktop => ellaca}/hardware-config.nix | 0 devices/{desktop => ellaca}/nvidia.nix | 0 devices/{desktop => ellaca}/options.nix | 0 outputs.nix | 17 +++++++++++------ 10 files changed, 14 insertions(+), 9 deletions(-) rename devices/{surface => akarso}/default.nix (97%) rename devices/{surface => akarso}/hardware-config.nix (100%) rename devices/{surface => akarso}/options.nix (100%) rename devices/{zotac-mini => creosote}/default.nix (85%) rename devices/{zotac-mini => creosote}/hardware-config.nix (100%) rename devices/{desktop => ellaca}/default.nix (96%) rename devices/{desktop => ellaca}/hardware-config.nix (100%) rename devices/{desktop => ellaca}/nvidia.nix (100%) rename devices/{desktop => ellaca}/options.nix (100%) diff --git a/devices/surface/default.nix b/devices/akarso/default.nix similarity index 97% rename from devices/surface/default.nix rename to devices/akarso/default.nix index 8e889f9..c06e72a 100644 --- a/devices/surface/default.nix +++ b/devices/akarso/default.nix @@ -4,7 +4,7 @@ ./options.nix ]; - networking.hostName = "surface"; + networking.hostName = "akarso"; # Add user to surface control group for surface linux users.users.twoneis.extraGroups = [ "surface-control" ]; diff --git a/devices/surface/hardware-config.nix b/devices/akarso/hardware-config.nix similarity index 100% rename from devices/surface/hardware-config.nix rename to devices/akarso/hardware-config.nix diff --git a/devices/surface/options.nix b/devices/akarso/options.nix similarity index 100% rename from devices/surface/options.nix rename to devices/akarso/options.nix diff --git a/devices/zotac-mini/default.nix b/devices/creosote/default.nix similarity index 85% rename from devices/zotac-mini/default.nix rename to devices/creosote/default.nix index 8071d17..bb6a63f 100644 --- a/devices/zotac-mini/default.nix +++ b/devices/creosote/default.nix @@ -5,7 +5,7 @@ boot.kernelPackages = pkgs.linuxPackages_zen; - networking.hostName = "zotac-mini"; + networking.hostName = "creosote"; boot.loader = { systemd-boot = { diff --git a/devices/zotac-mini/hardware-config.nix b/devices/creosote/hardware-config.nix similarity index 100% rename from devices/zotac-mini/hardware-config.nix rename to devices/creosote/hardware-config.nix diff --git a/devices/desktop/default.nix b/devices/ellaca/default.nix similarity index 96% rename from devices/desktop/default.nix rename to devices/ellaca/default.nix index c5ca13d..e8a2e4b 100644 --- a/devices/desktop/default.nix +++ b/devices/ellaca/default.nix @@ -5,7 +5,7 @@ ./options.nix ]; - networking.hostName = "desktop"; + networking.hostName = "ellaca"; # Select kernel version boot.kernelPackages = pkgs.linuxPackages_zen; diff --git a/devices/desktop/hardware-config.nix b/devices/ellaca/hardware-config.nix similarity index 100% rename from devices/desktop/hardware-config.nix rename to devices/ellaca/hardware-config.nix diff --git a/devices/desktop/nvidia.nix b/devices/ellaca/nvidia.nix similarity index 100% rename from devices/desktop/nvidia.nix rename to devices/ellaca/nvidia.nix diff --git a/devices/desktop/options.nix b/devices/ellaca/options.nix similarity index 100% rename from devices/desktop/options.nix rename to devices/ellaca/options.nix diff --git a/outputs.nix b/outputs.nix index 0c65821..3aa3f1e 100644 --- a/outputs.nix +++ b/outputs.nix @@ -30,34 +30,39 @@ ]; in { - desktop = nixpkgs.lib.nixosSystem { + # AMD Ryzen 5600X + # nvidia GeForce GTX 1060 (6GB) + ellaca = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./devices/desktop + ./devices/ellaca ] ++ clientModules; }; - surface = nixpkgs.lib.nixosSystem { + # Surface Pro 7 (i5 128GB) + akarso = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./devices/surface + ./devices/akarso nixos-hardware.nixosModules.microsoft-surface-pro-intel ] ++ clientModules; }; - zotac-mini = nixpkgs.lib.nixosSystem { + # Zotac Mini + # (Name should be used for an ARM device instead once i get one) + creosote = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./devices/zotac-mini + ./devices/creosote ] ++ serverModules; }; };