From 1b4a3bbe298e491b9d9b1b50ff0a803c2e8876ae Mon Sep 17 00:00:00 2001
From: Victor <victor@xirion.net>
Date: Sat, 25 Mar 2023 13:07:28 +0100
Subject: [PATCH] fix dpi

---
 flake.lock                                           | 12 ++++++------
 flake.nix                                            |  2 +-
 nixos/hosts/thalassa/aoife/configuration.nix         |  1 -
 .../hosts/thalassa/aoife/hardware-configuration.nix  |  1 -
 nixos/hosts/thalassa/aoife/home/neovim.nix           |  6 +++---
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index c0fc9b4..ea7f82d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -726,16 +726,16 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1679598117,
-        "narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=",
-        "owner": "NixOS",
+        "lastModified": 1679726555,
+        "narHash": "sha256-h7Dd/uWu7i5Yv1E+DweyJJUzTvGWXqfSo8/hz1YEolY=",
+        "owner": "toastal",
         "repo": "nixos-hardware",
-        "rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82",
+        "rev": "0889479119961000c4a15801a0343cd1f11de556",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "master",
+        "owner": "toastal",
+        "ref": "z-series-no-hidpi",
         "repo": "nixos-hardware",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index f2743b6..3da5891 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,7 +38,7 @@
     nixos-generators.url = "github:nix-community/nixos-generators";
     nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
 
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixos-hardware.url = "github:toastal/nixos-hardware/z-series-no-hidpi";
   };
 
   outputs = { self, nixpkgs, nixpkgs_22-11, vault-secrets, colmena, home-manager
diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix
index e60badd..655438f 100644
--- a/nixos/hosts/thalassa/aoife/configuration.nix
+++ b/nixos/hosts/thalassa/aoife/configuration.nix
@@ -85,7 +85,6 @@
     };
   };
 
-  fonts.optimizeForVeryHighDPI = true;
   fonts.fonts = with pkgs; [
     material-design-icons
     noto-fonts
diff --git a/nixos/hosts/thalassa/aoife/hardware-configuration.nix b/nixos/hosts/thalassa/aoife/hardware-configuration.nix
index 537fa16..99593b9 100644
--- a/nixos/hosts/thalassa/aoife/hardware-configuration.nix
+++ b/nixos/hosts/thalassa/aoife/hardware-configuration.nix
@@ -38,5 +38,4 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   # high-resolution display
-  fonts.optimizeForVeryHighDPI = lib.mkDefault true;
 }
diff --git a/nixos/hosts/thalassa/aoife/home/neovim.nix b/nixos/hosts/thalassa/aoife/home/neovim.nix
index aad2540..16c4689 100644
--- a/nixos/hosts/thalassa/aoife/home/neovim.nix
+++ b/nixos/hosts/thalassa/aoife/home/neovim.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, lib, ... }: {
+{ inputs, pkgs, ... }: {
   imports = [ inputs.nixvim.homeManagerModules.nixvim ];
   programs.nixvim = {
     enable = true;
@@ -25,8 +25,8 @@
       nix.enable = true;
       treesitter = {
         enable = true;
-        nixGrammars = false;
-        ensureInstalled = [ ];
+        nixGrammars = true;
+        # ensureInstalled = [ ];
       };
       surround.enable = true;
       fugitive.enable = true;