From 88538f6e68725eeb6680da8d535a130244d0b4a8 Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Sat, 5 Mar 2022 21:52:47 +0100
Subject: [PATCH] Update Package names: - emacsPackagesNgGen ->
 emacsPackagesFor - font-awesome-ttf -> font-awesome - shared_mime_info ->
 shared-mime-info - telnet -> inetutils - xlibs -> xorg

---
 config/fonts.nix       | 2 +-
 options/emacs-init.nix | 2 +-
 pkgsets/base.nix       | 2 +-
 pkgsets/xpkgs.nix      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/fonts.nix b/config/fonts.nix
index 552276e..4d07fed 100644
--- a/config/fonts.nix
+++ b/config/fonts.nix
@@ -18,7 +18,7 @@ mkIf (elem "fonts" config.machine.conffiles) {
       crimson
       corefonts # Microsoft free fonts
       dejavu_fonts
-      font-awesome-ttf
+      font-awesome
       inconsolata # monospaced
       inter
       manrope
diff --git a/options/emacs-init.nix b/options/emacs-init.nix
index ef6dcae..c39699c 100644
--- a/options/emacs-init.nix
+++ b/options/emacs-init.nix
@@ -438,7 +438,7 @@ in
     in (emacsWithPackages config.machine.pkgsets.emacs.pkgs);
 
     environment.systemPackages = [
-      ((pkgs.emacsPackagesNgGen config.machine.pkgsets.emacs.pkgwrap).trivialBuild {
+      ((pkgs.emacsPackagesFor config.machine.pkgsets.emacs.pkgwrap).trivialBuild {
         pname = "hm-init";
         version = "0";
         src = pkgs.writeText "hm-init.el" initFile;
diff --git a/pkgsets/base.nix b/pkgsets/base.nix
index 086e76e..52e6cb9 100644
--- a/pkgsets/base.nix
+++ b/pkgsets/base.nix
@@ -44,7 +44,7 @@
     rsync
     sysvtools
     tealdeer
-    telnet
+    inetutils
     traceroute
     tree
     utillinux
diff --git a/pkgsets/xpkgs.nix b/pkgsets/xpkgs.nix
index 355a9d1..b2c858b 100644
--- a/pkgsets/xpkgs.nix
+++ b/pkgsets/xpkgs.nix
@@ -13,10 +13,10 @@ in {
     gnome3.gvfs
     gvfs
     oneko
-    pcmanfm lxmenu-data shared_mime_info
+    pcmanfm lxmenu-data shared-mime-info
     pavucontrol
     xclip
-    xlibs.xkill
+    xorg.xkill
     (if (cfg.hostName == "Marid") then xbacklight else xorg.xbacklight)
     xdiskusage
   ];