From 846d32d0eb5aefb39e94ce41e381f26b18967980 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sat, 23 Sep 2023 16:11:37 -0500 Subject: [PATCH] cleanup --- flake.nix | 11 ++++------- hosts/vm1/hardware-configuration.nix | 1 + workstation/default.nix | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index cef0869..27d39de 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ ./workstation inputs.home-manager.nixosModules.home-manager ./home + ./wm/sway ]; }; in { @@ -24,7 +25,7 @@ { networking.hostName = "loki"; } - ./wm/sway + inputs.nixos-hardware.nixosModules.dell-xps-13-9310 ./hosts/loki/hardware-configuration.nix ]; }; @@ -34,7 +35,6 @@ networking.hostName = "smaug"; } inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260 - ./wm/sway ./hosts/smaug/hardware-configuration.nix ]; }; @@ -43,8 +43,6 @@ { networking.hostName = "dragon"; } - inputs.nixos-hardware.nixosModules. google-pixelbook - ./wm/sway ./hosts/dragon/hardware-configuration.nix ]; }; @@ -53,8 +51,7 @@ { networking.hostName = "eve"; } - inputs.nixos-hardware.nixosModules. google-pixelbook - ./wm/sway + inputs.nixos-hardware.nixosModules.google-pixelbook ./hosts/eve/hardware-configuration.nix ]; }; @@ -64,7 +61,7 @@ services.getty.autologinUser = "don"; networking.hostName = "vm2"; } - ./wm/sway + ./hosts/vm1/hardware-configuration.nix ]; }; }; diff --git a/hosts/vm1/hardware-configuration.nix b/hosts/vm1/hardware-configuration.nix index 7bec958..1d40b30 100644 --- a/hosts/vm1/hardware-configuration.nix +++ b/hosts/vm1/hardware-configuration.nix @@ -34,5 +34,6 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/workstation/default.nix b/workstation/default.nix index 0c1ed79..01fd723 100644 --- a/workstation/default.nix +++ b/workstation/default.nix @@ -154,9 +154,9 @@ in nix-bash-completions btop espeak-classic - fwup - fwupd - fwupd-efi + # fwup + # fwupd + # fwupd-efi git-crypt gitFull headsetcontrol