Compare commits
No commits in common. "01a0b563216666d10190c2687cab7a7e01035530" and "f72a872dffb54755f4de70fe586c70e778d4b4bf" have entirely different histories.
01a0b56321
...
f72a872dff
@ -59,7 +59,6 @@
|
||||
};
|
||||
xournalpp.enable = true;
|
||||
zsh.enable = true;
|
||||
office.enable = true;
|
||||
#plasma.enable = true;
|
||||
};
|
||||
services = {
|
||||
|
@ -1,10 +1,6 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = with inputs.nixos-hardware.nixosModules; [
|
||||
common-cpu-intel common-pc-ssd
|
||||
];
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/d06b511d-1970-421d-b006-231a7af91942";
|
||||
@ -18,9 +14,7 @@
|
||||
swapDevices = [ ]; # TODO
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci"
|
||||
# NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/common/pc/laptop/acpi_call.nix
|
||||
"acpi_call" ];
|
||||
availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
kernelModules = [ "dm-snapshot" ];
|
||||
luks.devices = {
|
||||
cryptroot = {
|
||||
@ -31,8 +25,6 @@
|
||||
};
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
extraModulePackages = [ ];
|
||||
# NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/lenovo/thinkpad/e495/default.nix#L12
|
||||
kernelParams = [ "acpi_backlight=native" ];
|
||||
};
|
||||
|
||||
ptw = {
|
||||
@ -48,7 +40,6 @@
|
||||
};
|
||||
zsh.enable = true;
|
||||
git.enable = true;
|
||||
office.enable = true;
|
||||
};
|
||||
services = {
|
||||
kanshi = let
|
||||
@ -106,6 +97,9 @@
|
||||
primaryInterface = "wlp5s0";
|
||||
};
|
||||
virtualisation.enable = true;
|
||||
hardware = {
|
||||
intel.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
|
13
modules/hardware/amd.nix
Normal file
13
modules/hardware/amd.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.ptw.hardware.amdcpu;
|
||||
in {
|
||||
options.ptw.hardware.amdcpu = {
|
||||
enable = lib.mkEnableOption "Enable support for AMD CPUs";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
hardware.cpu.amd.updateMicrocode = true;
|
||||
};
|
||||
}
|
19
modules/hardware/amdgpu.nix
Normal file
19
modules/hardware/amdgpu.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{
|
||||
config, lib, pkgs, ...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.ptw.hardware.amdgpu;
|
||||
in {
|
||||
options.ptw.hardware.amdgpu = {
|
||||
enable = lib.mkEnableOption "Enable support for AMDGPU GPUs";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
unstable.mesa
|
||||
unstable.firmwareLinuxNonfree
|
||||
];
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
};
|
||||
}
|
19
modules/hardware/intel.nix
Normal file
19
modules/hardware/intel.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.ptw.hardware.intel;
|
||||
in {
|
||||
options.ptw.hardware.intel = {
|
||||
enable = lib.mkEnableOption "Enable support for Intel CPUs";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
hardware = {
|
||||
cpu.intel.updateMicrocode = true;
|
||||
# NOTE: Assuming each Intel CPU has integrated graphics
|
||||
opengl.extraPackages = with pkgs; [ vaapiIntel intel-media-driver ];
|
||||
};
|
||||
# TODO: Remove?
|
||||
services.xserver.videoDrivers = [ "modesetting" "fbdev" ];
|
||||
};
|
||||
}
|
@ -2,8 +2,6 @@
|
||||
|
||||
let
|
||||
cfg = config.ptw.hardware.surface;
|
||||
fetchurl = pkgs.fetchurl;
|
||||
commit = "69d1e5826e6380c8ff0cd532e244482097562c3d";
|
||||
in {
|
||||
options.ptw.hardware.surface = {
|
||||
enable = lib.mkEnableOption "Enable support for the Microsoft Surface Pro 6";
|
||||
@ -27,7 +25,7 @@ in {
|
||||
};
|
||||
hardware.video.hidpi.enable = true;
|
||||
|
||||
systemd.services.iptsd = lib.mkForce {
|
||||
systemd.services.iptsd = {
|
||||
description = "Userspace daemon for Intel Precise Touch & Stylus";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "dev-ipts-15.device" ];
|
||||
|
@ -24,7 +24,6 @@ in {
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnome.eog
|
||||
gnome.nautilus
|
||||
gnome.evince
|
||||
unstable.gnome.gnome-shell
|
||||
gnome.gnome-terminal
|
||||
pinentry-gnome
|
||||
|
@ -1,15 +0,0 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.ptw.programs;
|
||||
in {
|
||||
options.ptw.programs.office = {
|
||||
enable = lib.mkEnableOption "Install Office software";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
libreoffice
|
||||
];
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user