diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix index 48ffdc7..fceaee6 100644 --- a/home/features/cli/fish.nix +++ b/home/features/cli/fish.nix @@ -29,6 +29,7 @@ in { set -x FZF_DEFAULT_COMMAND fd --type f --exclude .git --follow --hidden set -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND" set -x FLAKE $HOME/p/nixos/nixos-config + source /run/agenix/${config.home.username}-secrets if test (tty) = "/dev/tty1" exec uwsm start -S -F /run/current-system/sw/bin/Hyprland diff --git a/home/features/coding/default.nix b/home/features/coding/default.nix index 7bb97ad..8251a14 100644 --- a/home/features/coding/default.nix +++ b/home/features/coding/default.nix @@ -4,6 +4,7 @@ devpod-desktop (python3.withPackages (ps: with ps; [ + pip # Scientific packages numba numpy diff --git a/home/features/desktop/coding.nix b/home/features/desktop/coding.nix index 9fc0922..83014fa 100644 --- a/home/features/desktop/coding.nix +++ b/home/features/desktop/coding.nix @@ -72,6 +72,13 @@ in { api_url = "http://localhost:11434"; }; }; + ssh_connections = [ + { + host = "152.53.85.162"; + nickname = "m3-atlas"; + args = ["-i" "~/.ssh/m3tam3re"]; + } + ]; auto_update = false; format_on_save = "on"; vim_mode = true; diff --git a/hosts/m3-atlas/services/n8n.nix b/hosts/m3-atlas/services/n8n.nix index 6d49c69..f6b4041 100644 --- a/hosts/m3-atlas/services/n8n.nix +++ b/hosts/m3-atlas/services/n8n.nix @@ -4,6 +4,13 @@ webhookUrl = "https://wf.m3tam3re.com"; }; + systemd.services.n8n = { + environment = { + N8N_EDITOR_BASE_URL = "https://wf.m3tam3re.com"; + N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = "false"; + }; + }; + # Traefik configuration specific to n8n services.traefik.dynamicConfigOptions.http = { services.n8n.loadBalancer.servers = [ diff --git a/hosts/m3-atlas/services/traefik.nix b/hosts/m3-atlas/services/traefik.nix index a72acda..e6a6604 100644 --- a/hosts/m3-atlas/services/traefik.nix +++ b/hosts/m3-atlas/services/traefik.nix @@ -11,6 +11,8 @@ caserver = "https://acme-v02.api.letsencrypt.org/directory"; dnsChallenge = { provider = "godaddy"; + resolvers = ["1.1.1.1:53" "8.8.8.8:53"]; + propagation.delayBeforeChecks = 60; }; }; }; diff --git a/hosts/m3-kratos/configuration.nix b/hosts/m3-kratos/configuration.nix index 56885e4..e0c76e4 100644 --- a/hosts/m3-kratos/configuration.nix +++ b/hosts/m3-kratos/configuration.nix @@ -63,7 +63,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [neovim git]; + environment.systemPackages = with pkgs; [neovim git n8n]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/hosts/m3-kratos/services/n8n.nix b/hosts/m3-kratos/services/n8n.nix index 3751aaa..be43e06 100644 --- a/hosts/m3-kratos/services/n8n.nix +++ b/hosts/m3-kratos/services/n8n.nix @@ -6,6 +6,7 @@ systemd.services.n8n = { environment = { N8N_SECURE_COOKIE = "false"; + N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = "false"; }; }; } diff --git a/overlays/mods/n8n.nix b/overlays/mods/n8n.nix index bc2fdc5..16a4f19 100644 --- a/overlays/mods/n8n.nix +++ b/overlays/mods/n8n.nix @@ -1,17 +1,17 @@ {prev}: prev.n8n.overrideAttrs (oldAttrs: rec { pname = oldAttrs.pname; - version = "1.78.0"; + version = "1.78.1"; src = prev.fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${version}"; - hash = "sha256-ebMuhbUyak13wQ7qWvpNCcmL52J24QPsGmEvIifnzVo="; + hash = "sha256-hFCK9eboOsA3wsrpCs0Vn70zITOttTT3PmV/MtMzV8I="; }; pnpmDeps = prev.pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-1vheGCTGacrQMVJjYrEuv4NC4ImSb+WAbYLXpEithnM="; + hash = "sha256-ggTxmDWnvmzWxj/FpGmsuGyUf9NwN1XxeMLJ20MmEWc="; }; }) diff --git a/pkgs/aider-chat-env/default.nix b/pkgs/aider-chat-env/default.nix index 2873e41..9119bee 100644 --- a/pkgs/aider-chat-env/default.nix +++ b/pkgs/aider-chat-env/default.nix @@ -8,7 +8,7 @@ }: let pythonEnv = python3.withPackages (ps: with ps; [ - # Add any Python packages you want available globally here + pip virtualenv ]); in @@ -27,10 +27,16 @@ in #!/bin/sh VENV_DIR="\$HOME/.aider-chat-venv" if [ ! -d "\$VENV_DIR" ]; then + echo "Creating new virtual environment in \$VENV_DIR..." ${pythonEnv}/bin/python -m venv "\$VENV_DIR" + source "\$VENV_DIR/bin/activate" + # Upgrade pip first + python -m pip install --no-cache-dir --upgrade pip + # Install aider-chat + python -m pip install --no-cache-dir aider-chat + else + source "\$VENV_DIR/bin/activate" fi - source "\$VENV_DIR/bin/activate" - python -m pip install -U aider-chat exec "\$SHELL" EOF chmod +x $out/bin/aider-chat-env