From edc0d2fb9b7f938966990b6b57f9f94379e89818 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Mon, 27 Nov 2023 15:21:55 -0500
Subject: [PATCH] 23.05 -> 23.11

---
 hosts/hp/default.nix        |  4 ++--
 hosts/levi/default.nix      |  4 ++--
 modules/desktop/default.nix |  2 +-
 modules/vim/default.nix     |  7 ++++++-
 pkgs/lunarvim.nix           | 18 ------------------
 5 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/lunarvim.nix

diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix
index dd869f8..23bb8ce 100644
--- a/hosts/hp/default.nix
+++ b/hosts/hp/default.nix
@@ -25,8 +25,8 @@ in
   ];
 
   users.mutableUsers = false;
-  users.users.sean.passwordFile = "${persist}/shadow_sean";
-  users.users.root.passwordFile = "${persist}/shadow_sean";
+  users.users.sean.hashedPasswordFile = "${persist}/shadow_sean";
+  users.users.root.hashedPasswordFile = "${persist}/shadow_sean";
 
   boot = {
     loader.systemd-boot.enable = true;
diff --git a/hosts/levi/default.nix b/hosts/levi/default.nix
index 4d76862..29efc82 100644
--- a/hosts/levi/default.nix
+++ b/hosts/levi/default.nix
@@ -48,8 +48,8 @@ in
   };
 
   users.mutableUsers = false;
-  users.users.sean.passwordFile = "${persist}/shadow_sean";
-  users.users.root.passwordFile = "${persist}/shadow_sean";
+  users.users.sean.hashedPasswordFile = "${persist}/shadow_sean";
+  users.users.root.hashedPasswordFile = "${persist}/shadow_sean";
 
   services.zfs.trim.interval = "03:05";
 
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 8c3f69a..784d25d 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -37,7 +37,7 @@ with lib;
         MOUSE_DPI=600@1000
     '';
 
-    fonts.fonts = [
+    fonts.packages = [
       (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; })
     ];
 
diff --git a/modules/vim/default.nix b/modules/vim/default.nix
index 153ec41..e772baa 100644
--- a/modules/vim/default.nix
+++ b/modules/vim/default.nix
@@ -3,9 +3,14 @@
   environment.variables.EDITOR = "vim";
 
   environment.systemPackages = with pkgs; [
-    lunarvim
     nodePackages.prettier
 
+    (lunarvim.override (_: {
+      viAlias = true;
+      vimAlias = true;
+      globalConfig = builtins.readFile ./init.lua;
+    }))
+
     (writeShellScriptBin "black" ''
       exec ${pkgs.python3.pkgs.black}/bin/black "$@"
     '')
diff --git a/pkgs/lunarvim.nix b/pkgs/lunarvim.nix
deleted file mode 100644
index 35a689c..0000000
--- a/pkgs/lunarvim.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# https://github.com/NixOS/nixpkgs/pull/261103
-#
-
-{ pkgs }:
-(
-  pkgs.callPackage
-    (pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/NixOS/nixpkgs/99dadc5f534b7ba85582c8ee492599585069d20e/pkgs/by-name/lu/lunarvim/package.nix";
-      sha256 = "211d9cf8d5d352d220785ba90c7800d588c34e6e1c4a3dcbf02013d1fa49977c";
-    })
-    { }
-
-).override (_: {
-  viAlias = true;
-  vimAlias = true;
-  globalConfig = builtins.readFile ../modules/vim/init.lua;
-})