diff --git a/flake.lock b/flake.lock
index dd92849..c0fd861 100644
--- a/flake.lock
+++ b/flake.lock
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1698670511,
-        "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=",
+        "lastModified": 1698795315,
+        "narHash": "sha256-fF5ScAWLMHXOuqsbLSG137kS1D+gr9JPtm4H2c4yBbU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8e5416b478e465985eec274bc3a018024435c106",
+        "rev": "9bc7d84b8213255ecd5eb6299afdb77c36ece71d",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1698318101,
-        "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
+        "lastModified": 1698611440,
+        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
+        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1698504351,
-        "narHash": "sha256-/bj7Sy32j2HPtIuwjV94ZqF3A8A3CIouOngz8pdMn2I=",
+        "lastModified": 1698761408,
+        "narHash": "sha256-9uw2BSrhFaWZwOstP6hY8jgrs/w45kz7TSP5+KdZZKg=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "9004ffe32f68bb9cc3e5907bdb55ceccddca44a0",
+        "rev": "77a3f3c29817e8ec14448022c934ae708968fd22",
         "type": "github"
       },
       "original": {
@@ -436,11 +436,11 @@
     },
     "private": {
       "locked": {
-        "lastModified": 1698690458,
-        "narHash": "sha256-4Gh4M1kKThixZNc8Nm0oxm+tqkpaqM+lslr0UT2SS0o=",
+        "lastModified": 1698692803,
+        "narHash": "sha256-k2Ga4hMDGu6Vdm04Dcp3tEMbU5n+q7vv1WHezFmbJhM=",
         "ref": "unified",
-        "rev": "d3013be9e32a3b38dbe1794b66a29866f38924fb",
-        "revCount": 35,
+        "rev": "6a88a8511a0581d7b3e8825344014abaac42a29c",
+        "revCount": 36,
         "type": "git",
         "url": "ssh://gitea@git.mildlyfunctional.gay/artemist/nixos-config-private"
       },
@@ -461,8 +461,7 @@
         "nixvim": "nixvim",
         "private": "private",
         "rustybar": "rustybar",
-        "utils": "utils_2",
-        "wip-pinebook-pro": "wip-pinebook-pro"
+        "utils": "utils_2"
       }
     },
     "rust-overlay": {
@@ -575,22 +574,6 @@
         "repo": "flake-utils",
         "type": "github"
       }
-    },
-    "wip-pinebook-pro": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648577588,
-        "narHash": "sha256-ur0wxh0hrQH2BiFBxfmm16dJtS+tGzIU9EN3EZpSCpQ=",
-        "owner": "samueldr",
-        "repo": "wip-pinebook-pro",
-        "rev": "97751d24818f5fdc7abf4418fcfcc31fecfcc18a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "samueldr",
-        "repo": "wip-pinebook-pro",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 030168b..c1e4777 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,10 +33,6 @@
     };
     private.url =
       "git+ssh://gitea@git.mildlyfunctional.gay/artemist/nixos-config-private?ref=unified";
-    wip-pinebook-pro = {
-      url = "github:samueldr/wip-pinebook-pro";
-      flake = false;
-    };
   };
 
   outputs = { self, nixpkgs, home-manager, private, utils, nixvim, ... }@inputs:
diff --git a/sets/packages.nix b/sets/packages.nix
index cdfca58..d1033f8 100644
--- a/sets/packages.nix
+++ b/sets/packages.nix
@@ -107,8 +107,7 @@
     libqalculate
 
     # Web
-    firefox-bin
-    google-chrome
+    firefox
 
     # Gnome configuration
     gnome3.adwaita-icon-theme
@@ -119,6 +118,10 @@
     # Dictionaries
   ]) ++ (with pkgs.hunspellDicts; [ en-us-large de_DE ])
     ++ (lib.optionals (pkgs.system == "x86_64-linux") (with pkgs; [
+      # Web
+      google-chrome
+
+      # EFI stuff
       efibootmgr
       efitools
       sbsigntool
diff --git a/sets/workstation.nix b/sets/workstation.nix
index fbd34a2..515e76f 100644
--- a/sets/workstation.nix
+++ b/sets/workstation.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./1password.nix
     ./sway.nix
     ./packages.nix
     ./pipewire.nix
diff --git a/system/mistmane/default.nix b/system/mistmane/default.nix
index 09bbd67..a7df3d6 100644
--- a/system/mistmane/default.nix
+++ b/system/mistmane/default.nix
@@ -6,21 +6,14 @@
     ./hardware-configuration.nix
     ../../sets/laptop.nix
     ../../sets/workstation.nix
-    "${inputs.wip-pinebook-pro}/pinebook_pro.nix"
+    ../../sets/sshd.nix
+    inputs.nixos-hardware.nixosModules.pine64-pinebook-pro
   ];
 
   networking.hostName = "mistmane";
 
   home-manager.users.artemis = {
-    programs.foot = {
-      enable = true;
-      settings.main = {
-        shell = "/run/current-system/sw/bin/fish";
-        font = "FiraCode Nerd Font:size=6";
-      };
-    };
     wayland.windowManager.sway.config = {
-      terminal = lib.mkForce "foot";
       input."9610:30:HAILUCK_CO.,LTD_USB_KEYBOARD_Touchpad" = {
         middle_emulation = "enabled";
         click_method = "clickfinger";
diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix
index 313e35e..141a763 100644
--- a/system/rainbowdash/default.nix
+++ b/system/rainbowdash/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./boot-config.nix
     ./hardware-configuration.nix
-    ../../sets/1password.nix
     ../../sets/buildMachines.nix
     ../../sets/hacking.nix
     ../../sets/hardware.nix
diff --git a/system/spike/default.nix b/system/spike/default.nix
index 90a6110..2797a47 100644
--- a/system/spike/default.nix
+++ b/system/spike/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./boot-config.nix
     ./hardware-configuration.nix
-    ../../sets/1password.nix
     ../../sets/buildMachines.nix
     ../../sets/hacking.nix
     ../../sets/laptop.nix
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
index 10c992c..3a1a4d3 100644
--- a/system/starlight/default.nix
+++ b/system/starlight/default.nix
@@ -5,7 +5,6 @@
     ./boot-config.nix
     ./hardware-configuration.nix
     ./scripts.nix
-    ../../sets/1password.nix
     ../../sets/builder.nix
     ../../sets/disc.nix
     ../../sets/fpga.nix