diff --git a/flake.lock b/flake.lock
index e65b049..e96b8a0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -206,11 +206,11 @@
         "wlroots": "wlroots"
       },
       "locked": {
-        "lastModified": 1662236559,
-        "narHash": "sha256-lWjIORBU+NdZezAlqcXYwBsWyyB6GFH/WFnsPYUMmTo=",
+        "lastModified": 1662312458,
+        "narHash": "sha256-FAWHn2aMytRc7AciZABnemaIdTL8ed0Vw66V7nRII3Q=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "1664f81cae6bd0e159de835f09d4f0d7105fe07e",
+        "rev": "6afab12b91baddb6d4a9c348e3fb2bf8c4e6e6ea",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1661850929,
-        "narHash": "sha256-YQxPKEF1jpDIrNARAIdaU0pR1KgjBHuTwXDeAseTfnY=",
+        "lastModified": 1662296777,
+        "narHash": "sha256-NE/f95zRetFGw+H5fpvB3ye9AM72mc9x/71YL9Fkzpk=",
         "owner": "NULLx76",
         "repo": "nixpkgs",
-        "rev": "f9e6ebf0e94a0f82f6d913708a57b86dd4740cbd",
+        "rev": "e027345597b2a62e38f31d76fa71efccf5cbd8a2",
         "type": "github"
       },
       "original": {
diff --git a/nixos/common/users/default.nix b/nixos/common/users/default.nix
index e597d6c..a79906b 100644
--- a/nixos/common/users/default.nix
+++ b/nixos/common/users/default.nix
@@ -28,7 +28,6 @@
   programs.neovim = {
     enable = true;
     viAlias = true;
-    defaultEditor = true;
   };
 
   # Disable sudo prompt for `wheel` users.
@@ -63,5 +62,15 @@
   };
 
   # Setup packages available everywhere
-  environment.systemPackages = with pkgs; [ fzf git htop ncdu rsync ripgrep zoxide ];
+  environment.systemPackages = with pkgs; [
+    fzf
+    git
+    helix
+    htop
+    ncdu
+    ripgrep
+    rsync
+    zoxide
+  ];
+
 }
diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix
index 835bc4f..b5a16ce 100644
--- a/nixos/hosts/thalassa/null/configuration.nix
+++ b/nixos/hosts/thalassa/null/configuration.nix
@@ -195,7 +195,7 @@ in
     slurp
     gdb
 
-    swaylock-effects
+    swaylock-effects # Has to be installed globally so that pam module works
   ];
 
   programs.steam = {
@@ -226,6 +226,15 @@ in
     keep-derivations = true
   '';
 
+  # Enables logging in with my Solokey
+  security.pam.u2f = {
+    enable = true;
+    debug = false;
+    cue = true;
+    control = "sufficient";
+    authFile = "/etc/u2f-mappings"; # use `pamu2fcfg` from `pkgs.pam_u2f` to generate this config
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix
index 35c14e8..ce581d5 100644
--- a/nixos/hosts/thalassa/null/home/default.nix
+++ b/nixos/hosts/thalassa/null/home/default.nix
@@ -106,6 +106,7 @@
       mkhl.direnv
       tamasfe.even-better-toml
       valentjn.vscode-ltex
+      vscodevim.vim
     ];
   };
 
diff --git a/nixos/hosts/thalassa/null/home/hyprland/default.nix b/nixos/hosts/thalassa/null/home/hyprland/default.nix
index 5a1b63e..61d3544 100644
--- a/nixos/hosts/thalassa/null/home/hyprland/default.nix
+++ b/nixos/hosts/thalassa/null/home/hyprland/default.nix
@@ -1,8 +1,8 @@
 { pkgs, inputs, ... }: {
   home.file.".config/hypr/hyprpaper.conf".text = ''
     ipc = off
-    preload = ~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix.png
-    wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix.png
+    preload = ~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png
+    wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png
   '';
 
   home.file.".xsettingsd".text = ''
@@ -14,8 +14,8 @@
     enable = true;
     extraConfig = ''
       exec-once=${pkgs.hyprpaper}/bin/hyprpaper
-      exec-once=hyprctlhyprpap setcursor Catppuccin-Frappe-Pink-Cursors 32
-      exec-once=${pkgs.xsettingsd}/bin/xsettingsd
+      exec-once=hyprctl setcursor Catppuccin-Frappe-Pink-Cursors 32
+      exec-once=${pkgs.xsettingsd}/bin/xsettingsd &
       exec-once=eww daemon
       exec-once=eww open bar