diff --git a/flake.nix b/flake.nix
index 14e515a..6d3790b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,9 +32,9 @@
           (auto-login "Hyprland")
           ./nixos/programs/gamer.nix
           ./nixos/programs/personal.nix
-          ./nixos/programs/anki.nix
           ./nixos/workstation.nix
         ] [
+          ./home/workstation.nix
           ./home/desktop/hyprland/.
           ./home/programs/graphical.nix
           ./home/programs/gamer.nix
@@ -48,6 +48,7 @@
           ./nixos/modules/work.nix
           ./nixos/workstation.nix
         ] [
+          ./home/workstation.nix
           ./home/desktop/hyprland/.
           ./home/programs/work.nix
           ./home/programs/graphical.nix
@@ -55,7 +56,9 @@
 
       alpine = mkConf [
         ./hardware/alpine.nix
-        ./nixos/programs/anki.nix
+        ./nixos/services/anki.nix
+        ./nixos/services/forgejo.nix
+        ./nixos/services/vaultwarden.nix
       ] [];
 
       vm-sway =
diff --git a/hardware/alpine.nix b/hardware/alpine.nix
index f7a0a3e..db64151 100644
--- a/hardware/alpine.nix
+++ b/hardware/alpine.nix
@@ -134,7 +134,12 @@ in {
       "git.tristans.cloud" = {
         forceSSL = true;
         enableACME = true;
-        locations."~".proxyPass = "http://localhost:3000";
+        locations."~".proxyPass = "http://localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}";
+      };
+      "vault.tristans.cloud" = {
+        forceSSL = true;
+        enableACME = true;
+        locations."~".proxyPass = "http://localhost:${toString config.services.vaultwarden.config.ROCKET_PORT}";
       };
     };
   };
@@ -153,18 +158,4 @@ in {
     domains = ["tlbean"];
   };
 
-  services.forgejo = {
-    enable = true;
-    dump.enable = true;
-    lfs.enable = true;
-    settings = {
-      server = {
-        DOMAIN = "git.tristans.cloud";
-      };
-      service = {
-        DISABLE_REGISTRATION = true;
-      };
-    };
-  };
-
 }
diff --git a/home/default.nix b/home/default.nix
index a4cdf01..d0c7078 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,35 +4,15 @@
   lib,
   ...
 }:
-# https://nix-community.github.io/home-manager/options.xhtml
 {
   imports = [
-    # ./modules/terminal.nix
-    # ./modules/scripts.nix
-    # ./modules/email.nix
-    # ./modules/mpd.nix
-    # ./modules/menu.nix
-    # ./modules/scripts.nix
-
-    # ./programs/scripts.nix
     ./programs/neovim/.
     ./programs/helix.nix
     ./programs/git.nix
     ./programs/lf/.
     ./programs/zsh.nix
-    {
-      options.windowManager.modifierKey = lib.mkOption {default = "SUPER";};
-    }
   ];
 
-  # programs.menu = {
-  #   package = pkgs.tofi;
-  #   dmenuCommand = "${pkgs.tofi}/bin/tofi --fuzzy-match true";
-  #   drunCommand = "${pkgs.tofi}/bin/tofi-drun --drun-launch true";
-  # };
-
-  # roles.mpd.enable = true;
-
   programs.home-manager.enable = true;
 
   home.homeDirectory = "/home/${config.home.username}";
@@ -51,70 +31,26 @@
     mosh
     ripgrep
     usbutils
-    # wl-clipboard
     du-dust
     htop
     libsixel
     yt-dlp
     ytfzf
-    # playerctl
     neofetch
     tree
     ansible
-    # quickemu
   ];
 
-  services.udiskie = {
-    enable = true;
-    notify = true;
-  };
-
   programs.rbw = {
     enable = true;
     settings = {
       email = "tristan@tristans.cloud";
       base_url = "https://vault.tristans.cloud";
-      pinentry = "gnome3";
+      pinentry = lib.mkDefault "tty";
     };
   };
 
   programs.ssh.enable = true;
-  programs.ssh.matchBlocks = {
-    "git.tristans.cloud" = {
-      user = "git";
-      hostname = "100.116.82.65";
-      port = 2222;
-    };
-    "alpine" = {
-      hostname = "100.116.82.65";
-      user = "tristan";
-    };
-  };
-
-  # home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
-
-  # home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = ''
-  #   context.modules = [
-  #     {
-  #       name = libpipewire-module-raop-discover
-  #       args = { }
-  #     }
-  #   ]
-  # '';
-  # services.kdeconnect = {
-  #   enable = true;
-  #   indicator = true;
-  # };
-
-  # programs.pandoc = {
-  #   enable = true;
-  #   defaults = {
-  #     metadata = {
-  #       author = "Tristan Beedell";
-  #     };
-  #     pdf-engine = "xelatex";
-  #   };
-  # };
 
   programs.direnv.enable = true;
 }
diff --git a/home/workstation.nix b/home/workstation.nix
new file mode 100644
index 0000000..a6de532
--- /dev/null
+++ b/home/workstation.nix
@@ -0,0 +1,58 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  imports = [
+    ./modules/terminal.nix
+    ./modules/scripts.nix
+    ./modules/email.nix
+    ./modules/mpd.nix
+    ./modules/menu.nix
+    ./modules/scripts.nix
+
+    ./programs/scripts.nix
+    {
+      options.windowManager.modifierKey = lib.mkOption {default = "SUPER";};
+    }
+  ];
+
+  programs.menu = {
+    package = pkgs.tofi;
+    dmenuCommand = "${pkgs.tofi}/bin/tofi --fuzzy-match true";
+    drunCommand = "${pkgs.tofi}/bin/tofi-drun --drun-launch true";
+  };
+  roles.mpd.enable = true;
+
+  home.packages = with pkgs; [
+    wl-clipboard
+    playerctl
+    quickemu
+  ];
+
+  services.udiskie = {
+    enable = true;
+    notify = true;
+  };
+
+  programs.rbw.settings.pinentry = "gnome3";
+
+  home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
+  home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = ''
+    context.modules = [
+      {
+        name = libpipewire-module-raop-discover
+        args = { }
+      }
+    ]
+  '';
+
+  services.kdeconnect = {
+    enable = true;
+    indicator = true;
+  };
+
+
+}
diff --git a/nixos/programs/anki.nix b/nixos/services/anki.nix
similarity index 100%
rename from nixos/programs/anki.nix
rename to nixos/services/anki.nix
diff --git a/nixos/services/forgejo.nix b/nixos/services/forgejo.nix
new file mode 100644
index 0000000..9baee16
--- /dev/null
+++ b/nixos/services/forgejo.nix
@@ -0,0 +1,15 @@
+{
+  services.forgejo = {
+    enable = true;
+    dump.enable = true;
+    lfs.enable = true;
+    settings = {
+      server = {
+        DOMAIN = "git.tristans.cloud";
+      };
+      service = {
+        DISABLE_REGISTRATION = true;
+      };
+    };
+  };
+}
diff --git a/nixos/services/vaultwarden.nix b/nixos/services/vaultwarden.nix
new file mode 100644
index 0000000..ac32b7b
--- /dev/null
+++ b/nixos/services/vaultwarden.nix
@@ -0,0 +1,5 @@
+{
+  services.vaultwarden = {
+    enable = true;
+  };
+}