diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 458bf9f..f48b9a2 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -9,7 +9,7 @@
     home = "/home/${userName}";
     initialPassword = "password";
     extraGroups = ["wheel" "networkmanager" "docker" "video" "syncthing"];
-    shell = pkgs.zsh;
+    shell = pkgs.nushell;
   };
 
   defaultUser = "daniel";
@@ -57,6 +57,7 @@ in {
     htop
     helix
     nnn
+    nushell
     ripgrep
     wget
     zsh
diff --git a/hosts/dingbox/configuration.nix b/hosts/dingbox/configuration.nix
index e408bc6..e01ed7e 100644
--- a/hosts/dingbox/configuration.nix
+++ b/hosts/dingbox/configuration.nix
@@ -11,6 +11,8 @@
     ./hardware-configuration.nix
     ../common
     ../common/graphical
+
+    (import ../../modules).dingbox
   ];
 
   services.xserver = {
diff --git a/modules/default.nix b/modules/default.nix
index 570565c..d9164da 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,4 +7,10 @@
       ./synapse
     ];
   };
+
+  dingbox = {
+    imports = [
+      ./postgres
+    ];
+  };
 }
diff --git a/modules/postgres/default.nix b/modules/postgres/default.nix
new file mode 100644
index 0000000..747b69e
--- /dev/null
+++ b/modules/postgres/default.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  config,
+  ...
+}: let
+  username = "daniel";
+in {
+  services.postgresql = {
+    enable = true;
+
+    authentication = pkgs.lib.mkOverride 10 ''
+      local all all trust
+      host all all 127.0.0.1/32 trust
+      host all all ::1/128 trust
+    '';
+
+    initialScript = pkgs.writeText "oubliette-initscript" ''
+      CREATE ROLE oubliette WITH LOGIN PASSWORD 'oubliette' CREATEDB;
+      CREATE DATABASE oubliette_dev;
+      GRANT ALL PRIVILEGES ON DATABASE oubliette TO oubliette;
+    '';
+  };
+}
diff --git a/users/daniel/configs/desktop/i3/default.nix b/users/daniel/configs/desktop/i3/default.nix
index f40cbcc..e8e0ca6 100644
--- a/users/daniel/configs/desktop/i3/default.nix
+++ b/users/daniel/configs/desktop/i3/default.nix
@@ -173,14 +173,14 @@ in {
           "${mod}+Control+i" = "exec --no-startup-id $HOME/bin/scripts/goup";
           "${mod}+Control+h" = "exec --no-startup-id i3utils workspace new -b";
 
-          "${hyper}+u" = "exec --no-startup-id $HOME/bin/scripts/godown";
-          "${hyper}+i" = "exec --no-startup-id $HOME/bin/scripts/goup";
+          "${hyper}+m" = "exec --no-startup-id $HOME/bin/scripts/godown";
+          "${hyper}+comma" = "exec --no-startup-id $HOME/bin/scripts/goup";
 
           "${mod}+Shift+k" = "exec --no-startup-id i3utils window move prev";
           "${mod}+Shift+j" = "exec --no-startup-id i3utils window move next";
 
-          "${hyper}+comma" = "exec --no-startup-id i3utils window move prev";
-          "${hyper}+m" = "exec --no-startup-id i3utils window move next";
+          "${hyper}+i" = "exec --no-startup-id i3utils window move prev";
+          "${hyper}+u" = "exec --no-startup-id i3utils window move next";
 
           "${mod}+p" = "scratchpad show, resize set 80 ppt 80ppt, move position center";
           "${hyper}+p" = "scratchpad show, resize set 80 ppt 80ppt, move position center";
diff --git a/users/daniel/default.nix b/users/daniel/default.nix
index 6cc8782..bde34b4 100644
--- a/users/daniel/default.nix
+++ b/users/daniel/default.nix
@@ -27,7 +27,7 @@
     elixir_ls
     entr
     erlang
-    go_1_18
+    go
     gopls
     oh-my-zsh
     (
@@ -53,6 +53,7 @@
     feh
     iosevka
     idea
+    jellyfin-mpv-shim
     mpv
     obsidian
     pamixer
@@ -143,6 +144,10 @@ in {
       enable = true;
     };
 
+    nushell = {
+      enable = true;
+    };
+
     starship.enable = true;
 
     vscode.enable = true;