diff --git a/hmModules/apps/fish/app.nix b/hmModules/apps/fish/app.nix
index 0b00897..8c9c680 100644
--- a/hmModules/apps/fish/app.nix
+++ b/hmModules/apps/fish/app.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 let
   functionModule = with lib.types; submodule {
     options = {
@@ -21,6 +21,9 @@ in {
   config = lib.mkIf config.fish.enable {
     programs.fish = {
       enable = true;
+      interactiveShellInit = ''
+        ${pkgs.nix-your-shell}/bin/nix-your-shell fish | source
+      '';
       functions = {
         fish_greeting = "";
         fish_prompt = ''
diff --git a/hmModules/apps/neovim/app.nix b/hmModules/apps/neovim/app.nix
index 4a1ddfd..4ef6b51 100644
--- a/hmModules/apps/neovim/app.nix
+++ b/hmModules/apps/neovim/app.nix
@@ -105,9 +105,15 @@
         ]);
 
         rust-pkg = lopts cfgl.rust.enable (with pkgs.vimPlugins; [
-          rustaceanvim
+          {
+            plugin = rustaceanvim;
+            type = "lua";
+            config = ''
+              vim.g.rust_recommended_style = 0
+            '';
+          }
         ]);
-        
+
         go-pkg = lopts cfgl.go.enable (with pkgs.vimPlugins; [
           go-nvim
         ]);
diff --git a/hmModules/apps/neovim/options.lua b/hmModules/apps/neovim/options.lua
index dfa4906..db669e2 100644
--- a/hmModules/apps/neovim/options.lua
+++ b/hmModules/apps/neovim/options.lua
@@ -33,6 +33,9 @@ vim.opt.backup = false
 vim.opt.undofile = true
 vim.opt.undodir = '/home/pan/.config/nvim/undodir'
 
+-- Error viewing
+vim.keymap.set('n', '<Leader>d', function() vim.diagnostic.open_float() end)
+
 -- Easy copy and pasting to external programs
 -- map <C-y> "+yy
 -- map <C-p> "+P
diff --git a/hosts/onizuka/host.nix b/hosts/onizuka/host.nix
index 1dc0e1c..5b139c5 100644
--- a/hosts/onizuka/host.nix
+++ b/hosts/onizuka/host.nix
@@ -15,7 +15,7 @@
   sshd.enable = true;
 
   tuigreet.enable = true;
-  hyprland.enable = true;
+  niri.enable = true;
 
   steam.enable = true;
   steam.gamemode = true;
diff --git a/hosts/onizuka/users/pan/user.nix b/hosts/onizuka/users/pan/user.nix
index 21abf26..2efdf12 100644
--- a/hosts/onizuka/users/pan/user.nix
+++ b/hosts/onizuka/users/pan/user.nix
@@ -72,6 +72,7 @@
     treesitter.enable = true;
     wiki.enable = true;
   };
+  neovim.themes.catppuccin.enable = true;
 
   lf.enable = true;
   lf.hiddenfiles = [
diff --git a/nixosModules/services/displaymanager/service.nix b/nixosModules/services/displaymanager/service.nix
index 1110828..92f2d75 100644
--- a/nixosModules/services/displaymanager/service.nix
+++ b/nixosModules/services/displaymanager/service.nix
@@ -6,15 +6,19 @@
   };
 
   config = lib.mkIf config.tuigreet.enable {
-    services.greetd = {
+    services.greetd = let 
+      wm = 
+        if config.hyprland.enable then "Hyprland"
+        else (if config.niri.enable then "niri" else null);
+    in {
       enable = true;
       package = pkgs.greetd.tuigreet;
       settings = {
         terminal = {
           vt = 2;
         };
-        default_session = lib.mkIf config.hyprland.enable {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+        default_session = lib.mkIf (wm != null) {
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${wm}";
           user = "greeter";
         };
       };