diff --git a/auto_master b/auto_master
new file mode 120000
index 0000000..4a54810
--- /dev/null
+++ b/auto_master
@@ -0,0 +1 @@
+/etc/auto_master
\ No newline at end of file
diff --git a/brew-cask-list b/brew-cask-list
new file mode 100644
index 0000000..a7b84ac
--- /dev/null
+++ b/brew-cask-list
@@ -0,0 +1,79 @@
+1password
+appcleaner
+aquamacs
+autodesk-fusion
+blackhole-16ch
+blackhole-2ch
+blender
+box-drive
+brave-browser
+cabal
+calibre
+cameracontroller
+cork
+dbeaver-community
+dcp-o-matic
+diffmerge
+discord
+distroav
+docker
+drawio
+element
+emby
+fantastical
+firefox
+freecad
+gimp
+git-credential-manager
+github
+gitkraken
+gpg-suite
+home-assistant
+inkscape
+iterm2
+jellyfin-media-player
+jitsi
+joplin
+karabiner-elements
+keybase
+libndi
+libreoffice
+little-snitch
+macdown
+maciasl
+mactex
+mattermost
+mediaelch
+minecraft
+mono-mdk-for-visual-studio
+mqtt-explorer
+mysqlworkbench
+native-access
+nheko
+obs
+opencore-configurator
+openscad
+oracle-jdk
+qmk-toolbox
+rar
+raspberry-pi-imager
+signal
+spamsieve
+spotify
+sqlitestudio
+steam
+superslicer
+synology-drive
+tinymediamanager
+unicodechecker
+vcv-rack
+virtualbox
+visual-studio-code
+vlc
+vnc-viewer
+webex
+whalebird
+whatsapp
+wireshark
+xquartz
+zotero
diff --git a/brew-formula-list b/brew-formula-list
new file mode 100644
index 0000000..466e7c1
--- /dev/null
+++ b/brew-formula-list
@@ -0,0 +1 @@
+mas
diff --git a/flake.nix b/flake.nix
index c4df563..a1ad5df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-unstable";
+      url = "github:nixos/nixpkgs//nixpkgs-25.05-darwin";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -11,7 +11,7 @@
       url = "github:nix-community/nixd";
     };
     darwin = {
-      url = "github:LnL7/nix-darwin/master";
+      url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-homebrew = {
@@ -37,6 +37,9 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-vscode-extensions= {
+      url = "github:nix-community/nix-vscode-extensions";
+    };
   };
   outputs =
     {
@@ -51,6 +54,7 @@
       disko,
       nixd,
       sops-nix,
+      nix-vscode-extensions,
     }@inputs:
     let
       user = "olaf";
diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
index 866bf7b..43d71bd 100644
--- a/modules/darwin/casks.nix
+++ b/modules/darwin/casks.nix
@@ -3,10 +3,9 @@ _:
 [
   # Development Tools
   "homebrew/cask/docker"
-  "visual-studio-code"
   "iterm2"
   "oracle-jdk"
-
+  "arduino-ide"
   # Creatative tools
   "spotify"
   "blender"
@@ -65,6 +64,7 @@ _:
   "dbeaver-community"
   "sqlitestudio"
 
+  "wireshark"
   # Browsers
   "google-chrome"
   "firefox"
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index e64e84e..c43bb86 100644
--- a/modules/darwin/home-manager.nix
+++ b/modules/darwin/home-manager.nix
@@ -111,7 +111,7 @@ in
           path = "/Applications/Jellyfin Media Player.app/";
           options = "-l Jellyfin";
         }
-        { path = "/Applications/Visual Studio Code.app/"; }
+        { path = "/run/current-system/Applications/Visual Studio Code.app/"; }
         { path = "/Applications/Home Assistant.app/"; }
         { path = "/Applications/reMarkable.app/"; }
         { path = "/Applications/LibreOffice.app/"; }
@@ -119,6 +119,7 @@ in
         { path = "/Applications/Microsoft PowerPoint.app/"; }
         { path = "/Applications/Microsoft Teams.app/"; }
         { path = "/System/Applications/Utilities/Screen Sharing.app/"; }
+        { path = "/run/current-system/Applications/Emacs.app/"; }
         {
           path = "/Applications/";
           section = "others";
diff --git a/modules/shared/home-manager.nix b/modules/shared/home-manager.nix
index f17f849..345a6f0 100644
--- a/modules/shared/home-manager.nix
+++ b/modules/shared/home-manager.nix
@@ -11,6 +11,7 @@ let
 in
 {
 
+
   # Shared shell configuration
   zsh = {
     enable = true;
@@ -48,6 +49,8 @@ in
           export ALTERNATE_EDITOR="vim"
           export EDITOR="emacs -nw"
           export VISUAL="emacs"
+          # RMAPI remarkable 
+          RMAPI_CONFIG=/Users/olaf/.config/rmapi
 
           e() {
               emacs -nw "$@"
diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix
index aad21dc..a7a8efb 100644
--- a/modules/shared/packages.nix
+++ b/modules/shared/packages.nix
@@ -23,6 +23,16 @@ with pkgs;
   mtr
   nixfmt-rfc-style
   difftastic
+  # Development
+  autoconf
+  autoconf-archive
+  automake
+  ccache
+  cmake
+  nasm
+  ninja
+  pkg-config
+  llvm
 
   # Encryption and security tools
   age
@@ -72,6 +82,36 @@ with pkgs;
   rustc
   cargo
 
+  # vscode see https://nixos.wiki/wiki/Visual_Studio_Code
+
+  (vscode-with-extensions.override {
+    vscodeExtensions =
+      with vscode-extensions;
+      [
+        #bbenoist.nix
+        jnoortheen.nix-ide
+        ms-python.python
+        ms-azuretools.vscode-docker
+        ms-vscode-remote.remote-ssh
+        ms-vscode.cpptools
+        eamodio.gitlens
+      ]
+      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        {
+          name = "remote-ssh-edit";
+          publisher = "ms-vscode-remote";
+          version = "0.47.2";
+          sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+        }
+        {
+          name = "platformio-ide";
+          publisher = "platformio";
+          version = "3.3.4";
+          sha256 = "sha256-QF5jdHKOjlxPaPD5OnzgzaQIWmmENVtsmocedpfkrPw=";
+        }
+      ];
+  })
+
   # Tex and LaTex
   pandoc
   mdbook