diff --git a/hosts/jibril/host.nix b/hosts/jibril/host.nix
index 2778816..efc1452 100644
--- a/hosts/jibril/host.nix
+++ b/hosts/jibril/host.nix
@@ -26,11 +26,10 @@
   system.users.bigWheels = [ "pan" ];
 
   tuigreet.enable = true;
-  hyprland.enable = true;
-  tailscale.enable = true;
+  niri.enable = true;
+  
+  postgres.enable = true;
 
   shell.enabledShells = [ "fish" ];
   shell.defaultShell = "fish";
-
-  steam.enable = true;
 }
diff --git a/hosts/jibril/users/pan/user.nix b/hosts/jibril/users/pan/user.nix
index b915e9e..2fb9019 100644
--- a/hosts/jibril/users/pan/user.nix
+++ b/hosts/jibril/users/pan/user.nix
@@ -1,55 +1,12 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
-  hypr.enable = true;
-  hypr.monitor = {
-    details = [
-      "eDP-2,2256x1504@60,0x0,1"
-    ];
-  };
-  hypr.workspace = {
-    workspaces = {
-      "eDP-1" = [
-        "home"
-        "web"
-        "chat"
-        "med"
-      ];
-    };
-    scratchpad.enable = true;
-    defaults = {
-      "name:web" = [ "class:(librewolf)" ];
-      "name:med" = [ "class:(librewolf),title:Picture-in-Picture" ];
-      "name:chat" = [ "class:(Beeper)" ];
-    };
-  };
-  hypr.windows.opaque = [
-      "initialTitle:^(Discord Popout)$"
-      "class:^(firefox)$"
-      "class:^(Gimp)$"
-      "class:^(feh)$"
-      "class:^(mpv)$"
-  ];
-  hypr.background = {
+  niri = {
     enable = true;
-    path = "${config.home.homeDirectory}/med/pix/bg.png";
+    mouse.accel = -0.53;
+    outputs."eDP-2".mode = { width = 2256; height = 1504; refresh = 60.000; };
   };
-  hypr.cursor = {
-    enable = true;
-    theme = "miku";
-  };
-  hypr = {
-    screenshot.enable = true;
-    mouse.sensitivity = -0.52;
-    polkit.enable = true;
-    master.mfact = 0.53;
-    xwayland.videobridge.enable = true;
- };
-  # ags.enable = true;
-  rofi.enable = true;
 
-  timer.enableHourly = true;
-  timer.enableQuarterly = true;
   colors.enable = true;
   manpages.enable = true;
   trash.enable = true;
@@ -104,8 +61,4 @@
 
   beeper.enable = true;
   discord.enable = true;
-  extraPkgs = with pkgs; [
-    # Applications
-    musescore
-  ];
 }