File tree Expand file tree Collapse file tree 7 files changed +82
-36
lines changed
Expand file tree Collapse file tree 7 files changed +82
-36
lines changed Original file line number Diff line number Diff line change 1616 nixos-generators . url = "github:nix-community/nixos-generators" ;
1717 nixos-generators . inputs . nixpkgs . follows = "nixpkgs" ;
1818
19+ ucodenix . url = "github:e-tho/ucodenix" ;
20+
1921 nixos-hardware . url = "github:nixos/nixos-hardware" ;
22+
2023 impermanence . url = "github:nix-community/impermanence" ;
2124
2225 home-manager . url = "github:nix-community/home-manager" ;
108111 disko . nixosModules . disko
109112 impermanence . nixosModules . impermanence
110113 stylix . nixosModules . stylix
114+ ucodenix . nixosModules . default
111115 # xremap.nixosModules.default
112116 ] ;
113117
Original file line number Diff line number Diff line change @@ -12,9 +12,12 @@ mkModule ./. false config { } (_cfg: {
1212 suites = {
1313 common = enabled ;
1414 } ;
15- hardware . power = {
16- governor = "powersave" ;
17- energy_performance_preference = "balance_power" ;
15+ hardware = {
16+ firmware . enable = true ;
17+ power = {
18+ governor = "powersave" ;
19+ energy_performance_preference = "balance_power" ;
20+ } ;
1821 } ;
1922 system = {
2023 boot = {
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1+ {
2+ config ,
3+ lib ,
4+ namespace ,
5+ ...
6+ } :
7+ let
8+ inherit ( lib . ${ namespace } ) mkModule ;
9+ inherit ( config . facter ) report reportPath ;
10+ virtualized = ( report . virtualisation or null ) != "none" ;
11+ in
12+ mkModule ./. false config { } ( _cfg : {
13+ services = {
14+ fwupd = {
15+ enable = ! virtualized ;
16+ daemonSettings . EspUpdateLevel = config . boot . loader . efi . efiSysMountPoint ;
17+ } ;
18+
19+ ucodenix = {
20+ enable = ! virtualized ;
21+ cpuModelId = reportPath ;
22+ } ;
23+ } ;
24+
25+ # NOTE: force disable when running via build-vm
26+ virtualisation . vmVariant = {
27+ services = {
28+ fwupd . enable = false ;
29+ ucodenix . enable = false ;
30+ } ;
31+ } ;
32+ } )
Original file line number Diff line number Diff line change @@ -13,7 +13,10 @@ mkModule ./. false config { } (_cfg: {
1313 ${ namespace } = {
1414 nix = mkDefault enabled ;
1515 theme . stylix = mkDefault enabled ;
16- hardware . power = mkDefault enabled ;
16+ hardware = {
17+ firmware = mkDefault enabled ;
18+ power = mkDefault enabled ;
19+ } ;
1720 } ;
1821
1922 environment = {
Original file line number Diff line number Diff line change @@ -88,14 +88,4 @@ mkModule ./. false config
8888 tmpfsSize = "50%" ;
8989 } ;
9090 } ;
91-
92- services . fwupd = {
93- # NOTE: need to be false for VMs
94- enable = true ;
95- daemonSettings . EspUpdateLevel = config . boot . loader . efi . efiSysMountPoint ;
96- } ;
97-
98- virtualisation . vmVariant = {
99- services . fwupd . enable = false ;
100- } ;
10191 } )
You can’t perform that action at this time.
0 commit comments