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

Migrated to default kernel to fix zfs-kernel brokenness. Starting the ZFS migration.

Browse source
This commit is contained in:
kat witch 2020-11-30 00:03:25 +00:00 • committed by kat
parent e17da6700b
commit 6acde28eb4
4 changed files with 49 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,10 +26,10 @@
services.transmission = { services.transmission = {
enable = true; enable = true;
home = "/disk/BigEXT/transmission"; home = "/disk/pool-raw/transmission";
settings = { settings = {
download-dir = "/disks/BigEXT/Share/"; download-dir = "/disks/pool-raw/Public/Media/";
incomplete-dir = "/disks/BigEXT/Share/.incomplete"; incomplete-dir = "/disks/pool-raw/Public/Media/.incomplete";
incomplete-dir-enabled = true; incomplete-dir-enabled = true;
rpc-bind-address = "0.0.0.0"; rpc-bind-address = "0.0.0.0";
rpc-whitelist = "127.0.0.1,192.168.1.*"; rpc-whitelist = "127.0.0.1,192.168.1.*";
@ -41,8 +41,8 @@
securityType = "user"; securityType = "user";
extraConfig = '' extraConfig = ''
workgroup = WORKGROUP workgroup = WORKGROUP
server string = smbnix server string = samhain
netbios name = smbnix netbios name = samhain
security = user security = user
#use sendfile = yes #use sendfile = yes
#max protocol = smb2 #max protocol = smb2
@ -53,7 +53,7 @@
''; '';
shares = { shares = {
public = { public = {
path = "/disks/BigEXT/Share"; path = "/disks/pool-raw/Public";
browseable = "yes"; browseable = "yes";
"read only" = "no"; "read only" = "no";
"guest ok" = "yes"; "guest ok" = "yes";

63
configuration/hosts/samhain/hardware-configuration.nix
View file

@ -4,43 +4,54 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
[ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "zroot/safe/root"; { device = "zroot/safe/root";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = { fileSystems."/home" =
device = "zroot/safe/home"; { device = "zroot/safe/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/50C3-BE99"; { device = "/dev/disk/by-uuid/50C3-BE99";
fsType = "vfat"; fsType = "vfat";
}; };
# fileSystems."/disks/BigExfat" = fileSystems."/disks/BigEXT" =
# { device = "/dev/disk/by-uuid/5F0E-F368"; { device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291";
# fsType = "exfat"; fsType = "ext4";
# }; };
fileSystems."/disks/BigEXT" = { boot.initrd.luks.devices."mewmapper".device = "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db";
device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291";
fsType = "ext4";
};
boot.initrd.luks.devices."mewmapper".device = fileSystems."/disks/pool-compress" =
"/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db"; { device = "zstore/compress";
fsType = "zfs";
};
fileSystems."/disks/pool-raw" =
{ device = "zstore/raw";
fsType = "zfs";
};
fileSystems."/disks/pool-protect" =
{ device = "zstore/protect";
fsType = "zfs";
};
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }]; [ { device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }
];
} }

6
configuration/profiles/common/default.nix
View file

@ -5,13 +5,17 @@ let
url = "https://github.com/nix-community/home-manager"; url = "https://github.com/nix-community/home-manager";
rev = "a98ec6ec158686387d66654ea96153ec06be33d7"; rev = "a98ec6ec158686387d66654ea96153ec06be33d7";
}; };
nixpkgs-master = import
(fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") {
config.allowUnfree = true;
};
in { in {
imports = [ ../../../modules "${home-manager}/nixos" ./pbb.nix ./users.nix ]; imports = [ ../../../modules "${home-manager}/nixos" ./pbb.nix ./users.nix ];
nixpkgs.overlays = nixpkgs.overlays =
[ (self: super: import ../../../pkgs { nixpkgs = super.path; }) ]; [ (self: super: import ../../../pkgs { nixpkgs = super.path; }) ];
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; #boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
#boot.kernelParams = [ "quiet" ]; #boot.kernelParams = [ "quiet" ];
nixpkgs.config = { allowUnfree = true; }; nixpkgs.config = { allowUnfree = true; };

1
configuration/profiles/desktop/default.nix
View file

@ -17,6 +17,7 @@ in {
nixpkgs-master.pkgs.syncplay nixpkgs-master.pkgs.syncplay
nixpkgs-master.pkgs.youtube-dl nixpkgs-master.pkgs.youtube-dl
nixpkgs-master.google-chrome nixpkgs-master.google-chrome
pkgs.v4l-utils
pkgs.transmission-gtk pkgs.transmission-gtk
pkgs.jdk11 pkgs.jdk11
pkgs.lm_sensors pkgs.lm_sensors