+hostname setting

flake.lock

@@ -6,43 +6,25 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1744363797,
+        "lastModified": 1744286132,
-        "narHash": "sha256-Zn8TIOonPBQojN5NZ9Q+y6hvwAKFvW+iLXiceGNQ40o=",
+        "narHash": "sha256-b+QaraEq2KS6X3PeAcm2J0afIQjvUEJ61Oj1OHiELzA=",
         "ref": "stable",
-        "rev": "45622da8ac40d404e59fa1eff9f63e42b7b95e2b",
+        "rev": "dd405780a03515688101b0b66c8757ce817f1ad7",
-        "revCount": 10,
+        "revCount": 9,
         "type": "git",
-        "url": "https://code.m3ta.dev/m3tam3re/self-host-playbook-base"
+        "url": "https://code.m3tam3re.com/m3tam3re/self-host-playbook-base"
       },
       "original": {
         "ref": "stable",
         "type": "git",
-        "url": "https://code.m3ta.dev/m3tam3re/self-host-playbook-base"
+        "url": "https://code.m3tam3re.com/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,
@@ -58,22 +40,6 @@
         "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,
@@ -106,61 +72,17 @@
         "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": "deploy-rs",
+        "deploy-rs": [
+          "nixpkgs"
+        ],
         "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.m3ta.dev/m3tam3re/self-host-playbook-base?ref=stable";
+      url = "git+https://code.m3tam3re.com/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.${jsonConfig.hostname} = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.server = 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.${jsonConfig.hostname};
+          self.nixosConfigurations.server;
       };
     };
   };

install.sh

@@ -50,7 +50,7 @@ fi
 get_latest_version() {
     local LATEST_VERSION
 
-    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)
+    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)
 
     if [ -z "$latest_version" ]; then
         echo "❌ Error: Could not fetch latest version from repository"
@@ -83,7 +83,7 @@ setup_latest_version() {
     mkdir -p "$CLONE_DIR"
 
     # Clone to temporary directory with --quiet flag
-    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
+    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
         echo "❌ Failed to clone repository"
         return 1
     fi
@@ -424,8 +424,7 @@ cat > config.json << EOF
     "baserow": "$BASEROW_DOMAIN"
   },
   "rootDevice": "$DEVICE_NAME",
-  "ipAddress": "$IP_ADDRESS",
+  "ipAddress": "$IP_ADDRESS"
-  "hostname": "$HOSTNAME"
 }
 EOF
 

update.sh

@@ -28,7 +28,7 @@ get_current_version() {
 get_latest_version() {
     local latest_version
 
-    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)
+    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)
 
     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.m3ta.dev/m3tam3re/self-host-playbook/raw/branch/develop/v${target_version}/$version_file" | jq -r '.minCompatibleVersion')
+    min_compatible_version=$(curl -s "https://code.m3tam3re.com/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.m3ta.dev/m3tam3re/self-host-playbook/raw/branch/develop/v${target_version}/$version_file" | jq -r '.changelog')
+    changelog=$(curl -s "https://code.m3tam3re.com/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,6 +87,13 @@ 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
+    fi
+
     # Verify essential files exist before proceeding
     if [ ! -f "config.json" ] || [ ! -d "env" ]; then
         echo "❌ Error: Essential files missing. Are you in the correct directory?"
@@ -103,7 +110,7 @@ perform_update() {
     mkdir -p "$CLONE_DIR"
 
     # Clone to temporary directory with --quiet flag
-    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
+    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
         echo "❌ Failed to clone repository"
         return 1
     fi

version.json

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