framework config and vintage-story
This commit is contained in:
parent
24b182d016
commit
adff02c614
2 changed files with 2 additions and 46 deletions
|
@ -1,16 +1,12 @@
|
||||||
{ inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: {
|
{ inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
|
inputs.nixos-hardware.nixosModules.framework.13th-gen-intel
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./disks.nix
|
./disks.nix
|
||||||
../../common/services/powertop.nix
|
../../common/services/powertop.nix
|
||||||
../../common/modules/secureboot.nix
|
../../common/modules/secureboot.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
modules = [
|
|
||||||
# nix/nixos/hosts/nixos-laptop
|
|
||||||
inputs.nixos-hardware.nixosModules.framework.13th-gen-intel
|
|
||||||
];
|
|
||||||
|
|
||||||
# steam , etc
|
# steam , etc
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
@ -19,37 +15,6 @@
|
||||||
boot.kernelModules = [ "kvm-intel" "acpi_call" ];
|
boot.kernelModules = [ "kvm-intel" "acpi_call" ];
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
|
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
|
||||||
|
|
||||||
# This expects the following:
|
|
||||||
# /boot is "VFAT" fstype with label "BOOT"
|
|
||||||
# / is "btrfs" fstype with label "ROOT"
|
|
||||||
# swap is "swap" fstype with label "SWAP"
|
|
||||||
|
|
||||||
fileSystems."/" = {
|
|
||||||
device = "/dev/disk/by-label/ROOT";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.initrd.luks.devices."DISK".device = "/dev/nvme0n1p1";
|
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
|
||||||
device = "/dev/disk/by-label/BOOT";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable Swap on LUKS
|
|
||||||
boot.initrd.luks.devices."SWAP" = {
|
|
||||||
device = "/dev/nvme0n1p2";
|
|
||||||
keyFile = "/crypto_keyfile.bin";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Set up the keyfile
|
|
||||||
boot.initrd.secrets."/crypto_keyfile.bin" = null;
|
|
||||||
# Hibernation resume device
|
|
||||||
boot.resumeDevice = "/dev/disk/by-label/SWAP";
|
|
||||||
# Confirm the swap devices
|
|
||||||
swapDevices = [ { device = "/dev/disk/by-label/SWAP"; } ];
|
|
||||||
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
|
@ -61,13 +26,6 @@
|
||||||
# Set the networking hostname:
|
# Set the networking hostname:
|
||||||
networking.hostName = "nixos-framework";
|
networking.hostName = "nixos-framework";
|
||||||
|
|
||||||
# Configure the fingerprint reader
|
|
||||||
services.fprintd = {
|
|
||||||
enable = true;
|
|
||||||
tod.enable = true;
|
|
||||||
tod.driver = pkgs.libfprint-2-tod1-vfs0090;
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
opengl = {
|
opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -77,9 +35,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Fingerprint software
|
|
||||||
fprintd
|
|
||||||
|
|
||||||
# Game related things
|
# Game related things
|
||||||
gamemode
|
gamemode
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
steam
|
steam
|
||||||
lutris
|
lutris
|
||||||
vlc
|
vlc
|
||||||
|
vintage-story
|
||||||
];
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
Loading…
Reference in a new issue