foosinn/nix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

adapt for new hardware

Browse source
This commit is contained in:
foosinn 2020-08-29 16:51:01 +02:00
parent 3a335817cb
commit f434cfa3e0
3 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configuration.nix
View file

@ -7,9 +7,6 @@
{ {
imports = imports =
[ [
<nixos-hardware/lenovo/thinkpad/x220>
<home-manager/nixos>
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
@ -29,8 +26,8 @@
networking.hostId = "e3a397c5"; networking.hostId = "e3a397c5";
networking.useDHCP = false; networking.useDHCP = false;
networking.interfaces.enp0s25.useDHCP = true; networking.interfaces.wlo1.useDHCP = true;
networking.interfaces.wlp3s0.useDHCP = true; networking.resolvconf.useLocalResolver = true;
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";

13
dotfiles/sway/status.toml
View file

@ -54,7 +54,7 @@ hide_missing = true
[[block]] [[block]]
block = "net" block = "net"
device = "wlp3s0" device = "wlo1"
ip = true ip = true
ssid = true ssid = true
speed_up = false speed_up = false
@ -63,11 +63,8 @@ hide_inactive = true
hide_missing = true hide_missing = true
[[block]] [[block]]
block = "temperature" block = "custom"
collapsed = false command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2) °C"'''
interval = 10
chip = "coretemp-isa-0000"
format = "{min}..{max}°"
[[block]] [[block]]
block = "disk_space" block = "disk_space"
@ -99,9 +96,9 @@ block = "backlight"
[[block]] [[block]]
block = "battery" block = "battery"
device = "BAT0" device = "BAT1"
interval = 10 interval = 10
format = "{percentage}%" format = "{percentage}% {time}"
[[block]] [[block]]
block = "time" block = "time"

27
hardware-configuration.nix
View file

@ -4,21 +4,17 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = imports = [
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
<nixos-hardware/common/cpu/amd>
<nixos-hardware/common/pc/ssd>
<nixos-hardware/common/pc/laptop>
]; ];
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.initrd.luks.devices = {
swap = {
device = "/dev/disk/by-uuid/fe87a31c-7d0b-4073-98fc-fa825de77181";
allowDiscards = true;
};
};
fileSystems."/" = fileSystems."/" =
{ device = "tank/root/nixos"; { device = "tank/root/nixos";
@ -31,14 +27,11 @@
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0C2D-2799"; { device = "/dev/disk/by-uuid/B048-FBC8";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [ ];
[ { device = "/dev/disk/by-uuid/2ac33f61-0db5-4f94-8148-93f2166b2f29"; }
];
nix.maxJobs = lib.mkDefault 4; nix.maxJobs = lib.mkDefault 8;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
} }