From 486e8146208279a72979e81370085f2bd29020ca Mon Sep 17 00:00:00 2001
From: Gabriel Guillou <pikatsuto@gmail.com>
Date: Thu, 24 Oct 2024 11:38:56 +0200
Subject: [PATCH] Nightly (#6)

* feat: add build test (#3)

* Testing (#5)

* feat: add build test

* feat: update action

* feat: setup hyprlock
---
 .github/workflows/auto_nigthly.yml | 28 ----------------------------
 .github/workflows/auto_release.yml |  2 ++
 .github/workflows/auto_testing.yml | 28 ----------------------------
 package.nix                        |  4 ++--
 src/rofi-power                     |  2 +-
 5 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/auto_nigthly.yml b/.github/workflows/auto_nigthly.yml
index 61b1940..fe979e7 100644
--- a/.github/workflows/auto_nigthly.yml
+++ b/.github/workflows/auto_nigthly.yml
@@ -58,31 +58,3 @@ jobs:
           files: |
             ./${{ env.FILE_NAME }}
             ./package.nix
-
-      - name: Clone RevoluNixPKGS
-        uses: actions/checkout@master
-        with:
-          ref: nightly
-          repository: RevoluNix/revolunixpkgs
-          token: ${{ secrets.RevoluNixPKGS_TOKEN }}
-
-      - name: Update RevoluNixPKGS
-        id: update_pkgs
-        run: |
-          git config --global user.email "${{ github.event.pusher.email }}"
-          git config --global user.name "${{ github.event.pusher.name }}"
-          
-          URL="https://github.com/${{ github.repository }}/releases/download/${{ env.TAG_NAME }}/package.nix"
-          rm -rf ./pkgs/${{ env.PKG_NAME }}
-          mkdir -p ./pkgs/${{ env.PKG_NAME }}
-          wget -O ./pkgs/${{ env.PKG_NAME }}/package.nix $URL
-          
-          git add .
-          git commit -m "feat: Update/Upload ${{ env.PKG_NAME }} package"
-          
-      - name: Push RevoluNixPKGS changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.RevoluNixPKGS_TOKEN }}
-          repository: RevoluNix/revolunixpkgs
-          branch: nightly
diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index 1d77a72..d7dea30 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -60,6 +60,7 @@ jobs:
       - name: Clone RevoluNixPKGS
         uses: actions/checkout@master
         with:
+          ref: testing
           repository: RevoluNix/revolunixpkgs
           token: ${{ secrets.RevoluNixPKGS_TOKEN }}
 
@@ -82,3 +83,4 @@ jobs:
         with:
           github_token: ${{ secrets.RevoluNixPKGS_TOKEN }}
           repository: RevoluNix/revolunixpkgs
+          branch: testing
diff --git a/.github/workflows/auto_testing.yml b/.github/workflows/auto_testing.yml
index 67f1c2a..c20f478 100644
--- a/.github/workflows/auto_testing.yml
+++ b/.github/workflows/auto_testing.yml
@@ -58,31 +58,3 @@ jobs:
           files: |
             ./${{ env.FILE_NAME }}
             ./package.nix
-
-      - name: Clone RevoluNixPKGS
-        uses: actions/checkout@master
-        with:
-          ref: testing
-          repository: RevoluNix/revolunixpkgs
-          token: ${{ secrets.RevoluNixPKGS_TOKEN }}
-
-      - name: Update RevoluNixPKGS
-        id: update_pkgs
-        run: |
-          git config --global user.email "${{ github.event.pusher.email }}"
-          git config --global user.name "${{ github.event.pusher.name }}"
-          
-          URL="https://github.com/${{ github.repository }}/releases/download/${{ env.TAG_NAME }}/package.nix"
-          rm -rf ./pkgs/${{ env.PKG_NAME }}
-          mkdir -p ./pkgs/${{ env.PKG_NAME }}
-          wget -O ./pkgs/${{ env.PKG_NAME }}/package.nix $URL
-          
-          git add .
-          git commit -m "feat: Update/Upload ${{ env.PKG_NAME }} package"
-          
-      - name: Push RevoluNixPKGS changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.RevoluNixPKGS_TOKEN }}
-          repository: RevoluNix/revolunixpkgs
-          branch: testing
diff --git a/package.nix b/package.nix
index 7ca0dd9..3e6fc8e 100644
--- a/package.nix
+++ b/package.nix
@@ -3,7 +3,7 @@
   lib,
   makeWrapper,
   rofi-wayland,
-  swaylock-effects,
+  hyprlock,
 }:
 ############
 # Packages #
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   # ----------------------------------------------------------------- #
   postFixup = ''
     wrapProgram $out/bin/${finalAttrs.pname} \
-      --prefix PATH : ${lib.makeBinPath [ rofi-wayland swaylock-effects ]}
+      --prefix PATH : ${lib.makeBinPath [ rofi-wayland hyprlock ]}
   '';
   # ----------------------------------------------------------------- #
   meta = {
diff --git a/src/rofi-power b/src/rofi-power
index 95abcb7..a736d42 100644
--- a/src/rofi-power
+++ b/src/rofi-power
@@ -90,7 +90,7 @@ confirm_run () {
 # Execute Command
 run_cmd() {
 	if [[ "$1" == '--opt1' ]]; then
-    lockscreen
+    hyprlock
 	elif [[ "$1" == '--opt2' ]]; then
 		confirm_run 'kill -9 -1'
 	elif [[ "$1" == '--opt3' ]]; then