diff --git a/common/graphics/fonts.nix b/common/graphics/fonts.nix
index b8c9e68..2a07d57 100644
--- a/common/graphics/fonts.nix
+++ b/common/graphics/fonts.nix
@@ -14,9 +14,11 @@ in
         noto-fonts
         noto-fonts-cjk
         font-awesome
-        noto-fonts-emoji
+#        noto-fonts-emoji
+        noto-fonts-monochrome-emoji
         roboto
         liberation_ttf
+        nerdfonts
       ];
 
       fontDir.enable = true;
diff --git a/common/hardware/laptop.nix b/common/hardware/laptop.nix
index de2eda5..fd67361 100644
--- a/common/hardware/laptop.nix
+++ b/common/hardware/laptop.nix
@@ -65,7 +65,7 @@ in
         "sd_mod"
       ];
       loader.systemd-boot.enable = true;
-      extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
+#      extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
       kernelModules = [
         "ddcci_backlight"
         "i2c-dev"
diff --git a/common/tooling/default.nix b/common/tooling/default.nix
index 86a0907..e1e3d57 100644
--- a/common/tooling/default.nix
+++ b/common/tooling/default.nix
@@ -98,6 +98,11 @@ in
       askPassword = mkIf graphical (getExe pkgs.lxqt.lxqt-openssh-askpass);
     };
     programs.thefuck.enable = true;
+
+    programs.starship.enable = true;
+    programs.bash.shellInit = ''
+      eval "$(starship init bash)"
+    '';
   };
 
   options.grimmShared.tooling = {
diff --git a/common/tooling/python.nix b/common/tooling/python.nix
index a36114b..4d36058 100644
--- a/common/tooling/python.nix
+++ b/common/tooling/python.nix
@@ -14,6 +14,7 @@ let
       numpy
       scipy
       pygobject3
+      pandas
     ];
 
   inherit (lib)
@@ -22,6 +23,7 @@ let
     mkOption
     mapAttrsToList
     concatLines
+    getExe
     elem
     ;
 in
@@ -33,7 +35,9 @@ in
 
     programs.xonsh = {
       enable = true;
-      config = concatLines (
+      config = ''
+        execx($(${getExe pkgs.starship} init xonsh))
+      '' + concatLines (
         mapAttrsToList (
           name: value: "aliases[\"${name}\"] = '''${value}'''"
         ) config.environment.shellAliases
diff --git a/common/tooling/rust.nix b/common/tooling/rust.nix
index 3e0c601..80058fa 100644
--- a/common/tooling/rust.nix
+++ b/common/tooling/rust.nix
@@ -25,10 +25,15 @@ in
       ]
       ++ optionals graphical [ jetbrains.clion ];
 
+    grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [
+      rustaceanvim
+    ];
+
     grimmShared.tooling.lang_servers = [
       {
         lsp = {
           package = pkgs.rust-analyzer;
+          vimIntegration = false;
         };
         fmt = {
           package = pkgs.rustfmt;
diff --git a/common/tooling/security.nix b/common/tooling/security.nix
index 4cfa7da..3e8a41f 100644
--- a/common/tooling/security.nix
+++ b/common/tooling/security.nix
@@ -21,6 +21,13 @@ in
     security.polkit.enable = true;
     security.rtkit.enable = true;
 
+    security.pam.yubico = {
+      # enable = true;
+      debug = true;
+      mode = "challenge-response";
+      control = "sufficient";
+    };
+
     security.doas.enable = true;
     security.sudo.enable = false;
     security.doas.extraRules = [
diff --git a/fake_flake.nix b/fake_flake.nix
index fe0efc2..5e599ab 100644
--- a/fake_flake.nix
+++ b/fake_flake.nix
@@ -103,11 +103,11 @@ in
     in
     {
       hostPlatform = system;
-      pkgs = import (applyPatches {
+      pkgs = if (nixpkgs_patches != []) then (import (applyPatches {
         name = "nixpkgs-patched";
         inherit src;
         patches = map fetchpatch nixpkgs_patches;
-      }) { inherit config; };
+      }) { inherit config; }) else unpatched;
 
       overlays = [
         (import (
diff --git a/nix/sources.json b/nix/sources.json
index 5ec2af3..e5b5235 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://matrix.to/#/#agenix:nixos.org",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
-        "sha256": "0z26jj4pwliz6v5fdgnwc5fsihjdsy2gz49fcivr4p4178fw4gnr",
+        "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
+        "sha256": "1lpkwinlax40b7xgzspbkm9rsi4a1x48hxhixnni4irxxwnav0ah",
         "type": "tarball",
-        "url": "https://github.com/ryantm/agenix/archive/8d37c5bdeade12b6479c85acd133063ab53187a0.tar.gz",
+        "url": "https://github.com/ryantm/agenix/archive/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "authentik-nix": {
@@ -29,22 +29,34 @@
         "homepage": "https://nyx.chaotic.cx",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "5b1f4d9d757db78bc0fdf3e3bd0b161d46d6bc5d",
-        "sha256": "0qsya33g1my8xcvd1a6l1nsmcgnam0wknfrpmvfl39c1jmj7rgzv",
+        "rev": "f3685d816317958caf2bce128f80d02fee65b163",
+        "sha256": "1nklhkwfsyxilyzls6rw2cw9sdhlni5jnq4llj1m2w2ggw83d0wv",
         "type": "tarball",
-        "url": "https://github.com/chaotic-cx/nyx/archive/5b1f4d9d757db78bc0fdf3e3bd0b161d46d6bc5d.tar.gz",
+        "url": "https://github.com/chaotic-cx/nyx/archive/f3685d816317958caf2bce128f80d02fee65b163.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "glibc-eac": {
+        "branch": "main",
+        "description": "Arch glibc with the commit breaking eos-eac reverted - https://github.com/archlinux/svntogit-packages/tree/4da6c3e804e21c39908aa8a3cb597f19e6d764ef/trunk",
+        "homepage": "",
+        "owner": "Frogging-Family",
+        "repo": "glibc-eac",
+        "rev": "6a2ddcacfa9a16a2b33e3a70cd73e0f7937b8b94",
+        "sha256": "0p1b3a7ynbg63vl0lrqzf6w19grbxi4dmqch07p1fll7xhvl80km",
+        "type": "tarball",
+        "url": "https://github.com/Frogging-Family/glibc-eac/archive/6a2ddcacfa9a16a2b33e3a70cd73e0f7937b8b94.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "lix-module": {
         "branch": "main",
         "repo": "https://git.lix.systems/lix-project/nixos-module.git",
-        "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5",
+        "rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
         "type": "git"
     },
     "lix-pkg": {
         "branch": "main",
         "repo": "https://git.lix.systems/lix-project/lix.git",
-        "rev": "005ee33a9a145f714f4837b1c0b5c430ac3bc588",
+        "rev": "2b397c66297bab65c2b5719367a414f9a2efb7e7",
         "type": "git"
     },
     "nixos-mailserver": {
@@ -66,15 +78,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-unstable-small",
+        "branch": "nixos-unstable",
         "description": "Nix Packages collection",
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "22b25d36f84f5449e2799af1def209278ef75147",
-        "sha256": "14a1ym1bml6n4lnxhxgsk6dvdn5c8ivhl1xl5v2l6awcw9q2vf0g",
+        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
+        "sha256": "1rai87jwpfly0bpkhiaq56n3rvzhb15h72n61s42q1mpnw3vf4zh",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/22b25d36f84f5449e2799af1def209278ef75147.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5710852ba686cc1fd0d3b8e22b3117d43ba374c2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index f3695c4..053b029 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -30,5 +30,6 @@
         ./searchclip.nix
         ./confwhich.nix
         ./rfindup.nix
+        ./glibc-eac.nix
       ];
 }
diff --git a/overlays/glibc-eac.nix b/overlays/glibc-eac.nix
new file mode 100644
index 0000000..301eb0b
--- /dev/null
+++ b/overlays/glibc-eac.nix
@@ -0,0 +1,18 @@
+{ prev, ... }: let
+  nivSources = import ../nix/sources.nix;
+  glibc_patches = [
+    "rogue_company_reverts.patch"
+  ];
+in
+{
+  glibc-eac = prev.glibc.overrideAttrs(old: {
+    patches = (
+        let
+          oldPatches = old.patches or [ ];
+        in
+        if oldPatches == null then [ ] else oldPatches
+      )
+      ++ (map (p: "${nivSources.glibc-eac}/${p}") glibc_patches);
+    doCheck = false;
+  });
+}
diff --git a/users.nix b/users.nix
index b3938dd..a37f3da 100644
--- a/users.nix
+++ b/users.nix
@@ -43,7 +43,7 @@
         obs-studio
         element-desktop
         ghidra
-        # rmview
+        rmview
       ]
     );
   };