second try of final build

.gitea/workflows/default.yaml

@@ -8,13 +8,50 @@ jobs:
     steps:
       - name: get repo
         uses: actions/checkout@v4.2.2
-      #      - uses: https://github.com/cachix/install-nix-action@v31
-      #      - name: create iso image
-      #        run: make iso
+
+      - 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
-        with:
-          files: |-
-            nixos.iso
-          api_key: '${{secrets.RELEASE_TOKEN}}'
+        run: |
+          AUTH_TOKEN=${{secrets.RELEASE_TOKEN}}
+          TAG_NAME=${{steps.vars.outputs.TAG}}
+          owner=tom
+          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

@@ -2,18 +2,17 @@
   "nodes": {
     "firefox-addons": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1743119709,
-        "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
+        "lastModified": 1744173435,
+        "narHash": "sha256-q5cViHmB4k1CdncBUVBY4UUukiKQxgBJ6R18qJ3pHOA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
+        "rev": "e7ea586f82360a06ec21f14544bc26b10aa1aea6",
         "type": "gitlab"
       },
       "original": {
@@ -23,21 +22,6 @@
         "type": "gitlab"
       }
     },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1629284811,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -45,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743345555,
-        "narHash": "sha256-Df8PxfWYF/z6RWcsKuXSks/FOCOCA7EiRdlWE2u0rRc=",
+        "lastModified": 1744208565,
+        "narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2760046f34780cc72f67e06240ccf6a7a3ae3765",
+        "rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
         "type": "github"
       },
       "original": {
@@ -60,11 +44,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1743167577,
-        "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
+        "lastModified": 1743420942,
+        "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
+        "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
         "type": "github"
       },
       "original": {
@@ -76,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743095683,
-        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
+        "lastModified": 1744098102,
+        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
+        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
         "type": "github"
       },
       "original": {
@@ -90,6 +74,22 @@
         "type": "github"
       }
     },
+    "pkgs-docker-2750": {
+      "locked": {
+        "lastModified": 1737525964,
+        "narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
+        "type": "github"
+      }
+    },
     "plymouth-theme-ycontre-glow": {
       "inputs": {
         "nixpkgs": [
@@ -116,6 +116,7 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "pkgs-docker-2750": "pkgs-docker-2750",
         "plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
       }
     }

flake.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:24 by tomoron           #+#    #+#              #
-#    Updated: 2025/03/19 15:48:10 by tomoron          ###   ########.fr        #
+#    Updated: 2025/04/13 13:35:56 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -30,6 +30,7 @@
       url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
       inputs.nixpkgs.follows = "nixpkgs";
 	};
+	pkgs-docker-2750.url = "github:NixOS/nixpkgs?rev=5757bbb8bd7c0630a0cc4bb19c47e588db30b97c";
   };
 
   outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs:

homeConfigs/hosts/iso.nix

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

homeConfigs/modules/discord.nix

@@ -0,0 +1,16 @@
+{ 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/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;
-          warning = 30;
+          good = 20;
           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;
       };

homeConfigs/packages.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 22:01:56 by tomoron           #+#    #+#              #
-#    Updated: 2025/03/27 18:53:17 by tomoron          ###   ########.fr        #
+#    Updated: 2025/04/15 15:58:07 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -18,8 +18,6 @@
 
 	activate-linux
 	unison
-	discord	
-	google-chrome
 	brightnessctl	
 	playerctl
 	python3

osConfigs/hosts/iso.nix

@@ -17,6 +17,9 @@
 
   home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
   home-manager.users.tom = {
-    imports = [ ../../homeConfigs/home.nix ];
+    imports = [
+	  ../../homeConfigs/home.nix 
+	  ../../homeConfigs/hosts/iso.nix
+	];
   };
 }

osConfigs/hosts/server.nix

@@ -26,6 +26,8 @@
 	libnvidia-container
 	screen
   ];
+
+
   boot.supportedFilesystems = [ "zfs" ];
 
 #  services.cron.enable = false;
@@ -71,6 +73,7 @@
   virtualisation.docker = {
     liveRestore = false;
     enableOnBoot = true;
+	package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker;
 #    daemon.settings = {
 #      runtimes.nvidia.path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime";
 #      exec-opts = ["native.cgroupdriver=cgroupfs"];