fix 42header (deleted revision)

Makefile

@@ -1,7 +1,7 @@
 HOST ?= $(file < /etc/nixosFlakeName)
 THREADS ?= $(shell nproc)
 FLAKE ?= .
-MODE = switch 
+MODE ?= boot
 
 FLAGS = --impure --cores $(THREADS) -j $(THREADS) 
 
@@ -22,4 +22,5 @@ iso :
 	rm -rf result
 
 cleanup :
-	sudo nix-collect-garbage -d
+	sudo nix-collect-garbage -d --delete-older-than 1d
+	nix-store --optimize -vv

flake.lock

@@ -8,11 +8,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1745419403,
+        "lastModified": 1754138575,
-        "narHash": "sha256-pQOOn4UntLSwnL3xZ1JAr3IDhXpL+kTS7Zw8ll59K9Q=",
+        "narHash": "sha256-6foT7Sflve4XuLnBKkgN9b9IP4FvdoBA2XQ2IyXmbog=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "346899a4b3b651ab447c61e0c8e9d8a1454cda72",
+        "rev": "27c945a6450d42c62f7e41019d7931b426bb786f",
         "type": "gitlab"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745627989,
+        "lastModified": 1754085240,
-        "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=",
+        "narHash": "sha256-kVHCrTWEe8B1thAhFag1bk4QPY0ZP45V9vPbrwPHoNo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82",
+        "rev": "e102920c1becb114645c6f92fe14edc0b05cc229",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1745503349,
+        "lastModified": 1753122741,
-        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
+        "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
+        "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745526057,
+        "lastModified": 1753939845,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "94def634a20494ee057c76998843c015909d6311",
         "type": "github"
       },
       "original": {

flake.nix

@@ -76,7 +76,7 @@
 
       homeConfigurations = {
 	    vbox = homeConfig { flakeName = "vbox"; };
-	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/nfs/homes/tomoron";};
+	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron";};
 	    laptop = homeConfig { flakeName = "laptop"; };
 	    desktop = homeConfig { flakeName = "desktop"; };
 	    server = homeConfig { flakeName = "server"; };

homeConfigs/home.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/25 00:08:54 by tomoron          ###   ########.fr        #
+#    Updated: 2025/05/12 12:35:00 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -66,7 +66,7 @@
 
 
   home.file = { #should be able to make most of these in nix configs 
-    ".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.png;
+    ".config/wallpaper.png".source = lib.mkDefault utils/wallpaper_test.png;
     ".config/pc.jpg".source = lib.mkDefault utils/pc.jpg;
   	".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\"";
 

homeConfigs/hosts/desktop.nix

@@ -20,7 +20,8 @@
 		"LIBVA_DRIVER_NAME,nvidia"
 		"__GLX_VENDOR_LIBRARY_NAME,nvidia"
 	];
-    cursor.no_hardware_cursors = 1;
+    cursor.no_hardware_cursors = true;
+	misc.vrr = 1;
   };
 
   mods.hyprland.autoSuspend = false;

homeConfigs/hosts/ft.nix

@@ -12,7 +12,7 @@
   mods.x11.enable = true;
   programs.firefox.enable = false;
 
-  mods.sync.homeFolder = "/sgoinfre/goinfre/Perso/tomoron";
+  mods.sync.homeFolder = "/home/tomoron/sync";
   mods.sync.defaultSynced = false;
   mods.sync.syncedAdditions = [ "42_desktop" "Downloads" ];
   mods.sync.customHostName = "pc42";

homeConfigs/hosts/laptop.nix

@@ -1,7 +1,6 @@
 { 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" = {

homeConfigs/hosts/vbox.nix

@@ -1,14 +1,14 @@
 { ... }:
 
 {
-  services.picom = {
+#  services.picom = {
-    backend = "xrender";
+#    backend = "xrender";
-    settings = {
+#    settings = {
-      blur = {
+#      blur = {
-        method = "none";
+#        method = "none";
-		size = 0;
+#		size = 0;
-		deviation = 0.0;
+#		deviation = 0.0;
-	  };
+#	  };
-    };
+#    };
-  };
+#  };
 }

homeConfigs/modules/git.nix

@@ -18,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/vim.nix

@@ -18,7 +18,7 @@
     home.packages = with pkgs; [
       clang-tools
       nixd
-      nodejs_23
+      nodejs_24
 	  glsl_analyzer
     ];
 
@@ -93,7 +93,7 @@
       #install stdheader 42
       ".config/nvim/plugin/stdheader.vim".source = "${builtins.fetchGit {
         url = "https://github.com/42Paris/42header";
-        rev = "71e6a4df6d72ae87a080282bf45bb993da6146b2";
+        rev = "e6e6b191871545e0d43f1aad817070bc806b8fa7";
         ref = "master";
       }}/plugin/stdheader.vim";
 

homeConfigs/modules/wayland/hyprland.nix

@@ -18,6 +18,7 @@
         "CTRL_ALT, Q, killactive,"
         "SUPER_ALT, Q, exit,"
         "$mainMod, S, togglefloating,"
+        "$mainMod, I, pin,"
         "$mainMod, D, exec, rofi -show drun -show-icons"
         "$mainMod, M, fullscreen, 1"
         "$mainMod, F, fullscreen, 0"

homeConfigs/modules/x11/bspwm.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/10 00:21:11 by tomoron           #+#    #+#              #
-#    Updated: 2025/02/12 09:36:07 by tomoron          ###   ########.fr        #
+#    Updated: 2025/06/18 15:49:03 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 {lib, config, ... }:
@@ -34,7 +34,7 @@
       setxkbmap fr us&
       nitrogen --restore &
       pgrep activate-linux >/dev/null  || (sleep 2;activate-linux -d)&
-	''; # this is messy but i don't care, x11 isn't my default now.
+	''; # this is messy but i don't care, x11 is just a fallback now
     
   };
 }

homeConfigs/modules/x11/polybar.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/10 02:51:32 by tomoron           #+#    #+#              #
-#    Updated: 2025/02/10 17:28:27 by tomoron          ###   ########.fr        #
+#    Updated: 2025/08/05 14:50:41 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -44,8 +44,8 @@
 
       "module/filesystem" = {
         type = "internal/fs";
-        mount-0 = "/";
+        mount-0 = "/home/tomoron";
-        interval = 30;
+        interval = 10;
         fixed-values = true;
         format-mounted = "<label-mounted>";
         format-mounted-prefix = "󰋊";

homeConfigs/packages.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 22:01:56 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/15 15:58:07 by tomoron          ###   ########.fr        #
+#    Updated: 2025/08/04 15:38:21 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -14,22 +14,35 @@
 
 {
   home.packages = with pkgs;[
+    lrzip
+    pigz
+    htop
+    gnumake
+    git
+    neofetch
+    clang
+    ninja
+    gdb
+    valgrind
+    wget
+    cmake
+    man-pages
+    stress
+    ffmpeg-full
     ripgrep
-
     activate-linux
     unison
     brightnessctl  
     playerctl
     python3
     vlc
-    nerd-fonts.iosevka
-
     nix-index
-	yubikey-manager
-	yubico-pam
     dunst
+    yubikey-manager
     bibata-cursors
     libcaca
     nasm
+    nerd-fonts.iosevka
+	compiledb
   ];
 }

osConfigs/hosts/desktop.nix

@@ -2,12 +2,7 @@
 { config, lib, inputs, pkgs, ... }:
 
 {
-  imports = [
+  boot.kernelParams = [ "nvidia-drm-modset=1" ];
-    ../modules/game.nix
-	../modules/nvidia.nix
-	../modules/vboxHost.nix
-  ];
-
   environment.systemPackages = with pkgs; [
   	cudatoolkit
   	lm_sensors
@@ -18,9 +13,10 @@
   hardware.cpu.intel.updateMicrocode = true;
 
   boot.kernelModules = [ "kvm-intel" "nvidia" ];
-
+  mods.displayManager.enable = true;
 
   hardware.nvidia = {
+  	package = config.boot.kernelPackages.nvidiaPackages.beta;
 	open = true;
 
 	prime.nvidiaBusId = "PCI:1:0:0";

osConfigs/hosts/iso.nix

@@ -13,13 +13,13 @@
   
   services.getty.autologinUser = lib.mkForce "tom";
   services.getty.helpLine = lib.mkForce "";
-  programs.hyprland.enable = true;
+#  programs.hyprland.enable = true;
 
-  home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
+#  home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
-  home-manager.users.tom = {
+#  home-manager.users.tom = {
-    imports = [
+#    imports = [
-	  ../../homeConfigs/home.nix 
+#	  ../../homeConfigs/home.nix 
-	  ../../homeConfigs/hosts/iso.nix
+#	  ../../homeConfigs/hosts/iso.nix
-	];
+#	];
-  };
+#  };
 }

osConfigs/hosts/laptop.nix

@@ -1,18 +1,46 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  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;
+  mods.displayManager.enable = true;
-  services.displayManager.ly.enable = true;
+  mods.virtualManager.enable = false;
   networking.firewall.enable = false;
 
   networking.hostName = "patate-douce";
   networking.wireless.enable = true;
   networking.networkmanager.enable = false;
 
+  specialisation.vfio_ready.configuration = {
+    boot.kernel.sysctl."vm.nr_hugepages" = 5120;
+	boot.extraModulePackages = with config.boot.kernelPackages; [ kvmfr ];
+	boot.kernelModules = [ "kvmfr" ];
+	boot.extraModprobeConfig = ''
+		options kvmfr static_size_mb=128
+		blacklist xpad
+	'';
+	virtualisation.libvirtd.qemu.verbatimConfig = ''
+		cgroup_device_acl = [
+		    "/dev/kvmfr0", "/dev/null", "/dev/full", "/dev/zero",
+		    "/dev/random", "/dev/urandom",
+		    "/dev/ptmx", "/dev/kvm",
+		    "/dev/rtc","/dev/hpet",
+		    "/dev/input/by-id/[some_mouse_device]-event-mouse",
+		    "/dev/input/by-id/[some_keyboard_device]-event-kbd"
+		]
+	'';
+	services.udev.extraRules = ''
+		SUBSYSTEM=="kvmfr", OWNER="tom", GROUP="kvm", MODE="0660"
+	'';
+	environment.systemPackages = with pkgs; [ looking-glass-client ];
+  };
+
+  programs.virt-manager.enable = true;
+  virtualisation.libvirtd.enable = true;
+  virtualisation.libvirtd.qemu.runAsRoot = true;
+  virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
+
   networking.dhcpcd.enable = false;
   systemd.network.enable = true;
   networking.useNetworkd = true;
@@ -20,7 +48,6 @@
   environment.systemPackages = with pkgs; [
     acpi
 	tlp
-	looking-glass-client
 	fprintd
   ];
 
@@ -38,6 +65,22 @@
   #power management
   powerManagement.enable = true;
   powerManagement.cpuFreqGovernor = "powersave";
+
+  services.asusd = {
+    enable = true;
+	enableUserService = true;
+  };
+  services.supergfxd.enable = true;
+  services.supergfxd.settings = {
+    mode = "Integrated";
+    vfio_enable = true;
+    vfio_save = true;
+    always_reboot = false;
+    no_logind = true;
+    logout_timeout_s = 180;
+    hotplug_type = "None";
+  };
+
   services.auto-cpufreq.enable = true;
   services.auto-cpufreq.settings = {
     battery = {

osConfigs/hosts/server.nix

@@ -12,6 +12,7 @@
 
   networking.hostName = "server";
   services.openssh.enable = true;
+  services.openssh.settings.PasswordAuthentication = false;
   services.openssh.ports = [ 1880 ];
 
   services.xserver.videoDrivers = [ "nvidia" ];
@@ -73,7 +74,7 @@
   virtualisation.docker = {
     liveRestore = false;
     enableOnBoot = true;
-	package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker;
+#	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"];
@@ -87,6 +88,7 @@
   hardware.nvidia-container-toolkit.enable = true;
 
   hardware.nvidia = {
+  	package = config.boot.kernelPackages.nvidiaPackages.beta;
 	open = true;
 
 #	prime.nvidiaBusId = "PCI:1:0:0";

osConfigs/hosts/vbox.nix

@@ -1,6 +1,9 @@
-{ config, lib, inputs, pkgs, ... }:
+{ ... }:
 
 {
   virtualisation.virtualbox.guest.enable = true;
+  mods.nvidia-graphics.enable = false;
+  mods.virtualManager.enable = false;
+  mods.gayming.enable = false;
 }
 

osConfigs/modules/displayManager.nix

@@ -0,0 +1,24 @@
+{config, lib, ... }:
+
+{
+  options.mods.displayManager.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+    description = "enable the display manager";
+  };
+
+  config = lib.mkIf config.mods.displayManager.enable {
+  	services.displayManager.enable = true;
+  	services.displayManager.ly.enable = true;
+	services.displayManager.ly.settings = 
+	{
+	  animation = "doom";
+	  min_refresh_delta = 50;
+	  bigclock = "en";
+	  sleep_cmd = "systemctl sleep";
+	  asterisk = "A";
+	  auth_fails= 3;
+	};
+  };
+}
+

osConfigs/modules/vboxHost.nix

@@ -1,14 +1,19 @@
 { config, lib, inputs, pkgs, ... }:
 
 {
-  options.mods.virtualbox.enable = lib.mkOption {
+  options.mods.virtualManager.enable = lib.mkOption {
     type = lib.types.bool;
 	default = true;
-	description = "enable virtualbox as host";
+	description = "enable virtual manager as host";
   };
 
-  config = lib.mkIf config.mods.virtualbox.enable {
+  config = lib.mkIf config.mods.virtualManager.enable {
-    virtualisation.virtualbox.host.enable = true;
+  	programs.virt-manager.enable = true;
-    users.users.tom.extraGroups = [ "vboxusers" ];
+  	virtualisation.libvirtd.enable = true;
+  	virtualisation.libvirtd.qemu.runAsRoot = true;
+  	virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
+	virtualisation.spiceUSBRedirection.enable = true;
+
+	environment.systemPackages = with pkgs; [ spice-gtk ];
   };
 }

osConfigs/packages.nix

@@ -5,27 +5,10 @@
     home-manager
     vim
     pciutils
-	pigz
-	htop
-	gnumake
-	git
-	neofetch
-	neovim
-	ntfs3g
-	clang
-	ninja
-	gdb
-	valgrind
-	wget
-	cmake
     usbutils
-	man-pages
+    ntfs3g
-	stress
     cryptsetup
     acpi
-	dconf
+    yubico-pam
-	
-	ffmpeg-full
-	nv-codec-headers
   ];
 }