diff --git a/flake.nix b/flake.nix
index c9192dc..28699fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,20 +1,24 @@
 {
   description = "My NixOS config flake";
   outputs = inputs: let
-    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-    eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems);
+    inherit (inputs.nixpkgs) lib;
+    eachSystem = lib.genAttrs (import inputs.systems);
     pkgsFor = inputs.nixpkgs.legacyPackages;
   in {
     nixosConfigurations = import ./hosts inputs;
 
-    devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {};
+    devShells =
+      lib.mapAttrs (system: pkgs: {
+        default = pkgs.callPackage ./shell.nix {};
+      })
+      pkgsFor;
 
-    formatter.x86_64-linux = pkgs.alejandra;
+    formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
 
     packages = eachSystem (
       system: {
         inherit
-          (import ./packages {
+          (import ./packages rec {
             pkgs = pkgsFor.${system};
             helix = inputs.helix.packages.${pkgs.system}.default;
           })
diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix
index f38dabb..9559ac9 100644
--- a/hosts/temperance/programs.nix
+++ b/hosts/temperance/programs.nix
@@ -47,6 +47,7 @@ in {
       nheko
       nicotine-plus
       obsidian
+      oculante
       swww
       pandoc
       pavucontrol
diff --git a/packages/helix.nix b/packages/helix.nix
index 3971282..305dbaa 100644
--- a/packages/helix.nix
+++ b/packages/helix.nix
@@ -42,6 +42,7 @@
     editor = {
       cursorline = false;
       color-modes = true;
+      true-color = true;
       indent-guides.render = true;
       lsp = {
         enable = true;
@@ -54,7 +55,6 @@
         hidden = true;
       };
       line-number = "relative";
-      true-color = true;
       auto-format = true;
       completion-timeout = 5;
       mouse = true;
@@ -86,10 +86,19 @@
         A-r = ":reload";
         A-x = "extend_to_line_bounds";
         X = ["extend_line_up" "extend_to_line_bounds"];
+        ";" = "flip_selections";
+        "A-;" = "collapse_selection";
+
+        # Kakoune-like config
+        H = "extend_char_left";
+        J = "extend_line_down";
+        K = "extend_line_up";
+        L = "extend_char_right";
       };
       select = {
         A-x = "extend_to_line_bounds";
         X = ["extend_line_up" "extend_to_line_bounds"];
+        g = {e = "goto_file_end";};
       };
     };
   };