diff --git a/flake.lock b/flake.lock
index 992b156..c50a994 100644
--- a/flake.lock
+++ b/flake.lock
@@ -116,7 +116,7 @@
     },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
@@ -259,24 +259,6 @@
       "inputs": {
         "systems": "systems_2"
       },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
       "locked": {
         "lastModified": 1701680307,
         "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@@ -291,21 +273,6 @@
         "type": "github"
       }
     },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -450,49 +417,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1714955862,
-        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
-        "ref": "refs/tags/2.90-beta.1",
-        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
-        "revCount": 15501,
-        "type": "git",
-        "url": "https://git@git.lix.systems/lix-project/lix"
-      },
-      "original": {
-        "ref": "refs/tags/2.90-beta.1",
-        "type": "git",
-        "url": "https://git@git.lix.systems/lix-project/lix"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "flakey-profile": "flakey-profile",
-        "lix": [
-          "lix"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1715353627,
-        "narHash": "sha256-bt/KZsPUlQV1lOZU8vM3QT/05jHftCz88tA9+bXk83s=",
-        "ref": "fix-prefetch-npm-deps",
-        "rev": "1cb0b0434d83719d73946b4516475e5ca31a2f2d",
-        "revCount": 76,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      },
-      "original": {
-        "ref": "fix-prefetch-npm-deps",
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -727,8 +651,6 @@
         "disko": "disko",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "lix": "lix",
-        "lix-module": "lix-module",
         "nix-on-droid": "nix-on-droid",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
@@ -813,21 +735,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/hm/desktop/terminal/default.nix b/hm/desktop/terminal/default.nix
index 2bf517c..bdd82ef 100644
--- a/hm/desktop/terminal/default.nix
+++ b/hm/desktop/terminal/default.nix
@@ -43,7 +43,7 @@ in
               }
             ];
           };
-          key_bindings = [
+          keyboard.bindings = [
             { mode = "~Search"; mods = "Alt|Control"; key = "Space"; action = "ToggleViMode"; }
             { mode = "Vi|~Search"; mods = "Control"; key = "K"; action = "ScrollHalfPageUp"; }
             { mode = "Vi|~Search"; mods = "Control"; key = "J"; action = "ScrollHalfPageDown"; }
diff --git a/hm/dev/common.nix b/hm/dev/common.nix
index 9c67c21..7d66e10 100644
--- a/hm/dev/common.nix
+++ b/hm/dev/common.nix
@@ -21,7 +21,7 @@
       traceroute
 
       # nix
-      nix
+      lix
 
       # Always on (graphical)
     ] ++ lib.optionals config.frogeye.desktop.xorg [
diff --git a/hm/nix/default.nix b/hm/nix/default.nix
index e5b2f23..d85563b 100644
--- a/hm/nix/default.nix
+++ b/hm/nix/default.nix
@@ -14,7 +14,7 @@
       enableZshIntegration = true;
     };
     nix = {
-      package = lib.mkDefault pkgs.nixFlakes;
+      package = lib.mkDefault pkgs.lix;
       settings = {
         experimental-features = [ "nix-command" "flakes" ];
         warn-dirty = false;
diff --git a/hm/vim/decoration.nix b/hm/vim/decoration.nix
index b48e833..94c4715 100644
--- a/hm/vim/decoration.nix
+++ b/hm/vim/decoration.nix
@@ -3,11 +3,11 @@
   config = {
     programs = {
       # https://www.reddit.com/r/neovim/comments/mbj8m5/how_to_setup_ctrlshiftkey_mappings_in_neovim_and/
-      alacritty.settings.key_bindings = [
-        { key = "H"; mods = "Control|Shift"; chars = "\\x1b[72;5u"; }
-        { key = "L"; mods = "Control|Shift"; chars = "\\x1b[76;5u"; }
+      alacritty.settings.keyboard.bindings = [
+        { key = "H"; mods = "Control|Shift"; chars = "\\u001b[72;5u"; }
+        { key = "L"; mods = "Control|Shift"; chars = "\\u001b[76;5u"; }
       ] ++ (map
-        (n: { key = "Key${builtins.toString n}"; mods = "Control"; chars = "\\x1b[${builtins.toString (48+n)};5u"; })
+        (n: { key = "Key${builtins.toString n}"; mods = "Control"; chars = "\\u001b[${builtins.toString (48+n)};5u"; })
         (lib.lists.range 0 9));
       # Ctrl+<number> doesn't get interpreted, but Ctrl+Shift+<number> does, so let's use that
       nixvim = {
diff --git a/hm/vim/default.nix b/hm/vim/default.nix
index b2f7409..a8c573c 100644
--- a/hm/vim/default.nix
+++ b/hm/vim/default.nix
@@ -98,6 +98,12 @@
         ansible-vim
         # Doesn't generate snippets, but those are for UltiSnip anyways
       ];
+      extraConfigLuaPre = lib.mkBefore ''
+        -- If terminal is detected to be light, background will be changed after base16 theme is applied.
+        -- Setting manually early to prevent hightlights having weird colors.
+        -- https://github.com/RRethy/base16-nvim/issues/77
+        vim.opt.background = "${config.stylix.polarity}";
+      '';
       extraConfigVim = ''
         " Avoid showing message extra message when using completion
         set shortmess+=c