diff --git a/.forgejo/workflows/activate.yml b/.forgejo/workflows/activate.yml index 29bfb2d..fab8702 100644 --- a/.forgejo/workflows/activate.yml +++ b/.forgejo/workflows/activate.yml @@ -19,24 +19,14 @@ jobs: echo "$SSH_KEY" > ./ssh/deploy_key chmod 600 ./ssh/deploy_key - - name: Build and set boot configuration + - name: Rebuild and switch run: | ssh -i ./ssh/deploy_key \ -o PasswordAuthentication=no \ -o StrictHostKeyChecking=no \ -o UserKnownHostsFile=/dev/null \ root@localhost \ - "bash -lc 'nixos-rebuild boot --refresh --flake git+http://localhost:5080/satr14/nix-flake#homelab -L'" - - - name: Activate configuration - continue-on-error: true - run: | - ssh -i ./ssh/deploy_key \ - -o PasswordAuthentication=no \ - -o StrictHostKeyChecking=no \ - -o UserKnownHostsFile=/dev/null \ - root@localhost \ - "bash -lc 'setsid nohup /nix/var/nix/profiles/system/bin/switch-to-configuration switch > /var/log/nixos-switch.log 2>&1 < /dev/null & disown'" + "bash -lc 'nixos-rebuild switch --refresh --flake git+http://localhost:5080/satr14/nix-flake#homelab -L'" - name: Notify on failure if: failure() @@ -48,6 +38,15 @@ jobs: -H "Actions: view, Action Runs, https://git.satr14.my.id/${{ github.repository }}/actions?workflow=activate.yml; view, View Commit, https://git.satr14.my.id/${{ github.repository }}/commit/${{ github.sha }}" \ -d "${{ github.event.head_commit.message }}" + # - name: Notify on success + # if: success() + # run: | + # curl -s -X POST https://notify.proxy.satr14.my.id/git-flake-updates \ + # -H "Title: NixOS Homelab Rebuild Succeeded" \ + # -H "Tags: white_check_mark" \ + # -H "Actions: view, View Commit, https://git.satr14.my.id/${{ github.repository }}/commit/${{ github.sha }}" \ + # -d "${{ github.event.head_commit.message }}" + - name: Clean Up if: always() run: rm -f ./ssh/deploy_key \ No newline at end of file diff --git a/modules/home/rice/compositor.nix b/modules/home/rice/compositor.nix index 1316c62..10e0813 100644 --- a/modules/home/rice/compositor.nix +++ b/modules/home/rice/compositor.nix @@ -89,6 +89,7 @@ "wl-paste --type image --watch cliphist store" "uwsm app -s s -- waybar &" + "uwsm app -s b -- sunshine &" "uwsm app -s b -- blueman-applet &" "uwsm app -s b -- nm-applet &" "uwsm app -s b -- tailscale systray &" diff --git a/modules/system/desktop.nix b/modules/system/desktop.nix index f1e729d..ec264eb 100644 --- a/modules/system/desktop.nix +++ b/modules/system/desktop.nix @@ -22,7 +22,7 @@ package = pkgs.niri-unstable; }; hyprland = { - enable = false; + enable = true; withUWSM = true; xwayland.enable = true; package = pkgs.hyprland; # if rice.enable then inputs.hl.packages."${pkgs.system}".hyprland else pkgs.hyprland;