diff --git a/README.md b/README.md index 5c94ece..6544a6c 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ rewrite of my nixos flake with hopefully better structuring and modularity - (progress) migrate files to this repository in the modules folder - (half-progress) split the files into little chunks for 1 specific purposes per file - (quater-progress) reintegrate file paths and arguments to work together +- test the final config in my system # todo: migrate files below - [X] flake stuff (flake.nix & flake.lock) diff --git a/hosts/thinkpad/config.nix b/hosts/thinkpad/config.nix index 5da6b2c..ead13f8 100644 --- a/hosts/thinkpad/config.nix +++ b/hosts/thinkpad/config.nix @@ -1,7 +1,9 @@ { ... }: { imports = [ + ../../modules/scans/thinkpad.nix + ../../modules/hardware/thinkpad.nix ../../modules/system/default.nix - ../../modules/scans/thinkpad.nix + ../../modules/system/user.nix ]; } diff --git a/modules/hardware/thinkpad.nix b/modules/hardware/thinkpad.nix index 779a6f8..63bbcab 100644 --- a/modules/hardware/thinkpad.nix +++ b/modules/hardware/thinkpad.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { imports = [ ./misc/battery-power.nix ./misc/power-button.nix @@ -11,11 +10,11 @@ ./core/tpm.nix ]; - hardware.bluetooth.enable = true; - boot = { kernelPackages = pkgs.linuxPackages; kernel.sysctl."vm.laptop_mode" = 5; initrd.availableKernelModules = [ "thinkpad_acpi" ]; }; + hardware.bluetooth.enable = true; + services.hardware.bolt.enable = true; }