diff --git a/apps/default.nix b/apps/default.nix
index f2137ce86fb7d1c57739a1abaf46ca5835d03f9b..c2743fba5e72c77b94e150e7b7df5f93027254ea 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -26,6 +26,7 @@       # Tools
       age
       bitwarden-cli
       delve
+      discord
       duf
       du-dust
       fd

diff --git a/apps/nushell/jolheiser.nu b/apps/nushell/jolheiser.nu
index 6811627ec1d7d2e15292ffe11c67f6792813a4d3..7dc53eedc7e8058b20a352f356eac9e39da78b55 100644
--- a/apps/nushell/jolheiser.nu
+++ b/apps/nushell/jolheiser.nu
@@ -15,7 +15,10 @@ }
 
 ## Other ##
 ## Aliases ## 
+
+## Aliases ## 
 alias just = just --shell "nu" --shell-arg "-c"
+source /run/agenix/nushell.nu
 source ~/.config/nushell/zoxide.nu
 source ~/.config/nushell/ohmyposh.nu
 

diff --git a/apps/ssh.nix b/apps/ssh.nix
index 4aa3766cae9b196c7d98faff57fedbde900b27a4..ddfd17d20469831ac3f3358f168673c248f45cd8 100644
--- a/apps/ssh.nix
+++ b/apps/ssh.nix
@@ -3,6 +3,7 @@   programs.ssh = {
     enable = true;
     includes = [
       "/run/agenix/ssh-config"
+      "/run/agenix/ssh-config-work"
     ];
   };
 }

diff --git a/flake.nix b/flake.nix
index bebc642c47448a99a06625fa0b07fe452bb46513..b3674d13e60ddff14f59a86b6ea522e36aa674d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,14 @@           ssh-config = {
             file = ./secrets/shared/ssh-config.age;
             owner = "jolheiser";
           };
+          ssh-config-work = {
+            file = ./secrets/shared/ssh-config-work.age;
+            owner = "jolheiser";
+          };
+          "nushell.nu" = {
+            file = ./secrets/shared/nushell.nu.age;
+            owner = "jolheiser";
+          };
         };
       };
     });

diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index 0864d6458ec23f57798c8190919eef17e94c16ce..9dd04dfe10dcabdc4859c60fc2c32308e8eba1f9 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -50,6 +50,8 @@     jetbrains.pycharm-professional
     jetbrains.idea-ultimate
     jetbrains.datagrip
   imports = [./hardware.nix ../common];
+    kernelParams = ["quiet" "splash"];
+  imports = [./hardware.nix ../common];
     teams-for-linux
     xorg.xauth
 

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index b950f3e65125ad4709786c6def2c6df48958db9c..f4cb906844c3be96cea5484cc5c0b46706581578 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,7 +1,15 @@
 let
+  jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix";
+  matcha = "";
+  chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM root@chai";
+
+let
   jolheiser = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix"];
+in {
+let
   matcha = [];
+let
   chai = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM root@chai"];
+let
 in {
-  "shared/ssh-config.age".publicKeys = jolheiser ++ matcha ++ chai;
 }

diff --git a/secrets/shared/nushell.nu.age b/secrets/shared/nushell.nu.age
new file mode 100644
index 0000000000000000000000000000000000000000..2f879105e4229df1aa9a8512f9cad6535760a3e9
--- /dev/null
+++ b/secrets/shared/nushell.nu.age
@@ -0,0 +1,18 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyAwZW05
+RFFqMjJEWVJoWlIzNEtOTWxLWXpxN0s2ODZqM3l6U3BxNENzdVR3CkhrazV4NElq
+Sm9rL0NXaDhtS2IwbFBBWlltaUo1YlhvY0cwcWxxaWpXUzAKLT4gc3NoLWVkMjU1
+MTkgam8xTVBBIHVib09UYXNnZHpNRUdVMUErcEdLdUhGLzVyeUsySGcxOXQvbkp0
+aVg5eHcKUWdaYTJvbFl2N2l2WUw3eUlmQWFFNHFDeDNnMXpITzBac2NZWWo5VGl4
+bwotPiAuUCYtZ3JlYXNlIEU9YkY/PlpKIFkgdVhKQApvd2dqZGxkbENOQ25Cd0Nn
+SUdSRlRkeWVOYngzeEhuL1lLSWZySmVheWRIaFFESjVwU0FsMVdtRgotLS0gdG5h
+Y3FvNllQcTF6MWExZmVKb0tnVDlKT0hJeU5QakpCZ2cxR29NQ1BlbwpumY2uN/TZ
+QUvUq8N2HmKJTNlE+doAktzuxXiLljrxvSVSZM3ghCkyiu7bKVOfoQNTog5d1Dru
+HCxupsgQB0dbUEw4nS3pzeFzj2eBWW7zElvnVRC6xqgi7Y/lOV8P4R+7vQFbk/rM
+V+SBaAerFOrJrGFqug9OeLCGQP1mdUbIHTwWlc+sNdoP0jl7EdbYbzLqrqH8kyhB
+L6XLmhCS3aZkvmCcJh46Ym1zcTLj0p/4+lIos5jHPQ2W/E/UzRdP76okVI5Xx3jE
+xpQDDHXuniMyJIrbj1QQyrRol2arLMUqkZeyltv4VjpqBVoXCchi0ErMD4ddxmIO
+1bUSa7BUazV9OvgyQrvizLahPRxuVld27TtHQbBjLwc5O2mKmKfxi24tCzg3j81W
+aBgWXPKxTcg0O73V2BPZaT80LM0UdYvJlZdKjWAfOITyrqfyOd7Nm2MOqfKcbyFm
+T3DD4mwV
+-----END AGE ENCRYPTED FILE-----

diff --git a/secrets/shared/ssh-config-work.age b/secrets/shared/ssh-config-work.age
new file mode 100644
index 0000000000000000000000000000000000000000..3e50cf59f5a3d3592d4bc76595ee81a641560416
--- /dev/null
+++ b/secrets/shared/ssh-config-work.age
@@ -0,0 +1,53 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyBpZ2FE
+TUFOTVU3VzloUXVpWHAzVkNlT2VyL3RBdzNCQllFb0FCVXZNQjI0CndmNC9xMis4
+LzZJV1ZQN0Q2cEgzQ0UxV2hLZVd5VEhhY1poWHZqakx1N2sKLT4gc3NoLWVkMjU1
+MTkgam8xTVBBIEZ5RTlUNE1xUEtCYmJ2TFNjVVlIK3cvbi9IbGduT0JHUWNXSHRX
+YVkyQzAKM2ZFK3FZUml6YUgzY1ZlY1NBMExvYklRaUZQdE04VkJFOEk4dk9EZ3Vk
+MAotPiAmc2BALWdyZWFzZSBJJiksPU9VCllidjhNRG5yQ2ZvYXJJV0srTE5ObjV0
+SHJpQXNFdWZta1JUcFNpWHhLVnpoMWVyeQotLS0gY1M2bmpQeUdtL3VzeUNtVlps
+V0dOMFRFUDBYRXIvejRxRE9mZXNNbEtSYwqwhvunpzfEosrjz1FfzrJzjcQEUIGi
+zSBlZkRxR7+jXPf9m7wp9sZ4qWv4Uu2a8x+1RrdUd38+MvYfTyYevEkDn46WUmDw
+Ve4BnPfhoH0eJL4B8OjGIGAliYx1COx6Sq/N5EyvQ2tvgQJMFuIICu81pfuZPzoY
++zjxustQ31PQZH4zg3NUGnwAl14POJIid2prg+oF7j/tGEFrVE2Gx2eCoZBUM35R
+GKsUj1G1i9Pi3d87XGEG1CHtJ4fGDYThPu9ka5OeXWR5ZbiE1ydenDEXLLeoIWWg
+rwg2liNfri06CFo3JkSUWezZnsasPCfuWzoSgzJu5R1Tlrqbpn7f/tHPORIegp3r
+1t1P8xMI9JHsRebrDV53P47ZYF80kXRcFzeT1VR7GaVPx0gc+p8GdCJqz4JgbmKc
+n9yNoWV57wyGhi9Et6NKq3tn0H25+4Atqp6k+ytlnTfoLe9K5NvRML57fnLNeIlK
+gx5Y3Qxk7329e5dPnBelEG8DgLy9a75kqtiDYO9+lppv8QQ4TffbBVkJMBzDhDxj
+Gfm53VP7Y+57wT+6hlKdFA3CoBh/k95tseb5RarSvu5ZHbSYmhlP+Y9uxcT88lxg
+iZHytCfdLnVEQywd6Bf3ojeSEM9ycJGRpql8sEGRngYyzE6klhVjOv4vWkIMqfST
+XVOpXcUDrU94z6z9VCF0s69/amBEKop0eR1sbcLz8t1EmFFm2bxfen5twfVfq1WI
+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
+-----END AGE ENCRYPTED FILE-----

diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age
index b2a8fa6d5227090b508eb30663b2c936ffdaff92..d323590296bc925e47d448fbe852dc635a709aee 100644
--- a/secrets/shared/ssh-config.age
+++ b/secrets/shared/ssh-config.age
@@ -1,39 +1,42 @@
 -----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyBmcmxX
+WFQweTROWEF0YUNKcloxMjJPeVpIOTJkWXQ2SGV4UEZ2SDBDS2lRCkRhYkN2TmRs
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyAxYys2
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 MTkgam8xTVBBIFRaUDd5alpxcDVwcVdTb1hOS3hxM2JSb2ppM3dVRGpPK0FUcGx0
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 ZU9LbkUKS2ZSaXpueHRBN2JVZWdJNnZ3VlpsWEhEVWFFZ0ZFTi80Q1h6YVB5Rkp6
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 OAotPiBBcjBcZWgmIS1ncmVhc2Ugd0k9YXRFIFxEVDNmQ1J5IGw9KkQ2IFZvK2Be
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 bHsyCms5d1R1Tm0rT1pRdVBXZmhCaktKQXJFQTl3Q01US296bm53Tm45Z0UvS28x
+eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
 OGNZVHJQMm5XRy84Wm9HRHViWlEKRXNtNFc0Ri9EMHpzakFrTzUvRWIwcEVlM09E
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 -----BEGIN AGE ENCRYPTED FILE-----
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyAxYys2
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 MTkgam8xTVBBIFRaUDd5alpxcDVwcVdTb1hOS3hxM2JSb2ppM3dVRGpPK0FUcGx0
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 ZU9LbkUKS2ZSaXpueHRBN2JVZWdJNnZ3VlpsWEhEVWFFZ0ZFTi80Q1h6YVB5Rkp6
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 OAotPiBBcjBcZWgmIS1ncmVhc2Ugd0k9YXRFIFxEVDNmQ1J5IGw9KkQ2IFZvK2Be
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 bHsyCms5d1R1Tm0rT1pRdVBXZmhCaktKQXJFQTl3Q01US296bm53Tm45Z0UvS28x
------BEGIN AGE ENCRYPTED FILE-----
+ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1
 OGNZVHJQMm5XRy84Wm9HRHViWlEKRXNtNFc0Ri9EMHpzakFrTzUvRWIwcEVlM09E
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyAxYys2
+MTkgam8xTVBBIFRaUDd5alpxcDVwcVdTb1hOS3hxM2JSb2ppM3dVRGpPK0FUcGx0
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyAxYys2
+MTkgam8xTVBBIFRaUDd5alpxcDVwcVdTb1hOS3hxM2JSb2ppM3dVRGpPK0FUcGx0
 -----BEGIN AGE ENCRYPTED FILE-----
-74+9mp5SntGQMuOL5nndscwD6G524fh5mcHFVaAdMvfTnFX6/7+iAI4/URVYrxyj
-gEV9YjQrmj7Ync6jv7nKHmgQMesmRLf7lxXswb7AZ281wk5hmT+uv626sLqU9q+9
-z270Jy/7QV3jQk+dS3Y5RgflAzNI8eXmMA0SEojzydWbGT5oFbrY9/DofILQs8Qw
-cPQcXtUSW0hRQjBCQPuFvwde7pY3gjfpwVeof/9hcc6usVWoT4PoPAYKr+0tRuPo
-syI/Aamn1SO04n6RW51y4wbcOVrofs63pkAjwk9DAmHwO8Qe9ALTFd+n9K/bknMa
-HYh+8v3yVa+xfR/9XizRgRpE6eghNGBW30ywPAkGryKchlri6lenfBhcmRwGI4b4
-mc27ZS79Rn3rjTPKXtIgCEoOQYOmGZW38PELS0LWi7h53iXr7W9apQh/
 -----END AGE ENCRYPTED FILE-----