update flake and add libreoffice to packages

Makefile

@@ -27,5 +27,5 @@ cleanup :
 	nix-env --delete-generations +1
 	sudo nix-collect-garbage -d
 
-optimise :
+optimize :
 	nix-store --optimize -vv

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1758270360,
+        "lastModified": 1763110997,
-        "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=",
+        "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645",
+        "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1758254611,
+        "lastModified": 1763352296,
-        "narHash": "sha256-5oMrmEG8A5FopmDZJ5QlskhLyf2SsdipGmKpT7n1JCE=",
+        "narHash": "sha256-3501S69Eft93hXhLUzdnwP4xVIO8mZ1zrZWPsSbnJLU=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "c451ce9fe2c5e0b46b221bb485a7b1e1ca8a3484",
+        "rev": "63f8d49eee3e1e79bbe325393f9de48266e337c5",
         "type": "gitlab"
       },
       "original": {
@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758288820,
+        "lastModified": 1763313531,
-        "narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=",
+        "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e38751933802481b37fee1f9251cbb86e63df381",
+        "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1757943327,
+        "lastModified": 1762847253,
-        "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
+        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
+        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758035966,
+        "lastModified": 1762111121,
-        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1758198701,
+        "lastModified": 1763283776,
-        "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
+        "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
+        "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758007585,
+        "lastModified": 1763264763,
-        "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
+        "narHash": "sha256-N0BEoJIlJ+M6sWZJ8nnfAjGY9VLvM6MXMitRenmhBkY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
+        "rev": "882e56c8293e44d57d882b800a82f8b2ee7a858f",
         "type": "github"
       },
       "original": {

homeConfigs/global/appearance.nix

@@ -27,7 +27,7 @@
   };
 
   home.file = {
-    ".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.png;
+    ".config/wallpaper.png".source = lib.mkDefault ../utils/wallpaper.png;
-    ".config/lock_screen.jpg".source = lib.mkDefault utils/lock_screen.jpg;
+    ".config/lock_screen.jpg".source = lib.mkDefault ../utils/lock_screen.jpg;
   };
 }

homeConfigs/global/fileManager.nix

@@ -3,14 +3,14 @@
   programs.yazi = {
     enable = true;
 	settings.mgr.sort_dir_first=false;
-    programs.bash.bashExtra = ''
-      function y() {
-        local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
-        yazi "$@" --cwd-file="$tmp"
-        IFS= read -r -d "" cwd < "$tmp"
-        [ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
-        rm -f -- "$tmp"
-      }
-    '';
   };
+  programs.bash.bashrcExtra = ''
+    function y() {
+      local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
+      yazi "$@" --cwd-file="$tmp"
+      IFS= read -r -d "" cwd < "$tmp"
+      [ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
+      rm -f -- "$tmp"
+    }
+  '';
 }

homeConfigs/hosts/desktop.nix

@@ -4,16 +4,18 @@
   mods.x11.enable = true;
   wayland.windowManager.hyprland.settings = {
     monitor = [
-	  "HDMI-A-1, 1920x1080@60, 0x0, auto"
+	  "DP-1, 1280x1024@75.03Hz, -3200x0, auto"
-      "HDMI-A-3, 1920x1080@60, 1920x0, auto"
+      "HDMI-A-1, 1920x1080@60, -1920x0, auto"
-	  "DP-1, 1280x1024@60, 3840x0, auto"
+	  "HDMI-A-3, 1920x1080@74.97Hz, 0x0, auto"
-	  "DP-3, 1280x1024@60, 5120x0, auto"
+	  "DP-3, 1920x1080@60.00Hz, 1920x0, auto"
+	  "DP-4, 1280x1024@75.03Hz, 3840x0, auto"
     ];
 	workspace = [
-      "1, monitor:HDMI-A-1"
+      "4, monitor:DP-1"
-	  "2, monitor:HDMI-A-3, default:true"
+      "3, monitor:HDMI-A-1"
-	  "3, monitor:DP-1"
+	  "1, monitor:HDMI-A-3, default:true"
-	  "4, monitor:DP-3"
+	  "2, monitor:DP-3"
+	  "5, monitor:DP-4"
 	];
 	env = [
 		"AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0"

homeConfigs/modules/game.nix

@@ -13,6 +13,8 @@
 	  mangohud
 	  moonlight-qt
 	  prismlauncher
+
+	  r2modman
 	];
   };
 }

homeConfigs/modules/git.nix

@@ -19,6 +19,8 @@
       	push.autoSetupRemote = true;
 		rerere.enabled = true;
 		help.autocorrect = 1;
+		user.signingkey = "251B4BD73683A8DF13D760A868BFAFE31DF313AD";
+		commit.gpgsign = true;
       };
       aliases = {
         fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";

homeConfigs/modules/vim.nix

@@ -29,7 +29,8 @@
       autocmd BufWinEnter *.* silent! loadview
       set tabstop=4
       set scrolloff=10
-      set preserveindent
+      set smartindent 
+	  set shiftwidth=4
       map <silent> <C-N> :bnext<CR>
       map <silent> <C-P> :bprevious<CR>
       nmap <silent> <c-k> :wincmd k<CR>
@@ -68,7 +69,7 @@
       lua require'lspconfig'.clangd.setup{}
       lua require'lspconfig'.nixd.setup{}
       lua require'lspconfig'.glsl_analyzer.setup{}
-      set signcolumn=no
+      set signcolumn=auto
 
       nnoremap <leader>ff <cmd>Telescope find_files<cr>
       nnoremap <leader>fg <cmd>Telescope live_grep<cr>

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"
+  	    " , Print, exec, hyprshot -m region -o ~/screenshots -f $(date +%Y-%m-%d_%H-%M-%S).png"
-  	    " SHIFT, Print, exec, grim -t png /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/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,"
@@ -165,6 +167,8 @@
         allow_tearing = false;
         layout = "dwindle";
       };
+
+	  layerrule = "noanim, selection";
   
   	  cursor.no_warps = true;
   

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

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 = {
+  mods.nvidia.enable = true;
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
+  mods.gayming.enable = true;
-    open = true;
 
-    prime.nvidiaBusId = "PCI:1:0:0";
+  programs.noisetorch.enable = true;
-    prime.intelBusId = "PCI:0:2:0";
-    prime.sync.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;
 }

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/09/23 04:08:25 by tomoron          ###   ########.fr        #
+#    Updated: 2025/10/29 21:15:44 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
   boot.initrd.luks.yubikeySupport = true;
@@ -32,6 +32,7 @@
   };
 
   boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup
+  programs.droidcam.enable = true;
 
   mods.displayManager.enable = true;
   mods.virtualHost.enable = true;
@@ -64,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;
@@ -79,6 +81,8 @@
 
   mods.touchpad.enable = true;
 
+#  programs.gamescope.capSysNice = true;
+
   mods.powerSave = {
     enable = true;
     powahCommandAdditions = [
@@ -94,6 +98,7 @@
 
   };
 
+
   services.asusd = {
     enable = true;
     enableUserService = true;
@@ -101,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;
@@ -119,7 +124,7 @@
   mods.nvidia.prime = true;
 
 
-#  services.usbmuxd.enable = true; #hangs when shutting down
+  services.usbmuxd.enable = true; #hangs when shutting down
 
 #  boot.plymouth = {
 #    enable = true;

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

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;