update git config to follow the renaming of the options

change HDMI-A-3 to 60Hz on desktop (wtf nvidia ?)
update flake and add libreoffice to packages
2025-11-19 20:32:35 +01:00 · 2025-11-19 20:22:38 +01:00 · 2025-11-17 11:54:16 +01:00 · 2025-11-03 16:31:29 +01:00 · 2025-10-26 01:36:53 +02:00 · 2025-10-16 16:11:07 +02:00
10 changed files with 72 additions and 56 deletions
--- a/2
+++ b/2
@ -27,5 +27,5 @@ cleanup :
 	nix-env --delete-generations +1
 	sudo nix-collect-garbage -d

-optimise :
+optimize :
 	nix-store --optimize -vv
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1759572023,
-        "narHash": "sha256-2fzYq/m2PXie5WZO5LhyiZrTIUdUFp1SCLZAwvPL5xo=",
+        "lastModified": 1763110997,
+        "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "eeada12912d80d04733383d231a9d66172858718",
+        "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768",
        "type": "github"
      },
      "original": {
@ -26,11 +26,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1759637032,
-        "narHash": "sha256-tJPZLTwVT6D8JCASuRmDov1yu9XIdC0btRlQCzCU688=",
+        "lastModified": 1763352296,
+        "narHash": "sha256-3501S69Eft93hXhLUzdnwP4xVIO8mZ1zrZWPsSbnJLU=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "eff82f4fb13a381248ba1432a641894b6c0e4442",
+        "rev": "63f8d49eee3e1e79bbe325393f9de48266e337c5",
        "type": "gitlab"
      },
      "original": {
@ -47,11 +47,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759573136,
-        "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=",
+        "lastModified": 1763313531,
+        "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43",
+        "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391",
        "type": "github"
      },
      "original": {
@ -62,11 +62,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1759582739,
-        "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
+        "lastModified": 1762847253,
+        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "3441b5242af7577230a78ffb03542add264179ab",
+        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
        "type": "github"
      },
      "original": {
@ -78,11 +78,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
        "type": "github"
      },
      "original": {
@ -94,11 +94,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1763283776,
+        "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
        "type": "github"
      },
      "original": {
@ -125,11 +125,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759635238,
-        "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
+        "lastModified": 1763264763,
+        "narHash": "sha256-N0BEoJIlJ+M6sWZJ8nnfAjGY9VLvM6MXMitRenmhBkY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
+        "rev": "882e56c8293e44d57d882b800a82f8b2ee7a858f",
        "type": "github"
      },
      "original": {
--- a/homeConfigs/hosts/desktop.nix
+++ b/homeConfigs/hosts/desktop.nix
@ -4,16 +4,18 @@
  mods.x11.enable = true;
  wayland.windowManager.hyprland.settings = {
    monitor = [
-	  "HDMI-A-1, 1920x1080@60, 0x0, auto"
-      "HDMI-A-3, 1920x1080@60, 1920x0, auto"
-	  "DP-1, 1280x1024@60, 3840x0, auto"
-	  "DP-3, 1280x1024@60, 5120x0, auto"
+	  "DP-1, 1280x1024@75.03Hz, -3200x0, auto"
+      "HDMI-A-1, 1920x1080@60Hz, -1920x0, auto"
+	  "HDMI-A-3, 1920x1080@60Hz, 0x0, auto"
+	  "DP-3, 1920x1080@60.00Hz, 1920x0, auto"
+	  "DP-4, 1280x1024@75.03Hz, 3840x0, auto"
    ];
 	workspace = [
-      "1, monitor:HDMI-A-1"
-	  "2, monitor:HDMI-A-3, default:true"
-	  "3, monitor:DP-1"
-	  "4, monitor:DP-3"
+      "4, monitor:DP-1"
+      "3, monitor:HDMI-A-1"
+	  "1, monitor:HDMI-A-3, default:true"
+	  "2, monitor:DP-3"
+	  "5, monitor:DP-4"
 	];
 	env = [
 		"AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0"
--- a/homeConfigs/modules/git.nix
+++ b/homeConfigs/modules/git.nix
@ -11,19 +11,21 @@
    programs.git = {
      enable = true;
 	  lfs.enable = true;
-      userEmail = "tomoron@student.42angouleme.fr";
-      userName = "tomoron";
-      extraConfig = {
+      settings = {
+        user.email = "tomoron@student.42angouleme.fr";
+        user.name = "tomoron";
      	init.defaultBranch="master";
      	pull.rebase = true;
      	push.autoSetupRemote = true;
 		rerere.enabled = true;
 		help.autocorrect = 1;
-      };
-      aliases = {
+		user.signingkey = "251B4BD73683A8DF13D760A868BFAFE31DF313AD";
+		commit.gpgsign = true;
+        aliase = {
          fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
          back = "reset HEAD~";
        };
      };
    };
+  };
 }
--- a/homeConfigs/modules/wayland/hyprland.nix
+++ b/homeConfigs/modules/wayland/hyprland.nix
@ -10,12 +10,14 @@
  config = lib.mkIf config.mods.hyprland.enable {
    wayland.windowManager.hyprland.systemd.variables = [ "--all" ];

+	programs.hyprshot.enable = true;
+
    wayland.windowManager.hyprland.enable = true;
    wayland.windowManager.hyprland.settings = {
      "$mainMod" = "SUPER";
      bind = [
-  	    " , Print, exec, grim -t png -g \"$(slurp)\" /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
-  	    " SHIFT, Print, exec, grim -t png /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
+  	    " , Print, exec, hyprshot -m region -o ~/screenshots -f $(date +%Y-%m-%d_%H-%M-%S).png"
+  	    " SHIFT, Print, exec, hyprshot -m output -m active -o ~/screenshots -f $(date +%Y-%m-%d_%H-%M-%S).png" 
        "$mainMod, Return, exec, alacritty"
        "CTRL_ALT, Q, killactive,"
        "CTRL_ALT_SHIFT, Q, forcekillactive,"
@ -166,6 +168,8 @@
        layout = "dwindle";
      };

+	  layerrule = "noanim, selection";
+  
  	  cursor.no_warps = true;
  
      env = [
--- a/homeConfigs/packages.nix
+++ b/homeConfigs/packages.nix
@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 22:01:56 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/05 19:28:45 by tomoron          ###   ########.fr        #
+#    Updated: 2025/11/04 16:48:12 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -45,5 +45,6 @@
 	compiledb
 	yubikey-personalization
 	sops
+	libreoffice
  ];
 }
--- a/osConfigs/hosts/desktop.nix
+++ b/osConfigs/hosts/desktop.nix
@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:57:04 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 00:57:05 by tomoron          ###   ########.fr        #
+#    Updated: 2025/11/17 11:46:11 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -22,20 +22,25 @@
  networking.hostName = "nixos-fixe";

  hardware.cpu.intel.updateMicrocode = true;
+  mods.yubikey.pam.enable = true;

  boot.kernelModules = [ "kvm-intel" "nvidia" ];
  mods.displayManager.enable = true;

-  hardware.nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
-    open = true;
+  mods.nvidia.enable = true;
+  mods.gayming.enable = true;

-    prime.nvidiaBusId = "PCI:1:0:0";
-    prime.intelBusId = "PCI:0:2:0";
-    prime.sync.enable = true;
+  programs.noisetorch.enable = true;

-    modesetting.enable = true;
-  };
+#  hardware.nvidia = {
+#    open = true;
+#
+#    prime.nvidiaBusId = "PCI:1:0:0";
+#    prime.intelBusId = "PCI:0:2:0";
+#    prime.sync.enable = true;
+#
+#    modesetting.enable = true;
+#  };

  services.openssh.enable = true;
 }
--- a/osConfigs/hosts/laptop.nix
+++ b/osConfigs/hosts/laptop.nix
@ -6,11 +6,11 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:56:57 by tomoron           #+#    #+#              #
-#    Updated: 2025/10/04 22:23:34 by tomoron          ###   ########.fr        #
+#    Updated: 2025/10/29 21:15:44 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

 {
  boot.initrd.luks.yubikeySupport = true;
@ -65,6 +65,7 @@
        SUBSYSTEM=="kvmfr", OWNER="tom", GROUP="kvm", MODE="0660"
    '';
    environment.systemPackages = with pkgs; [ looking-glass-client ];
+    services.supergfxd.settings.mode = "Vfio";
  };

  networking.dhcpcd.enable = false;
@ -80,7 +81,6 @@

  mods.touchpad.enable = true;

-  programs.gamescope.enable = true;
 #  programs.gamescope.capSysNice = true;

  mods.powerSave = {
@ -98,6 +98,7 @@

  };

+
  services.asusd = {
    enable = true;
    enableUserService = true;
@ -105,7 +106,7 @@

  services.supergfxd.enable = true;
  services.supergfxd.settings = {
-    mode = "Integrated";
+    mode = lib.mkDefault "Integrated";
    vfio_enable = true;
    vfio_save = true;
    always_reboot = false;
--- a/osConfigs/modules/game.nix
+++ b/osConfigs/modules/game.nix
@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/05 23:47:09 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/05 23:54:57 by tomoron          ###   ########.fr        #
+#    Updated: 2025/10/27 00:50:29 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -22,5 +22,6 @@
  config = lib.mkIf config.mods.gayming.enable {
    programs.steam.enable = true; 
    programs.steam.protontricks.enable = true;
+    programs.gamescope.enable = true;
  };
 }
--- a/osConfigs/modules/nvidia.nix
+++ b/osConfigs/modules/nvidia.nix
@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/05 23:47:19 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 01:12:34 by tomoron          ###   ########.fr        #
+#    Updated: 2025/10/26 21:12:18 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -28,7 +28,7 @@
    open = lib.mkOption {
      type = lib.types.bool;
      default = true;
-      description = "use beta version of the drivers";
+      description = "use open version of the drivers (on newer gpu)";
    };
    containerToolkit = lib.mkOption {
      type = lib.types.bool;
Author	SHA1	Message	Date
tomoron	ef6d5cedb0	update git config to follow the renaming of the options All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m5s Details	2025-11-19 20:32:35 +01:00
tomoron	a70786d0bb	change HDMI-A-3 to 60Hz on desktop (wtf nvidia ?) All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m8s Details	2025-11-19 20:22:38 +01:00
tomoron	ca5538c4d1	update flake and add libreoffice to packages All checks were successful Build iso when a new version is pushed / test (push) Successful in 1m56s Details	2025-11-17 11:54:16 +01:00
tomoron	b0fe851dec	change nvidia prime settings, change desktop config screens arangement All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m13s Details	2025-11-03 16:31:29 +01:00
tomoron	c631965709	fix screen dispotition on desktop, add yubico-pam on desktop config All checks were successful Build iso when a new version is pushed / test (push) Successful in 1m59s Details	2025-10-26 01:36:53 +02:00
tomoron	a5134e71b8	add hyprshot and use it with screenshot shortcut All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m28s Details	2025-10-16 16:11:07 +02:00
tomoron	93fd2215da	gpg signed commits All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m18s Details	2025-10-11 00:02:54 +02:00