flake source url change in shellscripts

flake.lock

@@ -6,25 +6,43 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1744286132,
-        "narHash": "sha256-b+QaraEq2KS6X3PeAcm2J0afIQjvUEJ61Oj1OHiELzA=",
+        "lastModified": 1744363797,
+        "narHash": "sha256-Zn8TIOonPBQojN5NZ9Q+y6hvwAKFvW+iLXiceGNQ40o=",
         "ref": "stable",
-        "rev": "dd405780a03515688101b0b66c8757ce817f1ad7",
-        "revCount": 9,
+        "rev": "45622da8ac40d404e59fa1eff9f63e42b7b95e2b",
+        "revCount": 10,
         "type": "git",
-        "url": "https://code.m3tam3re.com/m3tam3re/self-host-playbook-base"
+        "url": "https://code.m3ta.dev/m3tam3re/self-host-playbook-base"
       },
       "original": {
         "ref": "stable",
         "type": "git",
-        "url": "https://code.m3tam3re.com/m3tam3re/self-host-playbook-base"
+        "url": "https://code.m3ta.dev/m3tam3re/self-host-playbook-base"
+      }
+    },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1727447169,
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
       }
     },
     "disko": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": ["nixpkgs"]
       },
       "locked": {
         "lastModified": 1744145203,
@@ -40,6 +58,22 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1741600792,
@@ -72,17 +106,61 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "base-config": "base-config",
-        "deploy-rs": [
-          "nixpkgs"
-        ],
+        "deploy-rs": "deploy-rs",
         "disko": "disko",
-        "nixpkgs": [
-          "base-config",
-          "nixpkgs"
-        ]
+        "nixpkgs": ["base-config", "nixpkgs"]
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -4,7 +4,7 @@
   inputs = {
     base-config = {
       # url = "path:/home/m3tam3re/p/nix/self-host-playbook-base";
-      url = "git+https://code.m3tam3re.com/m3tam3re/self-host-playbook-base?ref=stable";
+      url = "git+https://code.m3ta.dev/m3tam3re/self-host-playbook-base?ref=stable";
     };
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-24.11";
@@ -28,7 +28,7 @@
   } @ inputs: let
     jsonConfig = builtins.fromJSON (builtins.readFile ./config.json);
   in {
-    nixosConfigurations.server = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.${jsonConfig.hostname} = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
         (base-config.nixosModules.default {
@@ -50,7 +50,7 @@
         interactiveSudo = true;
         path =
           deploy-rs.lib.x86_64-linux.activate.nixos
-          self.nixosConfigurations.server;
+          self.nixosConfigurations.${jsonConfig.hostname};
       };
     };
   };

install.sh

@@ -50,7 +50,7 @@ fi
 get_latest_version() {
     local LATEST_VERSION
 
-    latest_version=$(curl -s "https://code.m3tam3re.com/api/v1/repos/m3tam3re/self-host-playbook/tags" | jq -r '.[] | select(.name | startswith("v")) | .name' | sort -V | tail -n1)
+    latest_version=$(curl -s "https://code.m3ta.dev/api/v1/repos/m3tam3re/self-host-playbook/tags" | jq -r '.[] | select(.name | startswith("v")) | .name' | sort -V | tail -n1)
 
     if [ -z "$latest_version" ]; then
         echo "❌ Error: Could not fetch latest version from repository"
@@ -71,7 +71,7 @@ setup_latest_version() {
         echo "❌ Error: Must be in 'self-host-playbook' directory to setup latest version"
         echo "Current directory: $(pwd)"
         return 1
-    }
+    fi
 
     echo "⬇️ Downloading version $target_version..."
 
@@ -83,16 +83,16 @@ setup_latest_version() {
     mkdir -p "$CLONE_DIR"
 
     # Clone to temporary directory with --quiet flag
-    if ! nix flake clone --quiet "git+https://code.m3tam3re.com/m3tam3re/self-host-playbook?ref=v${target_version}" --dest "$CLONE_DIR" 2>/dev/null; then
+    if ! nix flake clone --quiet "git+https://code.m3ta.dev/m3tam3re/self-host-playbook?ref=v${target_version}" --dest "$CLONE_DIR" 2>/dev/null; then
         echo "❌ Failed to clone repository"
         return 1
-    }
+    fi
 
     # Additional safety check before copying files
     if [ ! -f "$CLONE_DIR/flake.nix" ]; then
         echo "❌ Error: Downloaded content doesn't appear to be a valid self-host-playbook"
         return 1
-    }
+    fi
 
     # Copy files from clone to target directory
     cp -r "$CLONE_DIR"/* "$dir_name/"
@@ -107,7 +107,7 @@ setup_from_template() {
     if [ "$current_dir" != "self-host-playbook" ]; then
         echo "❌ Error: Must be in 'self-host-playbook' directory"
         exit 1
-    }
+    fi
 
     # Create backup if directory is not empty
     if [ -n "$(ls -A)" ]; then
@@ -119,7 +119,7 @@ setup_from_template() {
         if [ ! -d "$backup_dir" ]; then
             echo "❌ Error: Failed to create backup directory"
             exit 1
-        fi  # Fixed: Changed } to fi
+        fi
 
         find . -maxdepth 1 ! -name "." ! -name ".." ! -name "$backup_dir" -exec cp -r {} "$backup_dir/" \;
         echo "✅ Backup created successfully"
@@ -294,11 +294,11 @@ SSH_PUB_KEY=$(cat "${SSH_KEY_PATH}.pub") || {
 echo
 echo "🔑 Here is your public key:"
 echo
-cat $SSH_KEY_PATH.pub
+cat "$SSH_KEY_PATH.pub"
 echo ""
 echo "📁 You can also find the keyfile here:"
 echo
-echo $SSH_KEY_PATH.pub
+echo "$SSH_KEY_PATH.pub"
 echo
 read -p "Press ENTER to continue or CTRL + C to abort..."
 
@@ -323,7 +323,7 @@ read -p "   - Domain for Portainer: " PORTAINER_DOMAIN
 read -p "   - Domain for n8n: " N8N_DOMAIN
 read -p "   - Domain for Baserow: " BASEROW_DOMAIN
 echo
-echo "5. How do you authentiate to the target machine?"
+echo "6. How do you authenticate to the target machine?"
 echo "-------------------------------------------"
 echo "   1) Password"
 echo "   2) SSH Key"
@@ -346,7 +346,7 @@ esac
 setup_from_template
 
 echo
-echo "6. Select your cloud provider:"
+echo "7. Select your cloud provider:"
 echo "   1) AWS (Newer instances with NVMe)"
 echo "   2) AWS (Older instances)"
 echo "   3) Google Cloud Platform"
@@ -424,7 +424,8 @@ cat > config.json << EOF
     "baserow": "$BASEROW_DOMAIN"
   },
   "rootDevice": "$DEVICE_NAME",
-  "ipAddress": "$IP_ADDRESS"
+  "ipAddress": "$IP_ADDRESS",
+  "hostname": "$HOSTNAME"
 }
 EOF
 

update.sh

@@ -26,9 +26,9 @@ get_current_version() {
 }
 
 get_latest_version() {
-    local LATEST_VERSION
+    local latest_version
 
-    latest_version=$(curl -s "https://code.m3tam3re.com/api/v1/repos/m3tam3re/self-host-playbook/tags" | jq -r '.[] | select(.name | startswith("v")) | .name' | sort -V | tail -n1)
+    latest_version=$(curl -s "https://code.m3ta.dev/api/v1/repos/m3tam3re/self-host-playbook/tags" | jq -r '.[] | select(.name | startswith("v")) | .name' | sort -V | tail -n1)
 
     if [ -z "$latest_version" ]; then
         echo "❌ Error: Could not fetch latest version from repository"
@@ -51,7 +51,7 @@ check_compatibility() {
     fi
 
     local min_compatible_version
-    min_compatible_version=$(curl -s "https://code.m3tam3re.com/m3tam3re/self-host-playbook/raw/branch/develop/v${target_version}/$version_file" | jq -r '.minCompatibleVersion')
+    min_compatible_version=$(curl -s "https://code.m3ta.dev/m3tam3re/self-host-playbook/raw/branch/develop/v${target_version}/$version_file" | jq -r '.minCompatibleVersion')
 
     if version_lt "$current_version" "$min_compatible_version"; then
         echo "❌ Your current version ($current_version) is too old for direct upgrade."
@@ -71,7 +71,7 @@ show_changelog() {
     echo "------------------------------------------------"
 
     local changelog
-    changelog=$(curl -s "https://code.m3tam3re.com/m3tam3re/self-host-playbook/raw/branch/develop/v${target_version}/$version_file" | jq -r '.changelog')
+    changelog=$(curl -s "https://code.m3ta.dev/m3tam3re/self-host-playbook/raw/branch/develop/v${target_version}/$version_file" | jq -r '.changelog')
 
     # Process each version once, then all its changes
     echo "$changelog" | jq -r --arg cv "$current_version" --arg tv "$target_version" '
@@ -87,18 +87,11 @@ perform_update() {
     local target_version=$1
     local backup_dir=$2
 
-    # Ensure we're in the correct directory
-    local current_dir=$(basename "$(pwd)")
-    if [ "$current_dir" != "self-host-playbook" ]; then
-        echo "❌ Error: Must be in 'self-host-playbook' directory"
-        return 1
-    }
-
     # Verify essential files exist before proceeding
     if [ ! -f "config.json" ] || [ ! -d "env" ]; then
         echo "❌ Error: Essential files missing. Are you in the correct directory?"
         return 1
-    }
+    fi
 
     echo "⬇️ Downloading version $target_version..."
 
@@ -110,16 +103,16 @@ perform_update() {
     mkdir -p "$CLONE_DIR"
 
     # Clone to temporary directory with --quiet flag
-    if ! nix flake clone --quiet "git+https://code.m3tam3re.com/m3tam3re/self-host-playbook?ref=v${target_version}" --dest "$CLONE_DIR" 2>/dev/null; then
+    if ! nix flake clone --quiet "git+https://code.m3ta.dev/m3tam3re/self-host-playbook?ref=v${target_version}" --dest "$CLONE_DIR" 2>/dev/null; then
         echo "❌ Failed to clone repository"
         return 1
-    }
+    fi
 
     # Verify downloaded content
     if [ ! -f "$CLONE_DIR/flake.nix" ]; then
         echo "❌ Error: Downloaded content appears invalid"
         return 1
-    }
+    fi
 
     # Remove current directory contents except backup
     echo "🗑️ Cleaning current directory..."
@@ -133,7 +126,7 @@ perform_update() {
     if [ ! -f "flake.nix" ]; then
         echo "❌ Error: Failed to copy new version files"
         return 1
-    }
+    fi
 
     # Restore configuration files from backup with validation
     echo "🔄 Restoring configuration files..."
@@ -142,14 +135,14 @@ perform_update() {
             echo "❌ Error: Failed to restore config.json"
             return 1
         }
-    }
+    fi
 
     if [ -d "${backup_dir}/env" ]; then
         cp -r "${backup_dir}/env" . || {
             echo "❌ Error: Failed to restore env directory"
             return 1
         }
-    }
+    fi
 
     return 0
 }
@@ -157,28 +150,24 @@ perform_update() {
 setup_ssh_config() {
     local username=$1
     local ip_address=$2
-    local hostname=$3  # Add hostname parameter
+    local hostname=$3
     local ssh_config_dir="$HOME/.ssh"
     local ssh_config_file="$ssh_config_dir/config"
     local ssh_key_file="$ssh_config_dir/self-host-playbook"
 
-    # Create .ssh directory if it doesn't exist
     mkdir -p "$ssh_config_dir"
     chmod 700 "$ssh_config_dir"
 
-    # Create or append to SSH config using hostname as the Host name
     local config_entry="Host $hostname
     HostName $ip_address
     User $username
     Port 2222
     IdentityFile $ssh_key_file"
 
-    # Check if entry already exists
     if ! grep -q "Host $hostname" "$ssh_config_file" 2>/dev/null; then
         echo -e "\n$config_entry" >> "$ssh_config_file"
         echo "✅ Added SSH config entry"
     else
-        # Update existing entry
         sed -i.bak "/Host $hostname/,/IdentityFile.*/{
             s/HostName.*/HostName $ip_address/
             s/User.*/User $username/
@@ -186,7 +175,6 @@ setup_ssh_config() {
         echo "✅ Updated existing SSH config entry"
     fi
 
-    # Set appropriate permissions
     chmod 600 "$ssh_config_file"
 }
 
@@ -195,18 +183,15 @@ update_config_value() {
     local value=$2
     local config_file="config.json"
 
-    # Read existing config
     local config
     config=$(cat "$config_file")
 
-    # Update or add the field
     if jq -e ".$key" "$config_file" >/dev/null 2>&1; then
         config=$(echo "$config" | jq --arg key "$key" --arg value "$value" '.[$key] = $value')
     else
         config=$(echo "$config" | jq --arg key "$key" --arg value "$value" '. + {($key): $value}')
     fi
 
-    # Write back to file
     echo "$config" | jq '.' > "$config_file"
     echo "✅ Updated $key in config.json"
 }
@@ -214,13 +199,11 @@ update_config_value() {
 install_deploy_rs() {
     echo "🔧 Installing deploy-rs to user environment..."
 
-    # Check if deploy is already installed
     if command -v deploy >/dev/null 2>&1; then
         echo "ℹ️ deploy-rs is already installed"
         return 0
     fi
 
-    # Install deploy-rs using nix profile
     if nix profile install 'github:serokell/deploy-rs'; then
         echo "✅ deploy-rs installed successfully"
     else
@@ -229,12 +212,10 @@ install_deploy_rs() {
     fi
 }
 
-
 # Main script
 echo "🔄 Self-Host Playbook Update Assistant"
 echo "======================================"
 
-# Check if we're in the right directory
 if [ ! -f "config.json" ]; then
     echo "❌ Error: config.json not found. Please run this script in your self-host-playbook directory."
     exit 1
@@ -249,33 +230,27 @@ if [ -z "$USERNAME" ]; then
     exit 1
 fi
 
-# If IP address is not in config.json, prompt for it
 if [ -z "$IP_ADDRESS" ]; then
     echo "ℹ️ No IP address found in config.json"
     read -p "Enter the IP address of your server: " IP_ADDRESS
 
-    # Validate IP address format
     if ! [[ $IP_ADDRESS =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
         echo "❌ Error: Invalid IP address format"
         exit 1
     fi
 
-    # Update config.json with the new IP address
     update_config_value "ipAddress" "$IP_ADDRESS"
 fi
 
-# If hostname is not in config.json, prompt for it
 if [ -z "$HOSTNAME" ]; then
     echo "ℹ️ No hostname found in config.json"
     read -p "Enter the hostname for your server: " HOSTNAME
 
-    # Validate hostname format (basic validation)
     if ! [[ $HOSTNAME =~ ^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)*$ ]]; then
         echo "❌ Error: Invalid hostname format"
         exit 1
     fi
 
-    # Update config.json with the new hostname
     update_config_value "hostname" "$HOSTNAME"
 fi
 
@@ -303,18 +278,14 @@ read -p "Do you want to update to version $LATEST_VERSION? (y/N) " -n 1 -r
 echo
 
 if [[ $REPLY =~ ^[Yy]$ ]]; then
-    # Create backup
     backup_dir="backup_${CURRENT_VERSION}_$(date +%Y%m%d_%H%M%S)"
     echo "📑 Creating backup in $backup_dir..."
     mkdir -p "$backup_dir"
     find . -maxdepth 1 ! -name "." ! -name ".." ! -name "$backup_dir" -exec cp -r {} "$backup_dir/" \;
 
-
-    # Perform update
     if perform_update "$LATEST_VERSION" "$backup_dir"; then
         echo
         echo "✅ Update completed successfully!"
-        # Setup SSH configuration
         echo
         echo "🔧 Setting up SSH configuration..."
         setup_ssh_config "$USERNAME" "$IP_ADDRESS" "$HOSTNAME"

version.json

@@ -1,7 +1,7 @@
 {
   "version": "0.1.0",
   "minCompatibleVersion": "0.0.0",
-  "updateUrl": "https://code.m3tam3re.com/m3tam3re/self-host-playbook",
+  "updateUrl": "https://code.m3ta.dev/m3tam3re/self-host-playbook",
   "changelog": {
     "0.1.0": [
       "Added a management CLI for easily adding custom services.",