Merge branch 'main' into thinkpad

hosts/macbook/configuration.nix

@@ -31,6 +31,11 @@
     hello
   ];
 
+  environment.variables = {
+    EDITOR = "nvim";
+    ZK_NOTEBOOK_DIR = "~/notes";
+  };
+
   services = {
     skhd = {
       enable = true;

hosts/macbook/home.nix

@@ -16,16 +16,40 @@
   home.homeDirectory = "/Users/mthomson";
   home.stateVersion = "23.11";
 
+  home.sessionVariables = {
+    EDITOR = "nvim";
+    ZK_NOTEBOOK_DIR = "notes";
+  };
+
+  programs = {
+    direnv = {
+      enable = true;
+      enableZshIntegration = true; # see note on other shells below
+      nix-direnv.enable = true;
+    };
+  };
+
   home.packages = with pkgs; [
     btop
     spotify
     spotify-player
     neofetch
     jq
-    fzf
-    ripgrep
     tldr
     cowsay
+    lazygit
+    k9s
+    tintin
+    nb
+    w3m
+    lua
+    kubectl
+    k9s
+    kubeseal
+    fluxcd
+    wireguard-tools
+    kompose
+    inetutils
   ];
 
   programs.home-manager.enable = true;