gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

nixfmt cleanup.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
configuration/hosts/default.nix
View file

@ -18,7 +18,7 @@ let
}; };
mabon = { mabon = {
ssh.host = "root@192.168.1.218"; ssh.host = "root@192.168.1.218";
groups = [ "laptop" "personal"]; groups = [ "laptop" "personal" ];
}; };
}; };
pkgs = import <nixpkgs> { }; pkgs = import <nixpkgs> { };

4
configuration/hosts/mabon/configuration.nix
View file

@ -14,14 +14,13 @@
../../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;
boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
networking.hostName = "mabon"; # Define your hostname. networking.hostName = "mabon"; # Define your hostname.
networking.useDHCP = false; networking.useDHCP = false;
networking.interfaces.enp0s25.useDHCP = true; networking.interfaces.enp0s25.useDHCP = true;
networking.interfaces.wls3.useDHCP = true; networking.interfaces.wls3.useDHCP = true;
@ -33,4 +32,3 @@
} }

26
configuration/hosts/mabon/hardware-configuration.nix
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;
} }

4
configuration/hosts/samhain/configuration.nix
View file

@ -11,7 +11,7 @@
../../profiles/network ../../profiles/network
../../profiles/yubikey ../../profiles/yubikey
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -35,7 +35,7 @@
rpc-whitelist = "127.0.0.1,192.168.1.*"; rpc-whitelist = "127.0.0.1,192.168.1.*";
}; };
}; };
services.samba = { services.samba = {
enable = true; enable = true;
securityType = "user"; securityType = "user";

11
configuration/hosts/samhain/hardware-configuration.nix
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"; }];

18
configuration/profiles/desktop/default.nix
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;

7
configuration/profiles/gaming/default.nix
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 ];
};
}