add git autocorrect

.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

Makefile

@@ -1,7 +1,7 @@
 HOST ?= $(file < /etc/nixosFlakeName)
 THREADS ?= $(shell nproc)
 FLAKE ?= .
-MODE = boot
+MODE = switch 
 
 FLAGS = --impure --cores $(THREADS) -j $(THREADS) 
 

flake.lock

@@ -8,11 +8,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1744173435,
+        "lastModified": 1745752599,
-        "narHash": "sha256-q5cViHmB4k1CdncBUVBY4UUukiKQxgBJ6R18qJ3pHOA=",
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "e7ea586f82360a06ec21f14544bc26b10aa1aea6",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
         "type": "gitlab"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744208565,
+        "lastModified": 1745894335,
-        "narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1743420942,
+        "lastModified": 1745907084,
-        "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
+        "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
+        "rev": "f1e52a018166e1a324f832de913e12c0e55792d0",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744098102,
+        "lastModified": 1745794561,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+        "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
         "type": "github"
       },
       "original": {

homeConfigs/home.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/03/19 15:45:13 by tomoron          ###   ########.fr        #
+#    Updated: 2025/04/25 00:08:54 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -64,9 +64,11 @@
 
   home.sessionPath = [ "~/.local/bin" ];
 
+
   home.file = { #should be able to make most of these in nix configs 
     ".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.png;
     ".config/pc.jpg".source = lib.mkDefault utils/pc.jpg;
+  	".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\"";
 
 	".local/share/rofi/themes".source = "${builtins.fetchGit {
 		url = "https://github.com/newmanls/rofi-themes-collection";

homeConfigs/hosts/iso.nix

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

homeConfigs/hosts/laptop.nix

@@ -1,6 +1,7 @@
 { lib, pkgs, ... }:
 
 {
+  home.file.".config/wallpaper.png".source = ../utils/wallpaper_test.png;
   programs.waybar.settings.mainBar = {
     modules-right = lib.mkBefore ["custom/fans" "custom/dgpu"];
     "custom/dgpu" = {
@@ -38,6 +39,7 @@
   home.packages = with pkgs; [
     stremio
     blender
+	wireshark
   ];
 
 #mods.sync.syncedAdditions = ["VirtualBox VMs"];

homeConfigs/modules/alacritty.nix

@@ -11,7 +11,7 @@
     programs.alacritty = {
       enable = true;
       settings = {
-        window.opacity = 0.9;
+        window.opacity = 0.95;
         env.XTERM = "xterm-256color";
         font.size = 9;
       };

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/git.nix

@@ -10,6 +10,7 @@
   config = lib.mkIf config.mods.git.enable {
     programs.git = {
       enable = true;
+	  lfs.enable = true;
       userEmail = "tomoron@student.42angouleme.fr";
       userName = "tomoron";
       extraConfig = {
@@ -17,6 +18,7 @@
       	pull.rebase = true;
       	push.autoSetupRemote = true;
 		rerere.enabled = true;
+		help.autocorrect = 1;
       };
       aliases = {
         fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";

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,16 @@
       #temperature.critical {
         color: #ff2222; 
       }
+
+      #battery.critical {
+        color: #ff2222; 
+      }
+      #cpu.high {
+        color: #ff2222; 
+      }
+      #disk.high {
+        color: #ff2222; 
+      }
     '';
 
     programs.waybar.settings.mainBar = {
@@ -61,7 +71,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,8 +86,9 @@
       };
     
       cpu = {
-        format = "   {usage}% |";
+        format = "   {usage}% ";
-      interval = 5;
+		states.high = 80;
+    	interval = 5;
       };
     
       memory = {
@@ -87,13 +98,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;
       };
@@ -131,6 +144,7 @@
 
       disk = {
         format =" 󰋊 {percentage_used}% |";
+		states.high = "5";
       };
 
       "custom/pipe" = {

osConfigs/global.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 01:43:46 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/03 13:24:06 by tomoron          ###   ########.fr        #
+#    Updated: 2025/04/23 20:31:46 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -46,7 +46,7 @@
 
   users.users.tom = {
      isNormalUser = true;
-     extraGroups = [ "wheel" "docker" "libvirtd" "dialout"];
+     extraGroups = [ "wheel" "docker" "libvirtd" "dialout" "wireshark"];
      initialPassword = "password";
    };
 

osConfigs/hosts/laptop.nix

@@ -4,9 +4,11 @@
   boot.kernelParams = [ "kvm.enable_virt_at_load=0" ];
 
   boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
+  boot.initrd.luks.devices.cryptroot.allowDiscards = true;
 
   services.displayManager.enable = true;
   services.displayManager.ly.enable = true;
+  networking.firewall.enable = false;
 
   networking.hostName = "patate-douce";
   networking.wireless.enable = true;
@@ -52,6 +54,9 @@
 
   services.udev.packages = [ pkgs.yubikey-personalization ];
 
+  programs.wireshark.enable = true;
+  programs.wireshark.usbmon.enable = true;
+
 #  boot.plymouth = {
 #    enable = true;
 #	theme = "ycontre-glow";

osConfigs/packages.nix

@@ -21,9 +21,11 @@
 	usbutils
 	man-pages
 	stress
-	ffmpeg
 	cryptsetup
 	acpi
 	dconf
+	
+	ffmpeg-full
+	nv-codec-headers
   ];
 }