From 751e8a67e7caf12268359152993e83e3fe39b743 Mon Sep 17 00:00:00 2001
From: Sam Rolfe <samuelrolfe@gmail.com>
Date: Mon, 9 Feb 2026 18:41:42 +1100
Subject: [PATCH] Add baseline extras: tailscale, docker, telegram, flameshot,
 aider/opencode/goose/gemini

---
 home/sam/home.nix                           | 18 ++++++++++++++++++
 home/sam/nvim/lua/sam/lazy.lua              |  5 ++++-
 home/sam/nvim/lua/sam/plugins/lsp.lua       |  2 +-
 hosts/sam-4screen-desktop/configuration.nix |  8 +++++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/home/sam/home.nix b/home/sam/home.nix
index c2c1d23..67651bd 100644
--- a/home/sam/home.nix
+++ b/home/sam/home.nix
@@ -3,6 +3,10 @@
 
 {
 
+
+xdg.configFile."nvim/init.lua".source = ./nvim/init.lua;
+xdg.configFile."nvim/lua".source = ./nvim/lua;
+
 xdg.configFile."atuin" = { source = ./config/atuin; recursive = true; };
 xdg.configFile."kitty" = { source = ./config/kitty; recursive = true; };
 xdg.configFile."zellij" = { source = ./config/zellij; recursive = true; };
@@ -86,6 +90,20 @@ home.stateVersion = "25.11";
   # ---
   home.packages = with pkgs; [
 
+  aider-chat
+opencode
+goose-cli
+gemini-cli-bin
+
+lua-language-server
+ marksman
+ nodePackages.typescript
+ nodePackages.typescript-language-server
+
+
+    nodejs
+    python3
+    python3Packages.pynvim
     git
     curl
     wget
diff --git a/home/sam/nvim/lua/sam/lazy.lua b/home/sam/nvim/lua/sam/lazy.lua
index 06d8209..2cb4011 100755
--- a/home/sam/nvim/lua/sam/lazy.lua
+++ b/home/sam/nvim/lua/sam/lazy.lua
@@ -14,4 +14,7 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 -- Tell lazy to load our plugin specs from the "plugins" directory
-require("lazy").setup("sam.plugins", {})
+ require("lazy").setup("sam.plugins", {
+  install = { missing = true },
+  lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json",
+})
diff --git a/home/sam/nvim/lua/sam/plugins/lsp.lua b/home/sam/nvim/lua/sam/plugins/lsp.lua
index 074bc77..f712b0e 100755
--- a/home/sam/nvim/lua/sam/plugins/lsp.lua
+++ b/home/sam/nvim/lua/sam/plugins/lsp.lua
@@ -27,7 +27,7 @@ return {
     local servers = {
       "intelephense", -- PHP
       "pyright",      -- Python
-      "tsserver",        -- TS/JS
+      "ts_ls",        -- TS/JS
       "clangd",       -- C++
       "lua_ls",       -- Lua
       "emmet_ls",     -- HTML/CSS (for tag completion/snippets)
diff --git a/hosts/sam-4screen-desktop/configuration.nix b/hosts/sam-4screen-desktop/configuration.nix
index 89ba770..9639f4f 100644
--- a/hosts/sam-4screen-desktop/configuration.nix
+++ b/hosts/sam-4screen-desktop/configuration.nix
@@ -117,7 +117,7 @@
   users.users.sam = {
     isNormalUser = true;
     description = "Sam";
-    extraGroups = [ "wheel" "networkmanager" "video" "render" ];
+    extraGroups = [ "wheel" "networkmanager" "video" "render" "docker"];
     shell = pkgs.zsh;
   };
 
@@ -197,7 +197,7 @@ PermitRootLogin = "no";
   # ---
   # Docker (DEFER for now)
   # ---
-  virtualisation.docker.enable = false;
+  virtualisation.docker.enable = true;
 
   # ---
   # Mounts
@@ -236,6 +236,8 @@ PermitRootLogin = "no";
 
   # Minimal system packages needed for the session and core usability
   environment.systemPackages = with pkgs; [
+  telegram-desktop
+flameshot
     waybar
     firefox
     google-chrome
@@ -248,7 +250,7 @@ PermitRootLogin = "no";
     grim
     slurp
   ];
-
+services.tailscale.enable = true;
   # ---
   # NVIDIA (simple, first-boot stable config; PRIME tuning later)
   # ---