From cc1ee2c7dbadec24a2c8268f2cc11463bcaf2aeb Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Thu, 20 Jul 2023 22:25:26 -0400
Subject: [PATCH] switch back to yaml

---
 .github/dependabot.yml             | 36 ++++++-----------
 .github/workflows/flake-update.yml | 65 +++++++++++-------------------
 modules/nix.nix                    |  2 +-
 3 files changed, 38 insertions(+), 65 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 964fd3e..ad4fff8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,23 +1,13 @@
-{
-  "version": 2,
-  "updates": [
-    {
-      "package-ecosystem": "github-actions",
-      "directory": "/",
-      "schedule": {
-        "interval": "daily",
-        "time": "04:00"
-    },
-  "open-pull-requests-limit": 10,
-  "reviewers": [
-    "Gerg-L"
-  ],
-  "assignees": [
-    "Gerg-L"
-  ],
-  "labels": [
-    "CI"
-  ]
-  }
-]
-}
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  reviewers:
+  - Gerg-L
+  assignees:
+  - Gerg-L
+
diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml
index bd792d1..0b1f353 100644
--- a/.github/workflows/flake-update.yml
+++ b/.github/workflows/flake-update.yml
@@ -1,41 +1,24 @@
-{
-  "name": "flake-update",
-  "on": {
-    "workflow_dispatch": null,
-    "schedule": [
-      {
-        "cron": "0 4 * * *"
-    }
-  ]
-},
-    "jobs": {
-      "lockfile": {
-        "runs-on": "ubuntu-latest",
-        "steps": [
-          {
-            "name": "checkout",
-            "uses": "actions/checkout@v3.5.3"
-        },
-        {
-          "name": "install",
-          "uses": "DeterminateSystems/nix-installer-action@v4"
-          },
-          {
-            "name": "update",
-            "uses": "DeterminateSystems/update-flake-lock@v19",
-            "with": {
-              "pr-title": "Update flake.lock",
-              "pr-labels": "CI"
-              }
-          },
-          {
-            "name": "merge",
-            "run": "gh pr merge ${{ steps.update.outputs.pull-request-number }} --squash --delete-branch\n",
-            "env": {
-              "GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}"
-              }
-          }
-      ]
-}
-}
-}
+name: flake-update
+on:
+  workflow_dispatch: 
+  schedule:
+    - cron: '0 4 * * *' 
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3.5.3
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - name: update
+        uses: DeterminateSystems/update-flake-lock@v19
+        with:
+          pr-title: "Update flake.lock" 
+      - name: merge
+        run: |
+          gh pr merge ${{ steps.update.outputs.pull-request-number }} --squash --delete-branch
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/modules/nix.nix b/modules/nix.nix
index 85d8520..2e06896 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -28,6 +28,6 @@ inputs: {
   };
   #fix for use-xdg-base-directories
   environment.profiles = [
-    "${config.environment.variables.XDG_STATE_HOME or "$HOME/.local/state"}/nix/profile"
+    "\${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile"
   ];
 }