M flake.lock → flake.lock

@@ -70,11 +70,11 @@ }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725930920,
-        "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
+        "lastModified": 1728328465,
+        "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
+        "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@ }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1726062873,
-        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
+        "lastModified": 1728241625,
+        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
+        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
         "type": "github"
       },
       "original": {

M profiles/common/base.nix → profiles/common/base.nix

@@ -37,7 +37,15 @@ services.tailscale.enable = true;
 
   programs.zsh.enable = true;
   programs.git.enable = true;
+
   programs.vim.defaultEditor = true;
+
+  environment.shells = [ pkgs.zsh ];
+  environment.variables = {
+    EDITOR = "vim";
+    VISUAL = "vim";
+    SYSTEMD_EDITOR = "vim";
+  };
 
   environment.systemPackages = with pkgs; [
     vim

M profiles/runestone/base.nix → profiles/runestone/base.nix

@@ -35,7 +35,7 @@ programs.firefox.package = unstable-pkgs.firefox-devedition-bin;
 
   environment.systemPackages =
     (with pkgs; [
-      vscode-fhs
+      vscode
       nixpkgs-fmt
       foot
     ])