modules/nixos/core/default.nix

@@ -24,7 +24,7 @@
 
   config = {
     console = {
-      font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
+      font = "Lat2-Terminus16";
       keyMap = lib.mkDefault "us";
       useXkbConfig = true;
     };

modules/nixos/core/nix/default.nix

@@ -4,7 +4,8 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   options.snowflake.core.nix = {
     enable = lib.mkEnableOption "Enable core nix configuration";
   };
@@ -21,16 +22,13 @@
 
       # Add each flake input as a registry to make nix3 commands
       # consistent with nix flakes.
-      registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
+      registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
 
       # Add inputs to system's legacy channels.
       nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
 
       # Use the latest, unstable version of nix.
-      package = pkgs.nixVersions.nix_2_23;
+      package = pkgs.nixVersions.git;
-      # TODO: switch back to nix git. Current version has a security issue that allows
-      # remote code execution.
-      # package = pkgs.nixVersions.git;
 
       settings = {
         # Accept flake configuration without prompting.
@@ -67,8 +65,8 @@
         warn-dirty = false;
 
         # Add cache substituters to allow fetching cached builds.
-        trusted-substituters = ["https://nix-community.cachix.org"];
+        trusted-substituters = [ "https://nix-community.cachix.org" ];
-        trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
+        trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
       };
     };
   };

modules/nixos/desktop/kde/default.nix

@@ -14,6 +14,7 @@
 
       xserver = {
         enable = true;
+        videoDrivers = ["intel"];
       };
       displayManager.sddm = {
         enable = true;

overlays/netbird/default.nix

@@ -1,9 +1,9 @@
 _: _self: super: let
-  version = "0.29.4";
+  version = "0.28.8";
 in {
   netbird = super.netbird.override {
     buildGoModule = args:
-      super.buildGo123Module (
+      super.buildGoModule (
         args
         // {
           inherit version;
@@ -11,9 +11,9 @@ in {
             owner = "netbirdio";
             repo = "netbird";
             rev = "v${version}";
-            hash = "sha256-W71CE83r/RcPdBjzfT+FSh72UcKcTmIuagkrC1eaeNk=";
+            hash = "sha256-DfY8CVBHgE/kLALKNzSgmUxM0flWLesU0XAgVsHHLKc=";
           };
-          vendorHash = "sha256-CD34U+Z8bUKN0Z4nxIVC+mYDp71Q8q1bmUypRDGgb3U=";
+          vendorHash = "sha256-CqknRMijAkWRLXCcIjRBX2wB64+RivD/mXq28TqzNjg=";
           ldflags = [
             "-s"
             "-w"

systems/x86_64-linux/thonkpad/default.nix

@@ -6,13 +6,8 @@
 }: {
   imports = [./hardware.nix];
 
-  chaotic.mesa-git.enable = true;
-
   hardware.cpu.intel.updateMicrocode = true;
   hardware.enableRedistributableFirmware = true;
-  hardware.graphics.extraPackages = with pkgs; [
-    mesa_git.opencl
-  ];
 
   networking.hostName = "thonkpad";
   networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
@@ -42,6 +37,7 @@
     extraPackages = with pkgs; [
       easyeffects
       glibc
+      logseq
       obsidian
       piper
       # terraform

systems/x86_64-linux/thonkpad/hardware.nix

@@ -1,8 +1,4 @@
-{
+_: {
-  lib,
-  pkgs,
-  ...
-}: {
   boot = {
     initrd = {
       availableKernelModules = [
@@ -13,21 +9,20 @@
         "sd_mod"
       ];
       luks.devices."cryptroot".device = "/dev/disk/by-uuid/9de352ea-128f-4d56-a720-36d81dfd9b92";
-      luks.devices."cryptroot".bypassWorkqueues = true;
     };
     kernelModules = [
       "kvm-intel"
-      "iwlwifi"
+      "thinkpad_acpi"
+      # "iwlwifi"
       "xe"
     ];
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_testing;
     kernelParams = [
-      # NixOS produces many wakeups per second, which is bad for battery life.
+      "quiet"
-      # This disables the timer tick on the last 7 cores.
-      "nohz_full=14-21"
-      "i915.force_probe=!7d55"
       "xe.force_probe=7d55"
+      "i915.force_probe=!7d55"
       # "resume_offset=2465529"
+      "intel_pstate=active"
+      "thinkpad_acpi.fan_control=1"
     ];
     # resumeDevice = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
   };