hms/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix (nixos)!: remove baremetal option

Browse source
This commit is contained in:
Henri Saudubray 2026-01-22 10:17:38 +01:00
parent 773ebc511d
commit d5404e54aa
Signed by: hms
GPG key ID: 7065F57ED8856128
7 changed files with 35 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/elistraee/default.nix
View file

@ -1,8 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ../../nixos ]; imports = [ ../../nixos/wsl.nix ];
nixos-wsl.enable = true; # Enables wsl configuration (nixos/wsl.nix).
networking.hostName = "elistraee"; networking.hostName = "elistraee";
system.stateVersion = "25.05"; system.stateVersion = "25.05";

5
hosts/selune/default.nix
View file

@ -1,12 +1,11 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
../../nixos ../../nixos/baremetal.nix
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
baremetal.enable = true; # Enables baremetal features (nixos/baremetal.nix). graphical.enable = true;
graphical.enable = true; # Enables graphical features (nixos/graphical.nix).
boot.initrd.luks.devices."luks-374c6259-18c4-462b-9f30-9c9648de00ae".device = boot.initrd.luks.devices."luks-374c6259-18c4-462b-9f30-9c9648de00ae".device =
"/dev/disk/by-uuid/374c6259-18c4-462b-9f30-9c9648de00ae"; "/dev/disk/by-uuid/374c6259-18c4-462b-9f30-9c9648de00ae";

5
hosts/shar/default.nix
View file

@ -1,12 +1,11 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
../../nixos ../../nixos/baremetal.nix
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
baremetal.enable = true; # Enables baremetal features (nixos/baremetal.nix). graphical.enable = true;
graphical.enable = true; # Enables graphical features (nixos/graphical.nix).
boot.initrd.luks.devices."luks-324ce23c-e630-42a1-8558-184e999053a5".device = boot.initrd.luks.devices."luks-324ce23c-e630-42a1-8558-184e999053a5".device =
"/dev/disk/by-uuid/324ce23c-e630-42a1-8558-184e999053a5"; "/dev/disk/by-uuid/324ce23c-e630-42a1-8558-184e999053a5";

15
nixos/baremetal.nix
View file

@ -1,15 +1,17 @@
{ pkgs, lib, config, ... }: { pkgs, ... }:
{ {
options = { imports = [
baremetal.enable = lib.mkEnableOption "enables bare metal features"; ./common.nix
}; ./graphical.nix
];
config = lib.mkIf config.baremetal.enable {
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
networking.networkmanager.enable = true; networking.networkmanager = {
enable = true;
};
users.users.hms.extraGroups = [ "networkmanager" ]; users.users.hms.extraGroups = [ "networkmanager" ];
services.printing.enable = true; services.printing.enable = true;
@ -23,5 +25,4 @@
}; };
console.keyMap = "fr"; console.keyMap = "fr";
};
} }

6
nixos/default.nix → nixos/common.nix
View file

@ -1,11 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [
./baremetal.nix
./wsl.nix
./graphical.nix
];
nix.settings.experimental-features = "nix-command flakes"; nix.settings.experimental-features = "nix-command flakes";
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;

4
nixos/graphical.nix
View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { lib, config, ... }:
{ {
options = { options = {
graphical.enable = lib.mkEnableOption "enables graphical features"; graphical.enable = lib.mkEnableOption "Enable graphical features";
}; };
config = lib.mkIf config.graphical.enable { config = lib.mkIf config.graphical.enable {

8
nixos/wsl.nix
View file

@ -1,11 +1,7 @@
{ pkgs, lib, config, ... }: { ... }:
{ {
options = { imports = [ ./common.nix ];
nixos-wsl.enable = lib.mkEnableOption "enables WSL support";
};
config = lib.mkIf config.nixos-wsl.enable {
wsl.enable = true; wsl.enable = true;
wsl.defaultUser = "hms"; wsl.defaultUser = "hms";
};
} }