(configuration.nix) Hardcoded sysidentity for test

3 files changed, 5 insertions, 4 deletions

diff --git a/configuration.nix b/configuration.nix
index ace667f..458c62d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,11 +4,11 @@
 
 { config, pkgs, ... }:
 
-let inherit (import ./sysidentity.nix) sysidentity;
+let 
+  sysidentity = { name="juno"; type="laptop"; };
 in {
   imports =
     [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
       ./packages.nix
       ./services.nix
     ];
@@ -82,7 +82,7 @@ programs.zsh.enable = true;
   # Copy the NixOS configuration file and link it from the resulting system
   # (/run/current-system/configuration.nix). This is useful in case you
   # accidentally delete configuration.nix.
-  system.copySystemConfiguration = true;
+  # system.copySystemConfiguration = true;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/flake.nix b/flake.nix
index 419082e..2bf0889 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,7 @@
     nixosConfigurations.juno = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
+        ./machines/juno/hardware-configuration.nix
         ./configuration.nix
       ];
     };
diff --git a/packages.nix b/packages.nix
index 94e5210..1889071 100644
--- a/packages.nix
+++ b/packages.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  inherit (import ./sysidentity.nix) sysidentity;
+  sysidentity = { name="juno"; type="laptop"; };
   #unstable = import <nixos-unstable> { config.allowUnfree = true; };
   tex = (pkgs.texlive.combine {
     inherit (pkgs.texlive) scheme-medium