diff --git a/flake.lock b/flake.lock
index dfc0433..0d7fb55 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "crane": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1654444508,
+        "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "db5482bf225acc3160899124a1df5a617cfa27b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "dan": {
       "inputs": {
         "nixpkgs": [
@@ -22,6 +38,122 @@
         "type": "gitlab"
       }
     },
+    "devshell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1653917170,
+        "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "dream2nix": {
+      "inputs": {
+        "alejandra": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ],
+        "crane": "crane",
+        "devshell": [
+          "helix",
+          "nixCargoIntegration",
+          "devshell"
+        ],
+        "flake-utils-pre-commit": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ],
+        "gomod2nix": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ],
+        "mach-nix": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ],
+        "nixpkgs": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ],
+        "node2nix": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ],
+        "poetry2nix": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ],
+        "pre-commit-hooks": [
+          "helix",
+          "nixCargoIntegration",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1654451959,
+        "narHash": "sha256-yWztC96o8Dw65jDbmNUxV1i61T3uLqvqhC3ziwnB/Fk=",
+        "owner": "nix-community",
+        "repo": "dream2nix",
+        "rev": "90b353682ef927bd39b59085e0dc6b7454888de7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "dream2nix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1637014545,
+        "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "helix": {
+      "inputs": {
+        "nixCargoIntegration": "nixCargoIntegration",
+        "nixpkgs": [
+          "unstable"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1654649047,
+        "narHash": "sha256-KiNXjbIILRLgyi4U4Smd4UEqEzgD1yn3hKU3QpEn5PA=",
+        "owner": "helix-editor",
+        "repo": "helix",
+        "rev": "e0532771cc3503afcbfb5cd5d45b8c57462587f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "helix-editor",
+        "repo": "helix",
+        "type": "github"
+      }
+    },
     "home-manager-2205": {
       "inputs": {
         "nixpkgs": [
@@ -43,6 +175,33 @@
         "type": "github"
       }
     },
+    "nixCargoIntegration": {
+      "inputs": {
+        "devshell": "devshell",
+        "dream2nix": "dream2nix",
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ],
+        "rustOverlay": [
+          "helix",
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1654531591,
+        "narHash": "sha256-DtDAwkl2Pn8w1BW1z2OssT/bWjVhMZQBBpr2uDY7tHY=",
+        "owner": "yusdacra",
+        "repo": "nix-cargo-integration",
+        "rev": "c935099d6851d0ff94098e9a12f42147524f0c5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yusdacra",
+        "repo": "nix-cargo-integration",
+        "type": "github"
+      }
+    },
     "nixos-2205": {
       "locked": {
         "lastModified": 1654360807,
@@ -77,12 +236,35 @@
     "root": {
       "inputs": {
         "dan": "dan",
+        "helix": "helix",
         "home-manager-2205": "home-manager-2205",
         "nixos-2205": "nixos-2205",
         "nur": "nur",
         "unstable": "unstable"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1654483484,
+        "narHash": "sha256-Ki/sMgrUEj+31P3YMzZZp5Nea7+MQVVTdaRWQVS1PL4=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "6bc59b9c4ad1cc1089219e935aa727a96d948c5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "unstable": {
       "locked": {
         "lastModified": 1654398695,
diff --git a/flake.nix b/flake.nix
index 6da61f9..bd99116 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,9 +13,12 @@
 
     dan.url = "gitlab:Dandellion/NUR?host=git.dodsorf.as"; #"git+https://git.dodsorf.as/Dandellion/NUR";
     dan.inputs.nixpkgs.follows = "unstable";
+    
+    helix.url = "github:helix-editor/helix";
+    helix.inputs.nixpkgs.follows = "unstable";
   };
 
-  outputs = {self, home-manager-2205, unstable, nur, dan, ... }:
+  outputs = {self, home-manager-2205, unstable, nur, dan, ... }@inputs:
   let
     nixlib = unstable.lib;
 
@@ -52,6 +55,7 @@
           inherit (prev) system config;
         };
         dan = dan.packages.${prev.system};
+        helix = inputs.helix.packages.${prev.system}.helix;
       })
       nur.overlay
     ];
diff --git a/profiles/base/default.nix b/profiles/base/default.nix
index 4ef5a7c..3de90b7 100644
--- a/profiles/base/default.nix
+++ b/profiles/base/default.nix
@@ -145,14 +145,7 @@ in
 
     programs.helix = {
       enable = true;
-      package = pkgs.unstable.helix.overrideAttrs (old: {
-        patches = old.patches ++ [
-            (pkgs.fetchpatch {
-              url = "https://github.com/helix-editor/helix/commit/d8e93d2a37adad6f04b3453d7570c88f6e37d0ab.patch";
-              sha256 = "sha256-uIwtATxO8Jx92btIBJh8/v8ZRuAjbOfT7Oi5IaNr1nY=";
-            })
-          ];
-      });
+      package = pkgs.helix;
       settings = let
         b = command: ":insert-output " + command;
         c = chars: b "printf " + chars;
@@ -164,7 +157,7 @@ in
           "ø" = "collapse_selection"; # For ;
           "minus" = "search"; # For /
           "_" = "rsearch"; # for =
-          "plus" = "trim_selections"; # for _
+          "+" = "trim_selections"; # for _
           "å" = {
             "d" = "goto_prev_diag"; # for [d
             "D" = "goto_first_diag";