New config for new laptop

This commit is contained in:
Thomas Avé 2024-10-28 20:00:55 +01:00
parent f4920c269a
commit bd0ba374e7
6 changed files with 37 additions and 33 deletions

View File

@ -31,7 +31,8 @@
# wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel
wayland.windowManager.hyprland.settings = {
exec-once = [
"${pkgs.swaylock-fancy}/bin/swaylock-fancy"
# "${pkgs.swaylock-fancy}/bin/swaylock-fancy"
"${pkgs.alsa-utils}/bin/alsactl init"
];
monitor = [
"eDP-1,1920x1080@144,0x0,1"

View File

@ -4,7 +4,6 @@ let
in {
imports = [
(import ../Common/default.nix { inherit inputs pkgs config; })
(import ../Common/nvidia.nix { inherit inputs pkgs config; })
(import ../Common/desktop.nix { inherit inputs pkgs config; })
(import ../Common/nfs.nix { inherit pkgs serverIP; })
];
@ -21,8 +20,7 @@ in {
boot.initrd.supportedFilesystems = [ "zfs" ];
boot.supportedFilesystems = [ "zfs" ];
services.zfs.autoScrub.enable = true;
networking.hostname = "Aloria";
networking.hostid = "4e859062";
networking.hostId = "4e859062";
networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
networking.wireless.iwd.enable = true;
networking.wireless.iwd.settings = {

View File

@ -5,26 +5,28 @@
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/e34f26e4-2f68-4f9c-ab7d-836b4f4b9f74";
fsType = "ext4";
{ device = "rpool/root";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "rpool/home";
fsType = "zfs";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/90D9-F457";
{ device = "/dev/disk/by-uuid/0A4D-063E";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];

View File

@ -12,7 +12,6 @@
boot.loader.efi.canTouchEfiVariables = true;
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
systemd.services.systemd-user-sessions.enable = false;
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.tmp.cleanOnBoot = true;
powerManagement.enable = true;

View File

@ -8,6 +8,9 @@ in {
(import ../Common/nfs.nix { inherit pkgs serverIP; })
];
# Kernel
boot.kernelPackages = pkgs.linuxPackages_latest;
# AMD CPU
boot.blacklistedKernelModules = [ "k10temp" ];
boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ];

View File

@ -8,6 +8,7 @@ in {
(import ../Common/nfs.nix { inherit pkgs serverIP; })
];
boot.kernelPackages = pkgs.linuxPackages_latest;
services.ollama = {
enable = true;
};