From 081a38165bdf7e98be1c22aebfa8fa7cd4b5fd7d Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 26 Oct 2023 20:00:20 +0200
Subject: [PATCH] Replaced alias with real names

---
 modules/theming/default.nix        | 2 ++
 modules/users/jopejoe1/default.nix | 6 +++---
 modules/users/jopejoe1/home.nix    | 6 +++---
 modules/users/root/home.nix        | 2 +-
 systems/kami/default.nix           | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/theming/default.nix b/modules/theming/default.nix
index aab520d..6da35a6 100644
--- a/modules/theming/default.nix
+++ b/modules/theming/default.nix
@@ -5,5 +5,7 @@
     image = "${pkgs.libsForQt5.breeze-qt5}/share/wallpapers/Next/contents/images_dark/5120x2880.png";
     polarity = "dark";
     base16Scheme = "${self.inputs.catppuccin-base16}/base16/frappe.yaml";
+    fonts.emoji.package = pkgs.noto-fonts-color-emoji;
+    fonts.emoji.name = "Noto Color Emoji";
   };
 }
diff --git a/modules/users/jopejoe1/default.nix b/modules/users/jopejoe1/default.nix
index 3dc10b4..318774a 100644
--- a/modules/users/jopejoe1/default.nix
+++ b/modules/users/jopejoe1/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [
@@ -12,11 +12,11 @@
     extraGroups = [ "wheel" "networkmanager" ];
     uid = 1000;
     packages = with pkgs; [
-      kate
+      libsForQt5.kate
       libsForQt5.ark
       libreoffice-qt
       texlive.combined.scheme-full
-    ] ++ lib.optionals (system == "x86_64-linux") [
+    ] ++ lib.optionals (config.system == "x86_64-linux") [
       discord
       google-chrome
       lutris
diff --git a/modules/users/jopejoe1/home.nix b/modules/users/jopejoe1/home.nix
index f4859b7..1953b77 100644
--- a/modules/users/jopejoe1/home.nix
+++ b/modules/users/jopejoe1/home.nix
@@ -95,7 +95,7 @@ in {
       home-manager.enable = true;
       git = {
         enable = true;
-        package = pkgs.gitAndTools.gitFull;
+        package = pkgs.git;
         userEmail = "johannes@joens.email";
         userName = "jopejoe1";
       };
@@ -320,8 +320,8 @@ in {
         gopls
         nixd
         nodePackages.bash-language-server
-        nodePackages.vscode-langservers-extracted
-        nodePackages.yaml-language-server
+        vscode-langservers-extracted
+        yaml-language-server
         python3Packages.python-lsp-server
         shellcheck
       ];
diff --git a/modules/users/root/home.nix b/modules/users/root/home.nix
index 52012d4..ec57584 100644
--- a/modules/users/root/home.nix
+++ b/modules/users/root/home.nix
@@ -59,7 +59,7 @@ in {
       home-manager.enable = true;
       git = {
         enable = true;
-        package = pkgs.gitAndTools.gitFull;
+        package = pkgs.git;
         userEmail = "johannes@joens.email";
         userName = "jopejoe1";
       };
diff --git a/systems/kami/default.nix b/systems/kami/default.nix
index ae3aaca..1313539 100644
--- a/systems/kami/default.nix
+++ b/systems/kami/default.nix
@@ -41,7 +41,7 @@
   fonts.packages = with pkgs; [
     google-fonts
     noto-fonts
-    noto-fonts-emoji
+    noto-fonts-color-emoji
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
     noto-fonts-emoji-blob-bin