nixfmt cleanup.

This commit is contained in:
kat witch 2020-11-28 02:10:52 +00:00 committed by kat
parent 691aae750a
commit de0b2056fe
7 changed files with 42 additions and 30 deletions

View file

@ -14,7 +14,6 @@
../../profiles/yubikey ../../profiles/yubikey
]; ];
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2; boot.loader.grub.version = 2;
@ -33,4 +32,3 @@
} }

View file

@ -4,23 +4,29 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "ahci" "firewire_ohci" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [
"uhci_hcd"
"ehci_pci"
"ata_piix"
"ahci"
"firewire_ohci"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/05829271-4036-4d81-85b0-cd8c8197d40f"; device = "/dev/disk/by-uuid/05829271-4036-4d81-85b0-cd8c8197d40f";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/aacb9f81-bc7a-46f9-8cac-04942d078318"; } [{ device = "/dev/disk/by-uuid/aacb9f81-bc7a-46f9-8cac-04942d078318"; }];
];
networking.enableIntel3945ABGFirmware = true; networking.enableIntel3945ABGFirmware = true;
} }

View file

@ -32,12 +32,13 @@
# fsType = "exfat"; # fsType = "exfat";
# }; # };
fileSystems."/disks/BigEXT" = fileSystems."/disks/BigEXT" = {
{ device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291"; device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."mewmapper".device = "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db"; boot.initrd.luks.devices."mewmapper".device =
"/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db";
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }]; [{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }];

View file

@ -2,7 +2,9 @@
let let
nixpkgs-master = import nixpkgs-master = import
(fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") { config.allowUnfree = true; }; (fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") {
config.allowUnfree = true;
};
in { in {
nixpkgs.config = { mumble.speechdSupport = true; }; nixpkgs.config = { mumble.speechdSupport = true; };
@ -61,12 +63,14 @@ in {
fonts.fonts = [ pkgs.nerdfonts pkgs.corefonts ]; fonts.fonts = [ pkgs.nerdfonts pkgs.corefonts ];
networking.firewall = { networking.firewall = {
allowedTCPPortRanges = [ allowedTCPPortRanges = [{
{ from = 1714; to = 1764; } from = 1714;
]; to = 1764;
allowedUDPPortRanges = [ }];
{ from = 1714; to = 1764; } allowedUDPPortRanges = [{
]; from = 1714;
to = 1764;
}];
}; };
sound.enable = true; sound.enable = true;

View file

@ -3,5 +3,8 @@
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
hardware.pulseaudio.support32Bit = true; hardware.pulseaudio.support32Bit = true;
home-manager.users.kat = { home.packages = [ pkgs.lutris pkgs.steam pkgs.steam-run pkgs.multimc pkgs.obs-studio ]; }; home-manager.users.kat = {
home.packages =
[ pkgs.lutris pkgs.steam pkgs.steam-run pkgs.multimc pkgs.obs-studio ];
};
} }