From f434cfa3e059079adebfbdb08633099634d4d7e7 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Sat, 29 Aug 2020 16:51:01 +0200
Subject: [PATCH] adapt for new hardware

---
 configuration.nix          |  7 ++-----
 dotfiles/sway/status.toml  | 13 +++++--------
 hardware-configuration.nix | 29 +++++++++++------------------
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 4d60bf5..eae589f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -7,9 +7,6 @@
 {
   imports =
     [
-      <nixos-hardware/lenovo/thinkpad/x220>
-      <home-manager/nixos>
-      
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
 
@@ -29,8 +26,8 @@
   networking.hostId = "e3a397c5";
 
   networking.useDHCP = false;
-  networking.interfaces.enp0s25.useDHCP = true;
-  networking.interfaces.wlp3s0.useDHCP = true;
+  networking.interfaces.wlo1.useDHCP = true;
+  networking.resolvconf.useLocalResolver = true;
 
   i18n.defaultLocale = "en_US.UTF-8";
   time.timeZone = "Europe/Berlin";
diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml
index e0a3a6a..40b527a 100644
--- a/dotfiles/sway/status.toml
+++ b/dotfiles/sway/status.toml
@@ -54,7 +54,7 @@ hide_missing = true
 
 [[block]]
 block = "net"
-device = "wlp3s0"
+device = "wlo1"
 ip = true
 ssid = true
 speed_up = false
@@ -63,11 +63,8 @@ hide_inactive = true
 hide_missing = true
 
 [[block]]
-block = "temperature"
-collapsed = false
-interval = 10
-chip = "coretemp-isa-0000"
-format = "{min}..{max}°"
+block = "custom"
+command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2) °C"'''
 
 [[block]]
 block = "disk_space"
@@ -99,9 +96,9 @@ block = "backlight"
 
 [[block]]
 block = "battery"
-device = "BAT0"
+device = "BAT1"
 interval = 10
-format = "{percentage}%"
+format = "{percentage}% {time}"
 
 [[block]]
 block = "time"
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index e9bda5f..1eeab35 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -4,21 +4,17 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
+  imports = [
+    <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.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-
-  boot.initrd.luks.devices = {
-    swap = {
-      device = "/dev/disk/by-uuid/fe87a31c-7d0b-4073-98fc-fa825de77181";
-      allowDiscards = true;
-    };
-  };
 
   fileSystems."/" =
     { device = "tank/root/nixos";
@@ -31,14 +27,11 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0C2D-2799";
+    { device = "/dev/disk/by-uuid/B048-FBC8";
       fsType = "vfat";
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/2ac33f61-0db5-4f94-8148-93f2166b2f29"; }
-    ];
+  swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  nix.maxJobs = lib.mkDefault 8;
 }