diff --git a/.sidecar/shells.json.lock b/.sidecar/shells.json.lock
new file mode 100644
index 0000000..e69de29
diff --git a/home/sam/config/waybar/style.css b/home/sam/config/waybar/style.css
index beba969..69c2b0d 100644
--- a/home/sam/config/waybar/style.css
+++ b/home/sam/config/waybar/style.css
@@ -7,7 +7,7 @@
 @define-color overlay0 #6e738d;
 
 * {
-  font-family: "JetBrainsMono Nerd Font", "Font Awesome 6 Free", sans-serif;
+  font-family: "JetBrainsMono Nerd Font", "Symbols Nerd Font","Font Awesome 6 Free", "Font Awesome 6 Brands", sans-serif;
   font-size: 14px;
   border: none;
   border-radius: 0;
diff --git a/home/sam/nvim/lua/sam/plugins/orgmode.lua b/home/sam/nvim/lua/sam/plugins/orgmode.lua
index ca0ead1..035672c 100644
--- a/home/sam/nvim/lua/sam/plugins/orgmode.lua
+++ b/home/sam/nvim/lua/sam/plugins/orgmode.lua
@@ -1,36 +1,50 @@
 return {
-  {
-    "nvim-orgmode/orgmode",
-    ft = { "org" },
-    dependencies = {
-      "nvim-treesitter/nvim-treesitter",
-    },
-    config = function()
-      -- Ensure *.org files are treated as "org" filetype
-      vim.filetype.add({
-        extension = {
-          org = "org",
-        },
-      })
-
-      -- Treesitter grammar for org (required for good highlighting)
-      local ok, parsers = pcall(require, "nvim-treesitter.parsers")
-      if ok then
-        local parser_config = parsers.get_parser_configs()
-        parser_config.org = {
-          install_info = {
-            url = "https://github.com/milisims/tree-sitter-org",
-            revision = "main",
-            files = { "src/parser.c", "src/scanner.c" },
-          },
-          filetype = "org",
-        }
-      end
-
-      require("orgmode").setup({
-        org_agenda_files = { "~/organizer/agenda/**/*", "~/organizer/*.org" },
-        org_default_notes_file = "~/organizer/inbox.org",
-      })
-    end,
+  "nvim-orgmode/orgmode",
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter",
   },
+
+  -- Load at startup so the parser definition exists before you run TSInstall.
+  lazy = false,
+
+  init = function()
+    -- Register the org parser with nvim-treesitter (API-compatible fallback).
+    local ok, parsers = pcall(require, "nvim-treesitter.parsers")
+    if not ok then
+      return
+    end
+
+    local parser_configs = nil
+
+    if type(parsers.get_parser_configs) == "function" then
+      parser_configs = parsers.get_parser_configs()
+    elseif type(parsers.get_parser_configs) == "table" then
+      parser_configs = parsers.get_parser_configs
+    elseif type(parsers.parser_configs) == "table" then
+      parser_configs = parsers.parser_configs
+    end
+
+    if not parser_configs then
+      return
+    end
+
+    -- Don’t overwrite if it already exists.
+    if not parser_configs.org then
+      parser_configs.org = {
+        install_info = {
+          url = "https://github.com/milisims/tree-sitter-org",
+          revision = "main",
+          files = { "src/parser.c", "src/scanner.c" },
+        },
+        filetype = "org",
+      }
+    end
+  end,
+
+  config = function()
+    require("orgmode").setup({
+      org_agenda_files = { "~/organizer/agenda/**/*", "~/organizer/*.org" },
+      org_default_notes_file = "~/organizer/inbox.org",
+    })
+  end,
 }
diff --git a/pkgs/agentpipe.nix b/pkgs/agentpipe.nix
index 2df6e74..90f8a66 100644
--- a/pkgs/agentpipe.nix
+++ b/pkgs/agentpipe.nix
@@ -8,15 +8,17 @@ buildGoModule rec {
     owner = "kevinelliott";
     repo = "agentpipe";
     rev = "v${version}";
-    hash = lib.fakeHash;
+    hash ="sha256-sLnlgXG4Qy1nTbLyx2ci2492kwi8NNaue/4Xpdx7LQw=";
   };
 
-  vendorHash = lib.fakeHash;
-
+  vendorHash ="sha256-ZvJ4N2SVVBbxL2qyz/FyXUvrmTGyoojwitf5p1xSUo0=";
   subPackages = [ "." ];
 
   # Avoid dynamic linking surprises.
-  CGO_ENABLED = 0;
+
+env = {
+  CGO_ENABLED = "0";
+};
 
   ldflags = [
     "-s"
diff --git a/pkgs/sidecar-bin.nix b/pkgs/sidecar-bin.nix
index 343509e..05b335c 100644
--- a/pkgs/sidecar-bin.nix
+++ b/pkgs/sidecar-bin.nix
@@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation {
   src = fetchurl {
     url =
       "https://github.com/marcus/sidecar/releases/download/v0.71.1/sidecar_0.71.1_linux_amd64.tar.gz";
-    sha256 = lib.fakeSha256;
+    sha256 = "sha256-FFisAM3oHZL8lp35/shvYPj/jmfNohoTiTuVrtePeCU=";
   };
 
   dontUnpack = false;