aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-05 17:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[UPGRADE/General] Upgrade to 22.05

Browse source 
Fix incompatible options
Enable flakes by default !
This commit is contained in:
Antoine Viallon 2022-06-09 01:06:34 +02:00
parent c84b845d12
commit b47462f73c
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop.nix
View file

@ -90,7 +90,7 @@ in {
jack.enable = true; jack.enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = mkDefault true; alsa.support32Bit = mkDefault true;
media-session.enable = true; wireplumber.enable = true;
}; };
security.rtkit.enable = true; # Real-time support for pipewire security.rtkit.enable = true; # Real-time support for pipewire
@ -207,7 +207,7 @@ in {
services.packagekit.enable = true; services.packagekit.enable = true;
networking.networkmanager = { networking.networkmanager = {
packages = [ plugins = [
pkgs.networkmanager-openvpn pkgs.networkmanager-openvpn
]; ];
}; };

3
filesystems.nix
View file

@ -83,9 +83,10 @@ in
) )
]); ]);
boot.initrd.services.udev.rules = concatStringsSep "\n" cfg.udevRules;
services.udev = { services.udev = {
extraRules = concatStringsSep "\n" cfg.udevRules; extraRules = concatStringsSep "\n" cfg.udevRules;
initrdRules = concatStringsSep "\n" cfg.udevRules;
}; };
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;

5
general.nix
View file

@ -29,6 +29,10 @@ let
}; };
in in
{ {
imports = [
(mkRemovedOptionModule [ "aviallon" "general" "flakes" "enable" ] "Flakes are now enabled by default")
];
options.aviallon.general = { options.aviallon.general = {
enable = mkOption { enable = mkOption {
default = true; default = true;
@ -56,7 +60,6 @@ in
type = types.str; type = types.str;
}; };
unsafeOptimizations = mkEnableOption "unsafe system tuning"; unsafeOptimizations = mkEnableOption "unsafe system tuning";
flakes.enable = mkEnableOption "experimental flake support";
debug = mkEnableOption "debug-specific configuration"; debug = mkEnableOption "debug-specific configuration";
}; };

2
network.nix
View file

@ -41,7 +41,7 @@ in
networking.networkmanager = { networking.networkmanager = {
wifi.backend = mkDefault "iwd"; wifi.backend = mkDefault "iwd";
dns = mkDefault cfg.dns; dns = mkDefault cfg.dns;
packages = with pkgs; concatLists [ plugins = with pkgs; concatLists [
(optional (cfg.dns == "dnsmasq") dnsmasq) (optional (cfg.dns == "dnsmasq") dnsmasq)
]; ];
}; };

4
nix.nix
View file

@ -29,9 +29,7 @@ in
nix.extraOptions = myLib.config.toNix { nix.extraOptions = myLib.config.toNix {
builders-use-substitutes = true; builders-use-substitutes = true;
experimental-features = concatLists [ experimental-features = [ "nix-command" "flakes"];
(optionals generalCfg.flakes.enable ["nix-command" "flakes"])
];
download-attempts = 5; download-attempts = 5;
stalled-download-timeout = 20; stalled-download-timeout = 20;
}; };