add yubikey to unlock FDE on laptop; update flake; minor wayland changes

Makefile

@@ -22,5 +22,10 @@ iso :
 	rm -rf result
 
 cleanup :
-	sudo nix-collect-garbage -d --delete-older-than 1d
+	sudo nix-env --delete-generations +1 --profile /nix/var/nix/profiles/system
+	nix-env --delete-generations +1 --profile ~/.local/state/nix/profiles/home-manager
+	nix-env --delete-generations +1
+	sudo nix-collect-garbage -d
+
+optimise :
 	nix-store --optimize -vv

flake.lock

@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1756741629,
+        "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "firefox-addons": {
       "inputs": {
         "nixpkgs": [
@@ -8,11 +26,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1752552209,
+        "lastModified": 1756958609,
-        "narHash": "sha256-qOU0Ntz0rczB8mtAXgrYywkeMGNOUZ7K1llhkXZ5IRE=",
+        "narHash": "sha256-1nRGsnPZjOubRTsXEsnJqWlLsgo/Xq7tN7PWK57dFDQ=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "a8e97c23cc97670e4ec9ab9fa43faf2585678de2",
+        "rev": "b2a4e1bc62946403f82594ab9550ac13a1afa4df",
         "type": "gitlab"
       },
       "original": {
@@ -29,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752467539,
+        "lastModified": 1756954499,
-        "narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=",
+        "narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1e54837569e0b80797c47be4720fab19e0db1616",
+        "rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
         "type": "github"
       },
       "original": {
@@ -44,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1752048960,
+        "lastModified": 1756925795,
-        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
         "type": "github"
       },
       "original": {
@@ -60,11 +78,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752480373,
+        "lastModified": 1756266583,
-        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1756787288,
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
         "type": "github"
       },
       "original": {
@@ -74,50 +108,13 @@
         "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": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731939263,
-        "narHash": "sha256-mLwLR5dEJTvtqJU/lvo9f8c3/xIFPOpXlPF3JsJtnHo=",
-        "ref": "refs/heads/master",
-        "rev": "702e7b014ef6cf748252e797724e4096bafcaafa",
-        "revCount": 1,
-        "type": "git",
-        "url": "file:///home/tom/desktop/bordel/ycontre-glow"
-      },
-      "original": {
-        "type": "git",
-        "url": "file:///home/tom/desktop/bordel/ycontre-glow"
-      }
-    },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2"
-        "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/04/13 13:35:56 by tomoron          ###   ########.fr        #
+#    Updated: 2025/08/30 19:38:12 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -15,6 +15,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+	catppuccin.url = "github:catppuccin/nix";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -26,21 +27,20 @@
 	  inputs.nixpkgs.follows = "nixpkgs";
 	};
 
-	plymouth-theme-ycontre-glow = {
+	#plymouth-theme-ycontre-glow = {
-      url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
+    #  url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
-      inputs.nixpkgs.follows = "nixpkgs";
+    #  inputs.nixpkgs.follows = "nixpkgs";
-	};
+	#};
-	pkgs-docker-2750.url = "github:NixOS/nixpkgs?rev=5757bbb8bd7c0630a0cc4bb19c47e588db30b97c";
   };
 
-  outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs:
+  outputs = { nixpkgs, catppuccin, home-manager, nixos-hardware, ... }@inputs:
 	let
 	  pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
 
       osConfig = {flakeName, extraModules ? []}: nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; flakeName = flakeName; };
         modules = nixpkgs.lib.concatLists [
-		  [./osConfigs/global.nix ./osConfigs/hosts/${flakeName}.nix ]
+		  [./osConfigs/global.nix ./osConfigs/hosts/${flakeName}.nix catppuccin.nixosModules.catppuccin]
 		  extraModules
 		];
       };
@@ -49,7 +49,7 @@
         inherit pkgs;
 	    extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; };
         modules = nixpkgs.lib.concatLists [
-		  [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}.nix]
+		  [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}.nix catppuccin.homeModules.catppuccin ]
 		  extraModules
 		];
 	  };
@@ -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/05/12 12:35:00 by tomoron          ###   ########.fr        #
+#    Updated: 2025/08/30 20:34:23 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -39,7 +39,7 @@
   gtk = {
     enable = true;
     theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; };
-    iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; };
+#    iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; };
     font = { name = "Sans"; size = 11; };
   };
 
@@ -78,5 +78,18 @@
 
 #	".local/bin/desk_sync".source = dotfiles/local/bin/desk_sync;
   };
+  services.dunst.enable = true;
+
   programs.home-manager.enable = true;
+
+  qt.style.name = "kvantum";
+  catppuccin.kvantum.apply = true;
+
+  catppuccin = {
+  	enable = true;
+	flavor = "mocha";
+
+	dunst.enable = true;
+	dunst.flavor="frappe";
+  };
 }

homeConfigs/hosts/ft.nix

@@ -12,7 +12,9 @@
   mods.x11.enable = true;
   programs.firefox.enable = false;
 
-  mods.sync.homeFolder = "/sgoinfre/goinfre/Perso/tomoron";
+  mods.polybar.fspath = "/home/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

@@ -36,9 +36,9 @@
   };
 
   home.packages = with pkgs; [
-    stremio
     blender
 	wireshark
+	localsend
   ];
 
 #mods.sync.syncedAdditions = ["VirtualBox VMs"];

homeConfigs/hosts/vbox.nix

@@ -1,6 +1,11 @@
 { ... }:
 
 {
+  mods.game.enable = false;
+  mods.hyprland.enable = false;
+  mods.x11.enable = true;
+  programs.firefox.enable = false;
+
   services.picom = {
     backend = "xrender";
     settings = {

homeConfigs/modules/alacritty.nix

@@ -8,10 +8,11 @@
   };
 
   config = lib.mkIf config.mods.alacritty.enable {
+	catppuccin.alacritty.enable = true;
     programs.alacritty = {
       enable = true;
       settings = {
-        window.opacity = 0.95;
+#        window.opacity = 0.95;
         env.XTERM = "xterm-256color";
         font.size = 9;
       };

homeConfigs/modules/firefox.nix

@@ -8,11 +8,13 @@
   };
 
   config = lib.mkIf config.mods.firefox.enable {
+  	catppuccin.firefox.enable = true;
     programs.firefox = {
       enable = lib.mkDefault true;
       profiles.default = {
         extensions.packages = with inputs.firefox-addons.packages."x86_64-linux"; 
 	    [vimium ublock-origin];
+		extensions.force = true;
 	  };
     };
   };

homeConfigs/modules/vim.nix

@@ -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

@@ -16,6 +16,7 @@
   	  " , 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,"
+        "CTRL_ALT_SHIFT, Q, forcekillactive,"
         "SUPER_ALT, Q, exit,"
         "$mainMod, S, togglefloating,"
         "$mainMod, I, pin,"
@@ -64,12 +65,12 @@
         "$mainMod, mouse_up, workspace, e-1"
       ];
   
-      bindm = [
+      bindm = [ #bind mouse
         "$mainMod, mouse:272, movewindow"
         "$mainMod, mouse:273, resizewindow"
       ];
   
-      bindel = [
+      bindel = [ #repeat and locked
         " ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
         " ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
         " ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
@@ -80,7 +81,7 @@
         " ,XF86KbdBrightnessDown, exec, asusctl -p"
       ];
   
-      bindl = [
+      bindl = [ #repeat
         " , XF86AudioNext, exec, playerctl next"
         " , XF86AudioPrev, exec, playerctl previous"
         " , XF86AudioPause, exec, playerctl play-pause"
@@ -152,9 +153,9 @@
       };
   
       general = {
-        gaps_in = 3;
+        gaps_in = 2;
-        gaps_out = 7;
+        gaps_out = 5;
-        border_size = 2;
+        border_size = 1;
         "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
         "col.inactive_border" = "rgba(595959aa)";
         resize_on_border = false;

homeConfigs/modules/x11/polybar.nix

@@ -6,13 +6,19 @@
 #    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/07 15:30:07 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 { lib, config, ... }:
 
 {
+  options.mods.polybar.fspath = lib.mkOption {
+	type = lib.types.str;
+	default = "/";
+	description = "set the filesystem path for the remaining disk space";
+  };
+
   config = lib.mkIf config.mods.x11.enable {
     services.polybar.enable = true;
     services.polybar.script = "pgrep polybar >/dev/null || polybar -q main -c \"$HOME/.config/polybar/config.ini\"&";
@@ -44,8 +50,8 @@
 
       "module/filesystem" = {
         type = "internal/fs";
-        mount-0 = "/";
+        mount-0 = config.mods.polybar.fspath;
-        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/07/15 16:10:34 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/02 23:33:04 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -20,7 +20,6 @@
     gnumake
     git
     neofetch
-    neovim
     clang
     ninja
     gdb
@@ -38,10 +37,12 @@
     python3
     vlc
     nix-index
-    dunst
     yubikey-manager
     bibata-cursors
     libcaca
     nasm
+    nerd-fonts.iosevka
+	compiledb
+	yubikey-personalization
   ];
 }

homeConfigs/result

@@ -1 +0,0 @@
-/nix/store/ffxpgsp8bpdfab8kd0vnlpappy5s65ag-home-manager-generation

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/23 20:31:46 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/02 17:30:10 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -46,7 +46,13 @@
 
   users.users.tom = {
      isNormalUser = true;
-     extraGroups = [ "wheel" "docker" "libvirtd" "dialout" "wireshark"];
+     extraGroups = [
+	 "wheel" # can sudo
+	 "docker" # can use docker
+	 "libvirtd" # can use libvirtd
+	 "dialout" # can use serial devices
+	 "wireshark" # can use wireshask
+	 ];
      initialPassword = "password";
    };
 
@@ -58,6 +64,11 @@
   system.stateVersion = "24.05";
   environment.etc.nixosFlakeName.text = "${flakeName}";
 
+  services.journald.extraConfig = ''
+	SystemMaxUse=100M
+	SystemMaxFileSize=50M
+  '';
+
   hardware.logitech.wireless.enable = true;
   hardware.logitech.wireless.enableGraphical = true;
 }

osConfigs/hosts/laptop.nix

@@ -1,8 +1,24 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
+  boot.initrd.luks.yubikeySupport = true;
-  boot.initrd.luks.devices.cryptroot.allowDiscards = true;
+  boot.initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
+  boot.initrd.luks.devices.cryptroot = {
+  	device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
+  	allowDiscards = true;
+	#set up initial : https://wiki.nixos.org/wiki/Yubikey_based_Full_Disk_Encryption_(FDE)_on_NixOS
+	yubikey = {
+		twoFactor = false;
+		keyLength = 64;
+		saltLength = 32;
+		storage = {
+			device = "/dev/disk/by-uuid/BA5C-F216";
+			path = "/default";
+		};
+	};
+  };
+
+  boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ];
 
   mods.displayManager.enable = true;
   mods.virtualManager.enable = false;
@@ -65,17 +81,22 @@
   #power management
   powerManagement.enable = true;
   powerManagement.cpuFreqGovernor = "powersave";
-  services.auto-cpufreq.enable = true;
+
-  services.auto-cpufreq.settings = {
+  services.asusd = {
-    battery = {
+    enable = true;
-      governor = "powersave";
+	enableUserService = true;
-      turbo = "never";
-    };
-    charger = {
-      governor = "performance";
-      turbo = "auto";
-    };
   };
+  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.upower.enable = true;
 
   services.udev.packages = [ pkgs.yubikey-personalization ];
@@ -83,6 +104,11 @@
   programs.wireshark.enable = true;
   programs.wireshark.usbmon.enable = true;
 
+  programs.alvr.enable = true;
+  programs.alvr.openFirewall = true;
+  
+  services.usbmuxd.enable = true;
+
 #  boot.plymouth = {
 #    enable = true;
 #	theme = "ycontre-glow";

osConfigs/hosts/server.nix

@@ -74,7 +74,6 @@
   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"];

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

@@ -12,6 +12,9 @@
   	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/packages.nix

@@ -9,7 +9,6 @@
     ntfs3g
     cryptsetup
     acpi
-    nerd-fonts.iosevka
     yubico-pam
   ];
 }