diff --git a/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix
new file mode 100644
index 0000000..fc88b10
--- /dev/null
+++ b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix
@@ -0,0 +1,97 @@
+{ inputs, outputs, lib, pkgs, config, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ ];
+
+  # environment.darwinConfig = builtins.toString ./configuration.nix;
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+
+  nix = {
+    # Ensure we can work with flakes
+    package = pkgs.nixUnstable;
+
+    settings = {
+      # Enable flakes and new 'nix' command
+      experimental-features = [
+        # "nix-command"
+        # "flakes"
+        # "repl-flake"
+
+        # "no-url-literals"       # Disabling URL literals
+        "ca-derivations"        # Content-Addressable Derivations
+        "recursive-nix"         # Recursive Nix
+        "flakes"                # Flakes and related commands
+        "nix-command"           # Experimental Nix commands
+        "auto-allocate-uids"    # Automatic allocation of UIDs
+        "cgroups"               # Cgroup support
+        # "daemon-trust-override" # Overriding daemon trust settings
+        # "dynamic-derivations"   # Dynamic derivation support
+        # "discard-references"    # Discarding build output references
+        "fetch-closure"         # builtins.fetchClosure
+        "impure-derivations"    # Impure derivations
+        "repl-flake"            # Passing installables to nix repl
+      ];
+
+      # Allow building multiple derivations in parallel
+      max-jobs = "auto";
+
+      # Deduplicate and optimize nix store
+      auto-optimise-store = false;
+
+      # Keep outputs and derivations
+      keep-outputs = true;
+      keep-derivations = true;
+
+      trusted-users = [
+        "root"
+        "pavelatanasov"
+      ];
+
+      # Add nix-community and rix101 cachix caches
+      substituters = [
+        "https://rix101.cachix.org"
+        "https://nix-community.cachix.org"
+        "https://lean4.cachix.org"
+      ];
+      trusted-public-keys = [
+        "rix101.cachix.org-1:2u9ZGi93zY3hJXQyoHkNBZpJK+GiXQyYf9J5TLzCpFY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "lean4.cachix.org-1:mawtxSxcaiWE24xCXXgh3qnvlTkyU7evRRnGeAhD4Wk="
+      ];
+    };
+  };
+
+  # Create /etc/zshrc that loads the nix-darwin environment.
+  programs.zsh.enable = true; # default shell on catalina
+
+  # Fonts
+  fonts.fontDir.enable = true;
+  fonts.fonts = with pkgs; [
+    (nerdfonts.override { fonts = [ "FiraCode" ]; })
+  ];
+
+  reo101 = {
+    system = {
+      enable = true;
+    };
+    brew = {
+      enable = true;
+    };
+    yabai = {
+      enable = true;
+    };
+  };
+
+  # Keyboard
+  system.keyboard.enableKeyMapping = true;
+  system.keyboard.remapCapsLockToEscape = true;
+
+  # Add ability to used TouchID for sudo authentication
+  security.pam.enableSudoTouchIdAuth = true;
+
+  # Used for backwards compatibility, please read the changelog before changing.
+  # > darwin-rebuild changelog
+  system.stateVersion = 4;
+}
diff --git a/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix b/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix
new file mode 100644
index 0000000..dd18181
--- /dev/null
+++ b/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix
@@ -0,0 +1,187 @@
+{ inputs, outputs, lib, pkgs, config, ... }:
+
+{
+  home = {
+    username = lib.mkForce "pavelatanasov";
+    homeDirectory = lib.mkForce "/Users/pavelatanasov";
+    stateVersion = "23.05";
+  };
+
+  # Add custom overlays
+  nixpkgs = {
+    overlays = [
+      inputs.neovim-nightly-overlay.overlay
+      inputs.zig-overlay.overlays.default
+      (final: prev: {
+        neovim-unwrapped =
+          let
+            liblpeg = final.stdenv.mkDerivation {
+              pname = "liblpeg";
+
+              inherit (final.luajitPackages.lpeg)
+                version meta src;
+
+              buildInputs = [
+                final.luajit
+              ];
+
+              buildPhase = ''
+                sed -i makefile -e "s/CC = gcc/CC = clang/"
+                sed -i makefile -e "s/-bundle/-dynamiclib/"
+
+                make macosx
+              '';
+
+              installPhase = ''
+                mkdir -p $out/lib
+                mv lpeg.so $out/lib/lpeg.dylib
+              '';
+
+              nativeBuildInputs = [
+                final.fixDarwinDylibNames
+              ];
+            };
+          in
+          prev.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
+            # version = self.shortRev or "dirty";
+            version = oldAttrs.version or "dirty";
+            patches =
+              builtins.filter
+                (patch:
+                  (
+                    if builtins.typeOf patch == "set"
+                    then baseNameOf patch.name
+                    else baseNameOf
+                  )
+                  != "use-the-correct-replacement-args-for-gsub-directive.patch")
+                (oldAttrs.patches or [ ]);
+            preConfigure = ''
+              sed -i cmake.config/versiondef.h.in -e 's/@NVIM_VERSION_PRERELEASE@/-dev-${version}/'
+            '';
+            nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
+              liblpeg
+              final.libiconv
+            ];
+          });
+      })
+    ];
+  };
+
+  # Set env vars
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+
+  programs.command-not-found.enable = true;
+
+  home.packages = with pkgs; [
+    # WM
+    yabai
+    skhd
+
+    # Discord
+    discord
+
+    # Shell
+    btop
+    ripgrep
+    zellij
+
+    # Neovim
+    neovim
+    fennel
+    fennel-language-server
+
+    # Dhall
+    dhall
+    # dhall-lsp-server
+
+    # Circom
+    circom
+    circom-lsp
+
+    # Nix
+    rnix-lsp
+    nil
+    nixd
+
+    # Mail
+    himalaya
+
+    # SSH and GPG
+    openssh
+    gnupg
+    pinentry_mac
+    (pass.withExtensions (extensions: with extensions; [
+      pass-otp
+    ]))
+
+    # FMI
+    vim-fmi-cli
+
+    # Zig
+    zigpkgs.master
+    inputs.zls-overlay.packages.${pkgs.system}.default
+
+    # Android
+    android-tools
+  ];
+
+  reo101 = {
+    shell = {
+      enable = true;
+      shells = [ "nushell" "zsh" ];
+      starship = true;
+      atuin = true;
+      direnv = true;
+      zoxide = true;
+    };
+    wezterm = {
+      enable = true;
+    };
+  };
+
+  programs.git = {
+    enable = true;
+    userName = "reo101";
+    # userEmail = "pavel.atanasov@limechain.tech";
+    userEmail = "pavel.atanasov2001@gmail.com";
+    signing = {
+      signByDefault = true;
+      key = "675AA7EF13964ACB";
+    };
+  };
+
+  home.file.".gnupg/gpg-agent.conf" = {
+    text = ''
+      allow-preset-passphrase
+      max-cache-ttl 86400
+      default-cache-ttl 86400
+      enable-ssh-support
+      # pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
+      # pinentry-program /usr/local/opt/pinentry-touchid/bin/pinentry-touchid
+    '';
+  };
+
+  home.file.".gnupg/sshcontrol" = {
+    text = ''
+      CFDE97EDC2FDB2FD27020A084F1E3F40221BAFE7
+    '';
+  };
+
+  programs.zsh.initExtra = ''
+    # if [ "''${SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    #   export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+    # fi
+    # if [ -z "$SSH_AUTH_SOCK" ]; then
+    #   export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)
+    # fi
+    unset SSH_AGENT_PID
+    export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)
+    gpg-connect-agent updatestartuptty /bye >/dev/null
+    export GPG_TTY=$(tty)
+  '';
+}