configuration.nix

@@ -7,6 +7,9 @@
 {
   imports =
     [
+      <nixos-hardware/lenovo/thinkpad/x220>
+      <home-manager/nixos>
+      
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
 
@@ -20,14 +23,13 @@
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   networking.hostName = "raven";
   networking.hostId = "e3a397c5";
 
   networking.useDHCP = false;
-  networking.interfaces.wlo1.useDHCP = true;
-  networking.resolvconf.useLocalResolver = true;
+  networking.interfaces.enp0s25.useDHCP = true;
+  networking.interfaces.wlp3s0.useDHCP = true;
 
   i18n.defaultLocale = "en_US.UTF-8";
   time.timeZone = "Europe/Berlin";

dotfiles/sway/config

@@ -7,10 +7,8 @@ set $right l
 set $term alacritty
 set $menu bemenu-run
 
-input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de
-
-output * bg /home/stefan/Downloads/bg.jpg fill
-#output * bg /home/stefan/Sync/wall/nasa-yZygONrUBe8-unsplash.jpg fill
+output * bg /home/stefan/Sync/wall/nasa-yZygONrUBe8-unsplash.jpg fill
+output eDP-1 scale 1.3
 output DP-1 res 5120x1440
 
 # user keybinds

dotfiles/sway/status.toml

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

hardware-configuration.nix

@@ -4,17 +4,21 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
-    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    <nixos-hardware/common/cpu/amd>
-    <nixos-hardware/common/pc/ssd>
-    <nixos-hardware/common/pc/laptop>
+  imports =
+    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
   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";
@@ -27,11 +31,14 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B048-FBC8";
+    { device = "/dev/disk/by-uuid/0C2D-2799";
       fsType = "vfat";
     };
 
-  swapDevices = [ ];
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/2ac33f61-0db5-4f94-8148-93f2166b2f29"; }
+    ];
 
-  nix.maxJobs = lib.mkDefault 8;
+  nix.maxJobs = lib.mkDefault 4;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

roles/base.nix

@@ -6,7 +6,7 @@ in {
   environment.systemPackages = with pkgs; [
     bash
     bat
-    direnv
+    emacs-nox
     fd 
     fzf
     git
@@ -64,7 +64,6 @@ precmd_user_func = "title"
       . "$(fzf-share)/key-bindings.bash"
       . "$(fzf-share)/completion.bash"
       . <(z --init bash)
-      . <(direnv hook bash)
     '';
 
     shellAliases = {
@@ -88,5 +87,4 @@ precmd_user_func = "title"
   '';
 
   services.resolved.enable = true;
-  services.lorri.enable = true;
 }

roles/desktop.nix

@@ -4,9 +4,8 @@
 { config, lib, pkgs, ... }:
 
 let
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
+  unstable = import <nixos-unstable> {};
 in {
-
   programs.sway = {
     enable = true;
     extraPackages = with pkgs; [
@@ -18,7 +17,6 @@ in {
       slurp
       swayidle
       swaylock
-      xwayland
     ];
   };
 
@@ -43,33 +41,14 @@ in {
   ];
 
   environment.systemPackages = with pkgs; [
-    # firefox also needs:
-    #
-    # gfx.webrenderer.enabled = true
-    # widget.wayland-dmabuf-vaapi.enabled = true
-    #
-    # check in `about:support` that
-    #  * Composing -> Webrenderer
-    unstable.firefox-bin
-    libva
-    libva-utils
-    mesa
-
-    librsvg
-    unstable.mypaint
-    unstable.mypaint-brushes
-
-    hicolor-icon-theme
-    numix-icon-theme
-
     alacritty
+    firefox
     mumble
     neofetch
-    inkscape
     pulseaudio
     pulsemixer
-    unstable.keepassxc
     wl-clipboard
+    unstable.keepassxc
     (
       pkgs.writeTextFile {
         name = "startsway";
@@ -78,12 +57,11 @@ in {
         text = ''
           #! ${pkgs.bash}/bin/bash
           
-          export _JAVA_AWT_WM_NOREPARENTING=1
 	  export MOZ_ENABLE_WAYLAND=1
-          export QT_AUTO_SCREEN_SCALE_FACTOR=0
-          export QT_WAYLAND_FORCE_DPI=96
 	  export QT_QPA_PLATFORM=wayland-egl
+	  export QT_WAYLAND_FORCE_DPI=physical
 	  export SDL_VIDEODRIVER=wayland
+	  export _JAVA_AWT_WM_NOREPARENTING=1
           exec ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway
         '';
       }
@@ -99,8 +77,4 @@ in {
   };
 
   services.printing.enable = true;
-
-  hardware.opengl =  {
-    enable = true;
-  };
 }

roles/dev.nix

@@ -5,9 +5,10 @@
 
 let
   unstable = import <nixos-unstable> {};
+  mozilla = import <mozilla> {};
+
 in {
   environment.systemPackages = with pkgs; [
-    emacs
     go
     python37
     python37Packages.pyls-black