update flake

.gitea/workflows/default.yaml

@@ -1,6 +1,9 @@
 name: Build iso when a new version is pushed
 run-name: iso building
-on: [push]
+on:
+  push:
+    branches:
+      - 'master'
 
 jobs:
   test:
@@ -12,12 +15,46 @@ jobs:
       - name: install nix
         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
         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
-        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

flake.lock

@@ -8,11 +8,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1744173435,
+        "lastModified": 1744903587,
-        "narHash": "sha256-q5cViHmB4k1CdncBUVBY4UUukiKQxgBJ6R18qJ3pHOA=",
+        "narHash": "sha256-Un9rJxwzlgALegN+6eXdPWtrP19dq/Ex6wlxaUJZLv4=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "e7ea586f82360a06ec21f14544bc26b10aa1aea6",
+        "rev": "6fba1be0f816617405d037be62ce39acb93693cc",
         "type": "gitlab"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744208565,
+        "lastModified": 1744902080,
-        "narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
+        "narHash": "sha256-px7OEMQYhS9StY3sTYYeM/jJspk6SXgoPU7OmOSx+1c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
+        "rev": "2c71aae678c03a39c2542e136b87bd040ae1b3cb",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1743420942,
+        "lastModified": 1744633460,
-        "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
+        "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
+        "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744098102,
+        "lastModified": 1744463964,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
         "type": "github"
       },
       "original": {

homeConfigs/hosts/iso.nix

@@ -1,5 +1,5 @@
 { lib, pkgs, ... }:
 
 {
-	mods.discord.enable = false;
+	mods.nonChromium.enable = false;
 }

homeConfigs/modules/discord.nix

@@ -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
-	];
-  };
-}

homeConfigs/modules/nonChromium.nix

@@ -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
+	];
+  };
+}

homeConfigs/modules/wayland/hyprland.nix

@@ -13,7 +13,7 @@
     wayland.windowManager.hyprland.settings = {
       "$mainMod" = "SUPER";
       bind = [
-  	  " , Print, exec, grim -t jpeg -g \"$(slurp)\" ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg"
+  	  " , Print, exec, grim -t png -g \"$(slurp)\" /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
         "$mainMod, Return, exec, alacritty"
         "CTRL_ALT, Q, killactive,"
         "SUPER_ALT, Q, exit,"

homeConfigs/modules/wayland/waybar.nix

@@ -51,6 +51,13 @@
       #temperature.critical {
         color: #ff2222; 
       }
+
+      #battery.critical {
+        color: #ff2222; 
+      }
+      #cpu.high {
+        color: #ff2222; 
+      }
     '';
 
     programs.waybar.settings.mainBar = {
@@ -61,7 +68,7 @@
       margin-right = 5;
       modules-left = ["hyprland/workspaces" "custom/music"];
       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" = {
         disable-scroll = true;
@@ -76,7 +83,8 @@
       };
     
       cpu = {
-        format = "   {usage}% |";
+        format = "   {usage}% ";
+		states.high = 80;
     	interval = 5;
       };
     
@@ -87,13 +95,15 @@
     
       battery = {
         bat = "BAT0";
+		full-at = 79;
         states = {
-          good = 79;
+          good = 20;
-          warning = 30;
           critical = 15;
         };
         format-time = " {H}:{m}";
-        format = " {icon} {capacity}%{time} |";
+        format-discharging = " {icon} {capacity}%{time} |";
+		format-charging = "  {capacity}%{time} |";
+		format-plugged = "";
         format-icons = [" " " " " " " " " "];
         interval = 10;
       };