diff --git a/flake.lock b/flake.lock
index e42a541..1c74dd2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1679480702,
-        "narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=",
+        "lastModified": 1680389554,
+        "narHash": "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e",
+        "rev": "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1679614379,
-        "narHash": "sha256-2KddLHHmcIlJu0PuS/vISLKxihTyICUwKWGn0R//028=",
+        "lastModified": 1680487167,
+        "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "994e2ef9e9c70b4dd7257f73452a94e871723685",
+        "rev": "53dad94e874c9586e71decf82d972dfb640ef044",
         "type": "github"
       },
       "original": {
diff --git a/maddie/common/exa.nix b/maddie/common/exa.nix
index d1661e5..270d574 100644
--- a/maddie/common/exa.nix
+++ b/maddie/common/exa.nix
@@ -9,6 +9,7 @@
       "--time-style=long-iso"
       "--git"
       "-h"
+      "-g"
     ];
     icons = true;
   };
diff --git a/maddie/nixos/messaging.nix b/maddie/nixos/messaging.nix
index 1f8bd2a..a75e89c 100644
--- a/maddie/nixos/messaging.nix
+++ b/maddie/nixos/messaging.nix
@@ -6,5 +6,6 @@
     signal-desktop # Signal client
     discord-canary # Discord client
     ripcord # Better discord client
+    nheko # Better matrix client
   ];
 }
diff --git a/maddie/nixos/secrets.nix b/maddie/nixos/secrets.nix
new file mode 100644
index 0000000..6049af2
--- /dev/null
+++ b/maddie/nixos/secrets.nix
@@ -0,0 +1,8 @@
+{ config, ... }:
+
+{
+  services.pass-secret-service = {
+    enable = true;
+    storePath = "${config.xdg.dataHome}/password-store";
+  };
+}
diff --git a/maddie/nixos/xorg.nix b/maddie/nixos/xorg.nix
index d40b72a..596bfab 100644
--- a/maddie/nixos/xorg.nix
+++ b/maddie/nixos/xorg.nix
@@ -21,8 +21,8 @@
   home.pointerCursor = {
     gtk.enable = true;
     x11.enable = true;
-    package = pkgs.phinger-cursors;
-    name = "phinger-cursors";
+    package = pkgs.apple-cursor;
+    name = "macOS-BigSur";
     size = 24;
   };
 
@@ -57,7 +57,7 @@
     ${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout gb --option caps:escape
 
     # Start the window manager
-    ${pkgs.openssh}/bin/ssh-agent ${pkgs.dbus}/bin/dbus-run-session ${pkgs.dwm}/bin/dwm
+    ${pkgs.openssh}/bin/ssh-agent ${pkgs.dwm}/bin/dwm
   '';
 
   xresources.properties = {
diff --git a/overlays.nix b/overlays.nix
index e61ca03..736417e 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -38,8 +38,8 @@
       src = final.fetchFromGitHub {
         owner = "SpyHoodle";
         repo = "slock";
-        rev = "e71c4ac0106a438abb5acf4ae89b8518a9bf3682";
-        sha256 = "sha256-7ZeARKljyQSHPoFb+6p50uIr2q5VOqE/XSELqurNMBw=";
+        rev = "8c5d321b641961237f747d3e68f52b163d673634";
+        sha256 = "sha256-y+6VU3jXbUOyhUcyPC7CDGjyWLSJcCkhYiHscVib7j4=";
       };
       buildInputs = oldAttrs.buildInputs ++ [ final.xorg.libXpm ];
     });
@@ -56,7 +56,7 @@
       clockSupport = false;
     };
     nerdfonts = prev.nerdfonts.override {
-      fonts = [ "Iosevka" "Terminus" "JetBrainsMono" ];
+      fonts = [ "Iosevka" "JetBrainsMono" "Terminus"  ];
     };
   })
 ]
diff --git a/systems/mdesktop/fonts.nix b/systems/mdesktop/fonts.nix
index d458bf1..692832b 100644
--- a/systems/mdesktop/fonts.nix
+++ b/systems/mdesktop/fonts.nix
@@ -2,16 +2,10 @@
 
 {
   fonts.fonts = with pkgs; [
-    terminus-nerdfont
-    fira-code
-    fira-code-symbols
-    dina-font
-    iosevka
-    jetbrains-mono
+    nerdfonts
     font-awesome
     source-han-sans
     source-han-serif
     source-han-code-jp
-    nerdfonts
   ];
 }
diff --git a/systems/mdesktop/noise-supression.nix b/systems/mdesktop/noise-supression.nix
new file mode 100644
index 0000000..75df169
--- /dev/null
+++ b/systems/mdesktop/noise-supression.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+let
+  json = pkgs.formats.json {};
+  pw_rnnoise_config = {
+  "context.modules"= [
+    { "name" = "libpipewire-module-filter-chain";
+        "args" = {
+            "node.description" = "Noise Canceling source";
+            "media.name"       = "Noise Canceling source";
+            "filter.graph" = {
+                "nodes" = [
+                    {
+                        "type"   = "ladspa";
+                        "name"   = "rnnoise";
+                        "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so";
+                        "label"  = "noise_suppressor_stereo";
+                        "control" = {
+                            "VAD Threshold (%)" = 50.0;
+                        };
+                    }
+                ];
+            };
+            "audio.position" = [ "FL" "FR" ];
+            "capture.props" = {
+                "node.name" = "effect_input.rnnoise";
+                "node.passive" = true;
+            };
+            "playback.props" = {
+                "node.name" = "effect_output.rnnoise";
+                "media.class" = "Audio/Source";
+            };
+        };
+      }
+    ];
+  };
+in
+{
+  environment.etc."pipewire/pipewire.conf.d/99-input-denoising.conf" = {
+    source = json.generate "99-input-denoising.conf" pw_rnnoise_config;
+  };
+}
diff --git a/systems/mdesktop/packages.nix b/systems/mdesktop/packages.nix
index 9919547..23c9665 100644
--- a/systems/mdesktop/packages.nix
+++ b/systems/mdesktop/packages.nix
@@ -32,6 +32,7 @@
     p7zip
 
     # Cli tools
+    ripgrep
     wget
     fzf
     bat
diff --git a/systems/mdesktop/ssh.nix b/systems/mdesktop/ssh.nix
index c3c1479..613102e 100644
--- a/systems/mdesktop/ssh.nix
+++ b/systems/mdesktop/ssh.nix
@@ -1,11 +1,13 @@
-{ config, username, ... }:
+{ config, ... }:
 
 {
   services.openssh = {
     enable = true;
-    settings.permitRootLogin = "no";
-    settings.passwordAuthentication = false;
+    settings = {
+      PermitRootLogin = "no";
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+    };
   };
   programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" ];
-  users.users.${username}.openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/id_ed25519_sk.pub ];
 }
diff --git a/systems/mdesktop/users.nix b/systems/mdesktop/users.nix
index 0b6ec4d..2e29887 100644
--- a/systems/mdesktop/users.nix
+++ b/systems/mdesktop/users.nix
@@ -6,5 +6,6 @@
     shell = pkgs.zsh;
     description = "Madeleine";
     extraGroups = [ "adbusers" "dialout" "libvirtd" "plugdev" ];
+    openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/id_ed25519_sk.pub ];
   };
 }