This commit is contained in:
foosinn 2022-02-13 00:31:58 +01:00
parent 4146b5aece
commit 2e10a00830
32 changed files with 2944 additions and 2163 deletions

View file

@ -3,32 +3,30 @@
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
let
unstable = import <nixos-unstable> { config.allowUnfree = true; };
let unstable = import <nixos-unstable> { config.allowUnfree = true; };
in {
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "tank/root/nixos";
fsType = "zfs";
};
fileSystems."/" = {
device = "tank/root/nixos";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "tank/root/home";
fsType = "zfs";
};
fileSystems."/home" = {
device = "tank/root/home";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/587C-36F9";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/587C-36F9";
fsType = "vfat";
};
swapDevices = [ ];

View file

@ -3,43 +3,40 @@
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
let
tuxedo-keyboard = pkgs.callPackage (import ../packages/tuxedo-keyboard.nix) {};
tuxedo-cc = pkgs.callPackage (import ../packages/tuxedo-control-center/default.nix) {};
let
tuxedo-keyboard =
pkgs.callPackage (import ../packages/tuxedo-keyboard.nix) { };
tuxedo-cc =
pkgs.callPackage (import ../packages/tuxedo-control-center/default.nix) { };
in {
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [
tuxedo-keyboard
];
environment.systemPackages = with pkgs; [
tuxedo-cc
];
boot.extraModulePackages = [ tuxedo-keyboard ];
environment.systemPackages = with pkgs; [ tuxedo-cc ];
fileSystems."/" =
{ device = "private/root/nixos";
fsType = "zfs";
};
fileSystems."/" = {
device = "private/root/nixos";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "private/root/home";
fsType = "zfs";
};
fileSystems."/home" = {
device = "private/root/home";
fsType = "zfs";
};
fileSystems."/tmp" =
{ device = "private/root/tmp";
fsType = "zfs";
};
fileSystems."/tmp" = {
device = "private/root/tmp";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/7E36-C774";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/7E36-C774";
fsType = "vfat";
};
swapDevices = [ ];

View file

@ -3,32 +3,37 @@
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
let
unstable = import <nixos-unstable> { config.allowUnfree = true; };
let unstable = import <nixos-unstable> { config.allowUnfree = true; };
in {
imports =
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "cube/root/nixos";
fsType = "zfs";
};
fileSystems."/" = {
device = "cube/root/nixos";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "cube/home";
fsType = "zfs";
};
fileSystems."/home" = {
device = "cube/home";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/2AD7-4F18";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2AD7-4F18";
fsType = "vfat";
};
swapDevices = [ ];

View file

@ -3,8 +3,7 @@
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
let
unstable = import <nixos-unstable> { config.allowUnfree = true; };
let unstable = import <nixos-unstable> { config.allowUnfree = true; };
in {
imports = [
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
@ -19,14 +18,8 @@ in {
"w /sys/class/drm/card0/device/power_dpm_force_performance_level - - - - low"
];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.extraModulePackages = [ ];
boot.kernelModules = [ "kvm-amd" ];
@ -35,7 +28,6 @@ in {
boot.kernelPackages = unstable.linuxPackages_latest;
#boot.kernelPackages = unstable.linux_testing;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -45,20 +37,20 @@ in {
networking.interfaces.wlo1.useDHCP = true;
networking.resolvconf.useLocalResolver = true;
fileSystems."/" =
{ device = "tank/root/nixos";
fsType = "zfs";
};
fileSystems."/" = {
device = "tank/root/nixos";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "tank/home";
fsType = "zfs";
};
fileSystems."/home" = {
device = "tank/home";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/B048-FBC8";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/B048-FBC8";
fsType = "vfat";
};
swapDevices = [ ];

View file

@ -3,15 +3,13 @@
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
let
unstable = import <nixos-unstable> { config.allowUnfree = true; };
let unstable = import <nixos-unstable> { config.allowUnfree = true; };
in {
imports =
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.kernelParams = [ "intel_pstate=active" ];
@ -26,26 +24,26 @@ in {
enable = true;
extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD
vaapiIntel # LIBVA_DRIVER_NAME=i965
vaapiIntel # LIBVA_DRIVER_NAME=i965
vaapiVdpau
libvdpau-va-gl
];
};
fileSystems."/" =
{ device = "tank/work/nixos";
fsType = "zfs";
};
fileSystems."/" = {
device = "tank/work/nixos";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "tank/work/home";
fsType = "zfs";
};
fileSystems."/home" = {
device = "tank/work/home";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/DC7B-5E2D";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/DC7B-5E2D";
fsType = "vfat";
};
swapDevices = [ ];