diff --git a/home-manager-modules/hyprland/default.nix b/home-manager-modules/hyprland/default.nix index 4f5a928..7784448 100644 --- a/home-manager-modules/hyprland/default.nix +++ b/home-manager-modules/hyprland/default.nix @@ -34,7 +34,6 @@ with lib; # Input input { kb_layout = fr - kb_variant = mac follow_mouse = 1 touchpad { natural_scroll = true diff --git a/machines/x2100/hardware.nix b/machines/x2100/hardware.nix index 4b6ceac..f997b6f 100644 --- a/machines/x2100/hardware.nix +++ b/machines/x2100/hardware.nix @@ -5,36 +5,37 @@ { imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { - device = "/dev/disk/by-uuid/d01369d1-b6ad-4fef-b73e-d1d56ec249ca"; - fsType = "ext4"; + { device = "/dev/nvme0n1p1"; + fsType = "bcachefs"; }; fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/1070-1613"; + { device = "/dev/disk/by-uuid/72EA-E988"; fsType = "vfat"; }; - swapDevices = [ ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/2c19cb7a-bf8d-4bd3-ad61-ee3c27d57998"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp1s0f0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }