updates

Author: svnlto

vagrant/.bin/update-aws-config

@@ -7,8 +7,8 @@ set -e
 # Your private Gist ID - Replace this with your actual Gist ID
 GIST_ID="1bf9c10f2f60a2d83505dd5280f1be0d"
 
-# Use custom location to avoid conflicts with home-manager symlinks
-AWS_CONFIG_DIR="$HOME/.aws-custom"
+# Standard AWS location
+AWS_CONFIG_DIR="$HOME/.aws"
 AWS_CONFIG_FILE="$AWS_CONFIG_DIR/config"
 
 echo "Fetching AWS config from GitHub Gist..."
@@ -20,12 +20,11 @@ if ! gh auth status &>/dev/null; then
   echo "GitHub CLI not authenticated. Running 'gh auth login' first..."
   gh auth login
 fi
-# Fetch the gist content directly to our custom location
+# Fetch the gist content directly to our config file
 gh gist view $GIST_ID --raw --filename aws-config >"$AWS_CONFIG_FILE"
 chmod 600 "$AWS_CONFIG_FILE"
 
 echo "✅ AWS config successfully updated from Gist!"
-echo "To use this config, run AWS commands through aws-wrapper or set AWS_CONFIG_FILE=$AWS_CONFIG_FILE"
 
 # Print available profiles
 echo "Available AWS profiles:"

vagrant/aws.nix

@@ -4,43 +4,19 @@
   # Install AWS CLI and related tools
   home.packages = with pkgs; [ awscli2 aws-sso-cli ssm-session-manager-plugin ];
 
-  # Ensure custom AWS directory exists with proper permissions
-  home.activation.setupAwsDir = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    mkdir -p $HOME/.aws-custom
-    chmod 700 $HOME/.aws-custom
-  '';
-
-  # Add a wrapper script that sets AWS_CONFIG_FILE before running aws commands
-  home.file.".bin/aws-wrapper" = {
-    executable = true;
-    text = ''
-      #!/usr/bin/env bash
-      # Wrapper for AWS CLI that uses custom config location
-      export AWS_CONFIG_FILE="$HOME/.aws-custom/config"
-      aws "$@"
-    '';
-  };
-
-  # Add placeholder AWS config file in our custom location
-  home.file.".aws-custom/config".text = ''
-    # This is a placeholder AWS config file.
-    # To load your actual configuration from your private GitHub Gist, run:
-    # $ update-aws-config  (or simply use the alias: uaws)
-    #
-    # This will fetch your AWS configuration securely using your GitHub CLI.
+  # Explicitly tell home-manager not to manage the AWS config file
+  xdg.configFile."aws/config".enable = false;
 
-    # Default fallback configuration
-    [default]
-    region = eu-west-2
-    output = json
+  home.activation.setupAws = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+    # Create AWS directory with proper permissions
+    mkdir -p $HOME/.aws
+    chmod 700 $HOME/.aws
   '';
 
   # Configure ZSH aliases for AWS-related scripts
   programs.zsh.shellAliases = {
     "uaws" = "update-aws-config"; # Short alias for update-aws-config
-    "aws" = "aws-wrapper"; # Use our wrapper for AWS commands
-    "awssso" = "aws-wrapper sso login"; # Quick login to AWS SSO
-    "awswho" =
-      "aws-wrapper sts get-caller-identity"; # Check current AWS identity
+    "awssso" = "aws sso login"; # Quick login to AWS SSO
+    "awswho" = "aws sts get-caller-identity"; # Check current AWS identity
   };
 }