Compare commits
15 Commits
9defcf7ad4
...
4d14020
Author | SHA1 | Date | |
---|---|---|---|
4d140208b3 | |||
d965848b31 | |||
a6eaa69a1c | |||
2eeff79ea0 | |||
7044d1eebb | |||
ca2a2a8e8d | |||
a5762a6a45 | |||
d5df83a046 | |||
1c38dc5686 | |||
b55c6baf47 | |||
7887f3c650 | |||
de34ac63af | |||
64f4635618 | |||
fbdc5b8810 | |||
0baab5a237 |
@ -1,6 +1,9 @@
|
|||||||
name: Build iso when a new version is pushed
|
name: Build iso when a new version is pushed
|
||||||
run-name: iso building
|
run-name: iso building
|
||||||
on: [push]
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- 'master'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@ -12,12 +15,46 @@ jobs:
|
|||||||
- name: install nix
|
- name: install nix
|
||||||
uses: https://github.com/cachix/install-nix-action@v31
|
uses: https://github.com/cachix/install-nix-action@v31
|
||||||
|
|
||||||
|
- name: install go
|
||||||
|
uses: https://github.com/actions/setup-go@v4
|
||||||
|
with:
|
||||||
|
go-version: '>=1.20.1'
|
||||||
|
|
||||||
- name: build iso
|
- name: build iso
|
||||||
run: make iso
|
run: make iso
|
||||||
|
|
||||||
|
- name: get commit tag
|
||||||
|
id: vars
|
||||||
|
run: echo "TAG=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: create tag
|
||||||
|
run: |
|
||||||
|
git config user.name "gitea-actions"
|
||||||
|
git config user.email "actions@gitea.com"
|
||||||
|
git tag ${{steps.vars.outputs.TAG}}
|
||||||
|
git push origin ${{steps.vars.outputs.TAG}}
|
||||||
|
|
||||||
- name: create release
|
- name: create release
|
||||||
uses: https://gitea.com/actions/release-action@main
|
run: |
|
||||||
with:
|
AUTH_TOKEN=${{secrets.RELEASE_TOKEN}}
|
||||||
files: |-
|
TAG_NAME=${{steps.vars.outputs.TAG}}
|
||||||
nixos.iso
|
owner=tom
|
||||||
api_key: '${{secrets.RELEASE_TOKEN}}'
|
repo=nix-config
|
||||||
|
set -e
|
||||||
|
release_create_res=$(curl -X POST -H "Authorization: token $AUTH_TOKEN" -H "content-type: application/json" -d "{\"tag_name\":\"$TAG_NAME\",\"name\":\"$TAG_NAME\"}" "https://git.tmoron.fr/api/v1/repos/$owner/$repo/releases" 2>/dev/null)
|
||||||
|
|
||||||
|
release_id=$(echo $release_create_res | jq -r .id)
|
||||||
|
echo $release_id
|
||||||
|
|
||||||
|
if [ $release_id == "null" ]; then
|
||||||
|
echo error
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
file_send_res=$(curl \
|
||||||
|
"https://git.tmoron.fr/api/v1/repos/$owner/$repo/releases/$release_id/assets?name=nixos.iso"\
|
||||||
|
-H "Authorization: token $AUTH_TOKEN"\
|
||||||
|
-H "accept: application/json"\
|
||||||
|
-H "Content-Type: multipart/form-data"\
|
||||||
|
-F "attachment=@nixos.iso" 2>/dev/null)
|
||||||
|
echo $file_send_res
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
mods.discord.enable = false;
|
mods.nonChromium.enable = false;
|
||||||
}
|
}
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
options.mods.discord.enable = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "install discord";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf config.mods.discord.enable {
|
|
||||||
home.packages = with pkgs;[
|
|
||||||
discord
|
|
||||||
google-chrome
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
16
homeConfigs/modules/nonChromium.nix
Normal file
16
homeConfigs/modules/nonChromium.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
options.mods.nonChromium.enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "all chromium/electron based application can't be built by act-runner, so they can't be in the iso";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.mods.nonChromium.enable {
|
||||||
|
home.packages = with pkgs;[
|
||||||
|
discord
|
||||||
|
google-chrome
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
@ -51,6 +51,13 @@
|
|||||||
#temperature.critical {
|
#temperature.critical {
|
||||||
color: #ff2222;
|
color: #ff2222;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#battery.critical {
|
||||||
|
color: #ff2222;
|
||||||
|
}
|
||||||
|
#cpu.high {
|
||||||
|
color: #ff2222;
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
programs.waybar.settings.mainBar = {
|
programs.waybar.settings.mainBar = {
|
||||||
@ -61,7 +68,7 @@
|
|||||||
margin-right = 5;
|
margin-right = 5;
|
||||||
modules-left = ["hyprland/workspaces" "custom/music"];
|
modules-left = ["hyprland/workspaces" "custom/music"];
|
||||||
modules-center = ["hyprland/window"];
|
modules-center = ["hyprland/window"];
|
||||||
modules-right = ["disk" "pulseaudio" "network" "custom/pipe" "cpu" "temperature" "custom/pipe" "memory" "battery" "clock"];
|
modules-right = ["disk" "pulseaudio" "network" "custom/pipe" "cpu" "custom/pipe" "temperature" "custom/pipe" "memory" "battery" "clock"];
|
||||||
|
|
||||||
"hyprland/workspaces" = {
|
"hyprland/workspaces" = {
|
||||||
disable-scroll = true;
|
disable-scroll = true;
|
||||||
@ -76,8 +83,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
cpu = {
|
cpu = {
|
||||||
format = " {usage}% |";
|
format = " {usage}% ";
|
||||||
interval = 5;
|
states.high = 80;
|
||||||
|
interval = 5;
|
||||||
};
|
};
|
||||||
|
|
||||||
memory = {
|
memory = {
|
||||||
@ -87,13 +95,15 @@
|
|||||||
|
|
||||||
battery = {
|
battery = {
|
||||||
bat = "BAT0";
|
bat = "BAT0";
|
||||||
|
full-at = 79;
|
||||||
states = {
|
states = {
|
||||||
good = 79;
|
good = 20;
|
||||||
warning = 30;
|
|
||||||
critical = 15;
|
critical = 15;
|
||||||
};
|
};
|
||||||
format-time = " {H}:{m}";
|
format-time = " {H}:{m}";
|
||||||
format = " {icon} {capacity}%{time} |";
|
format-discharging = " {icon} {capacity}%{time} |";
|
||||||
|
format-charging = " {capacity}%{time} |";
|
||||||
|
format-plugged = "";
|
||||||
format-icons = [" " " " " " " " " "];
|
format-icons = [" " " " " " " " " "];
|
||||||
interval = 10;
|
interval = 10;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user