refactor os configurations

add fuse nextcloud and age encrypted passwords
add yubikey to unlock FDE on laptop; update flake; minor wayland changes
2025-09-06 01:27:10 +02:00 · 2025-09-05 20:01:58 +02:00 · 2025-09-04 15:17:30 +02:00 · 2025-08-30 16:36:33 +02:00
33 changed files with 711 additions and 332 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -0,0 +1,7 @@
+keys:
+  - &primary age1sjzkhwr8ycdsmuj8xg8y4v2hcpuq9vethnhytxtwzeury692dsxqf80fwv
+creation_rules:
+  - path_regex: secrets/secrets.yaml$
+    key_groups:
+    - age:
+      - *primary
--- a/7
+++ b/7
@ -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
--- a/flake.lock
+++ b/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": 1756353808,
-        "narHash": "sha256-JkCqOE0kjWbT7GnXgngL+baLF/OeeVfPCh71HXfRh6g=",
+        "lastModified": 1756958609,
+        "narHash": "sha256-1nRGsnPZjOubRTsXEsnJqWlLsgo/Xq7tN7PWK57dFDQ=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "e47914363ccacc95994b567966d7fa1e25dd85ec",
+        "rev": "b2a4e1bc62946403f82594ab9550ac13a1afa4df",
        "type": "gitlab"
      },
      "original": {
@ -29,11 +47,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756261190,
-        "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=",
+        "lastModified": 1756954499,
+        "narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "77f348da3176dc68b20a73dab94852a417daf361",
+        "rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
        "type": "github"
      },
      "original": {
@ -44,11 +62,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1756245047,
-        "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=",
+        "lastModified": 1756925795,
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
        "type": "github"
      },
      "original": {
@ -62,11 +80,27 @@
      "locked": {
        "lastModified": 1756266583,
        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
-        "owner": "nixos",
+        "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": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "type": "github"
+      },
      "original": {
        "owner": "nixos",
        "ref": "nixos-unstable",
@ -74,50 +108,34 @@
        "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"
+    "root": {
+      "inputs": {
+        "catppuccin": "catppuccin",
+        "firefox-addons": "firefox-addons",
+        "home-manager": "home-manager",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_2",
+        "sops-nix": "sops-nix"
      }
    },
-    "plymouth-theme-ycontre-glow": {
+    "sops-nix": {
      "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"
+        "lastModified": 1754988908,
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "type": "github"
      },
      "original": {
-        "type": "git",
-        "url": "file:///home/tom/desktop/bordel/ycontre-glow"
-      }
-    },
-    "root": {
-      "inputs": {
-        "firefox-addons": "firefox-addons",
-        "home-manager": "home-manager",
-        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
-        "pkgs-docker-2750": "pkgs-docker-2750",
-        "plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
      }
    }
  },
--- a/flake.nix
+++ b/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/09/06 00:58:57 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -15,6 +15,13 @@

  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+	catppuccin.url = "github:catppuccin/nix";
+
+	sops-nix = {
+	  url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+	};
+
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
@ -26,21 +33,20 @@
 	  inputs.nixpkgs.follows = "nixpkgs";
 	};

-	plymouth-theme-ycontre-glow = {
-      url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
-      inputs.nixpkgs.follows = "nixpkgs";
-	};
-	pkgs-docker-2750.url = "github:NixOS/nixpkgs?rev=5757bbb8bd7c0630a0cc4bb19c47e588db30b97c";
+	#plymouth-theme-ycontre-glow = {
+    #  url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
+    #  inputs.nixpkgs.follows = "nixpkgs";
+	#};
  };

-  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/os.nix ./osConfigs/hosts/${flakeName}.nix catppuccin.nixosModules.catppuccin]
 		  extraModules
 		];
      };
@ -49,14 +55,20 @@
        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
+			inputs.sops-nix.homeManagerModules.sops
+		  ]
 		  extraModules
 		];
 	  };

 	in {

-      nixosConfigurations = { server = osConfig {flakeName = "server";};
+      nixosConfigurations = {
+	    server = osConfig {flakeName = "server";};
 	    vbox = osConfig {flakeName = "vbox";};
 		laptop = osConfig {flakeName = "laptop"; extraModules = [ nixos-hardware.nixosModules.asus-zephyrus-ga401 ];};
 		desktop = osConfig {flakeName = "desktop";};
@ -67,8 +79,6 @@
          modules = [
            (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
            ./osConfigs/hosts/iso.nix
-			inputs.home-manager.nixosModules.default
-
          ];
 		};
      };
@ -81,5 +91,6 @@
 	    desktop = homeConfig { flakeName = "desktop"; };
 	    server = homeConfig { flakeName = "server"; };
 	  };
+
    };
 }
--- a/homeConfigs/home.nix
+++ b/homeConfigs/home.nix
@ -6,11 +6,11 @@
 #    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/09/05 19:55:21 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

-{lib, pkgs, username ? "tom" ,homeDir ? "/home/tom", isOs ? false, ... }:
+{lib, pkgs, config, username ? "tom" ,homeDir ? "/home/tom", isOs ? false, ... }:

 {
  imports = lib.concatLists [
@ -23,6 +23,28 @@

  home.stateVersion = "24.05";

+  sops.defaultSopsFile = ../secrets/secrets.yaml;
+  sops.age.keyFile = "${homeDir}/.config/sops/age/keys.txt";
+  sops.secrets."nextcloud_fuse/password" = {};
+
+  programs.rclone.enable = true;
+  programs.rclone.remotes.nextcloud = {
+    config = {
+	  type = "webdav";
+	  url = "https://nc.tmoron.fr/remote.php/dav/files/tom";
+	  vendor = "nextcloud";
+	  user = "tom";
+    };
+	secrets.pass = config.sops.secrets."nextcloud_fuse/password".path;
+	mounts = {
+	  "/" = {
+	    enable = true;
+		mountPoint = "${homeDir}/nextcloud";
+		options.vfs-cache-mode = "writes";
+	  };
+	};
+  };
+
 #  programs.ghostty.enable = true;
 #  programs.ghostty.settings = {
 #    theme = "catppuccin-mocha";
@ -39,7 +61,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 +100,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";
+  };
 }
--- a/homeConfigs/hosts/laptop.nix
+++ b/homeConfigs/hosts/laptop.nix
@ -36,7 +36,6 @@
  };

  home.packages = with pkgs; [
-    stremio
    blender
 	wireshark
 	localsend
--- a/homeConfigs/modules/alacritty.nix
+++ b/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;
      };
--- a/homeConfigs/modules/firefox.nix
+++ b/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;
 	  };
    };
  };
--- a/homeConfigs/modules/vim.nix
+++ b/homeConfigs/modules/vim.nix
@ -28,7 +28,6 @@
      autocmd BufWinLeave *.* mkview
      autocmd BufWinEnter *.* silent! loadview
      set tabstop=4
-	  set shiftwidth=4
      set scrolloff=10
      set preserveindent
      map <silent> <C-N> :bnext<CR>
--- a/homeConfigs/modules/wayland/hyprland.nix
+++ b/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_out = 7;
-        border_size = 2;
+        gaps_in = 2;
+        gaps_out = 5;
+        border_size = 1;
        "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
        "col.inactive_border" = "rgba(595959aa)";
        resize_on_border = false;
--- 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/08/04 15:38:21 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/05 19:28:45 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -37,12 +37,13 @@
    python3
    vlc
    nix-index
-    dunst
    yubikey-manager
    bibata-cursors
    libcaca
    nasm
    nerd-fonts.iosevka
 	compiledb
+	yubikey-personalization
+	sops
  ];
 }
--- a/osConfigs/global/boot.nix
+++ b/osConfigs/global/boot.nix
@ -0,0 +1,29 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    boot.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:37:58 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:38 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{lib, pkgs, ... } :
+
+{
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+
+  boot.loader = {
+    systemd-boot.enable = true;
+    systemd-boot.memtest86.enable = true;
+    efi.canTouchEfiVariables = true;
+    timeout = 1;
+  };
+
+  services.journald.extraConfig = ''
+    SystemMaxUse=100M
+    SystemMaxFileSize=50M
+  '';
+}
--- a/osConfigs/global/nix.nix
+++ b/osConfigs/global/nix.nix
@ -0,0 +1,18 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    nix.nix                                            :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:42:17 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/05 23:42:20 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ ... }:
+
+{
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nixpkgs.config.allowUnfree = true;
+}
--- a/osConfigs/global/other.nix
+++ b/osConfigs/global/other.nix
@ -1,69 +1,35 @@
 # **************************************************************************** #
 #                                                                              #
 #                                                         :::      ::::::::    #
-#    global.nix                                         :+:      :+:    :+:    #
+#    other.nix                                          :+:      :+:    :+:    #
 #                                                     +:+ +:+         +:+      #
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 01:43:46 by tomoron           #+#    #+#              #
-#    Updated: 2025/08/07 17:46:37 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/06 00:51:46 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

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

 { 
-  imports = lib.concatLists [[
-  	  ./hardware-configuration.nix
-	  ./packages.nix
-    ]
-    (lib.fileset.toList ./modules)
-  ];
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-  nixpkgs.config.allowUnfree = true;
-
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-
-  boot.loader = {
-    systemd-boot.enable = true;
-	systemd-boot.memtest86.enable = true;
-    efi.canTouchEfiVariables = true;
-    timeout = 1;
-  };
-
+  networking.hostName = lib.mkDefault "unnamed-nixos";
  networking.networkmanager.enable = lib.mkDefault true;

+  programs.fuse.enable = true;
+
  time.timeZone = "Europe/Paris";

  services.xserver.enable = lib.mkDefault true;
  services.xserver.displayManager.startx.enable = true;

+  programs.hyprland.enable = lib.mkDefault true;
+
  services.pipewire = {
    enable = true;
    pulse.enable = true;
  };

-  users.users.tom = {
-     isNormalUser = true;
-     extraGroups = [
-	 "wheel" # can sudo
-	 "docker" # can use docker
-	 "libvirtd" # can use libvirtd
-	 "dialout" # can use serial devices
-	 "wireshark" # can use wireshask
-	 ];
-     initialPassword = "password";
-   };
-
-  virtualisation.docker.enable = true;
-  virtualisation.docker.enableOnBoot = lib.mkDefault false;
-
-  programs.hyprland.enable = lib.mkDefault true;
-
-  system.stateVersion = "24.05";
-  environment.etc.nixosFlakeName.text = "${flakeName}";
-
  hardware.logitech.wireless.enable = true;
  hardware.logitech.wireless.enableGraphical = true;
 }
--- a/osConfigs/global/packages.nix
+++ b/osConfigs/global/packages.nix
@ -0,0 +1,25 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    packages.nix                                       :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:57:21 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:57:26 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    home-manager
+    vim
+    pciutils
+    usbutils
+    ntfs3g
+    cryptsetup
+    acpi
+  ];
+}
--- a/osConfigs/global/user.nix
+++ b/osConfigs/global/user.nix
@ -0,0 +1,28 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    user.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:42:18 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:57:32 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ ... }:
+
+{
+  users.users.tom = {
+     isNormalUser = true;
+     extraGroups = [
+     "wheel" # can sudo
+     "docker" # can use docker
+     "libvirtd" # can use libvirtd
+     "dialout" # can use serial devices
+     "wireshark" # can use wireshask
+     ];
+
+     initialPassword = "password";
+   };
+}
--- a/osConfigs/hosts/desktop.nix
+++ b/osConfigs/hosts/desktop.nix
@ -1,11 +1,22 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    desktop.nix                                        :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    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        #
+#                                                                              #
+# **************************************************************************** #
+

 { config, lib, inputs, pkgs, ... }:

 {
  boot.kernelParams = [ "nvidia-drm-modset=1" ];
  environment.systemPackages = with pkgs; [
-  	cudatoolkit
-  	lm_sensors
+      lm_sensors # can be user (and global)
  ];

  networking.hostName = "nixos-fixe";
@ -16,14 +27,14 @@
  mods.displayManager.enable = true;

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

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

-	modesetting.enable = true;
+    modesetting.enable = true;
  };

  services.openssh.enable = true;
--- a/osConfigs/hosts/iso.nix
+++ b/osConfigs/hosts/iso.nix
@ -1,8 +1,20 @@
-{lib, inputs, pkgs, ... }:
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    iso.nix                                            :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:57:02 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:57:03 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{lib, ... }:

 {
  imports = [
-    ../packages.nix 
+    ../global/packages.nix 
  ];

  users.users.tom = {
@ -13,13 +25,4 @@
  
  services.getty.autologinUser = lib.mkForce "tom";
  services.getty.helpLine = lib.mkForce "";
-#  programs.hyprland.enable = true;
-
-#  home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
-#  home-manager.users.tom = {
-#    imports = [
-#	  ../../homeConfigs/home.nix 
-#	  ../../homeConfigs/hosts/iso.nix
-#	];
-#  };
 }
--- a/osConfigs/hosts/laptop.nix
+++ b/osConfigs/hosts/laptop.nix
@ -1,11 +1,41 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    laptop.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:56:57 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:11:42 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
 { config, pkgs, ... }:

 {
-  boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
-  boot.initrd.luks.devices.cryptroot.allowDiscards = true;
+  boot.initrd.luks.yubikeySupport = true;
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+  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" ]; #speeds up startup

  mods.displayManager.enable = true;
-  mods.virtualManager.enable = false;
+  mods.virtualHost.enable = false;
+  mods.yubikey.pam.enable = true;
  networking.firewall.enable = false;

  networking.hostName = "patate-douce";
@ -14,62 +44,48 @@

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

-  environment.systemPackages = with pkgs; [
-    acpi
-	tlp
-	fprintd
-  ];
-
-  hardware.nvidia.prime.offload = {
-    enable = true;
-	enableOffloadCmd = true;
-  };
-
-  services.libinput.enable = true;
-  services.libinput.touchpad.clickMethod = "clickfinger";
-  services.libinput.touchpad.tapping = false;
-
  hardware.bluetooth.enable = true;

-  #power management
-  powerManagement.enable = true;
-  powerManagement.cpuFreqGovernor = "powersave";
+  environment.systemPackages = with pkgs; [
+    acpi # can be user (global)
+  ];
+
+
+  mods.touchpad.enable = true;
+
+  mods.powerSave.enable = true;

  services.asusd = {
    enable = true;
-	enableUserService = true;
+    enableUserService = true;
  };
+
  services.supergfxd.enable = true;
  services.supergfxd.settings = {
    mode = "Integrated";
@ -81,23 +97,21 @@
    hotplug_type = "None";
  };

-  services.upower.enable = true;
-
-  services.udev.packages = [ pkgs.yubikey-personalization ];
-
  programs.wireshark.enable = true;
  programs.wireshark.usbmon.enable = true;

-  programs.alvr.enable = true;
-  programs.alvr.openFirewall = true;
+  mods.docker.enable = true;
+  mods.gayming.enable = true;
+  mods.nvidia.enable = true;
+  mods.nvidia.prime = true;

-  services.usbmuxd.enable = true;
+#  services.usbmuxd.enable = true; #hangs when shutting down

 #  boot.plymouth = {
 #    enable = true;
-#	theme = "ycontre-glow";
-#	themePackages = [
-#		inputs.plymouth-theme-ycontre-glow.defaultPackage.x86_64-linux
-#	];
+#    theme = "ycontre-glow";
+#    themePackages = [
+#        inputs.plymouth-theme-ycontre-glow.defaultPackage.x86_64-linux
+#    ];
 #  };
 }
--- a/osConfigs/hosts/server.nix
+++ b/osConfigs/hosts/server.nix
@ -1,100 +1,75 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    server.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:57:09 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:26:26 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #

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

-{
-  imports = [
-  	../modules/game.nix
-	../modules/vboxHost.nix
-	../modules/nvidia.nix
+let
+  ports = [
+    22 #git ssh
+    80 443 #http server
+    5000 #frigate
+    8083 137 138 139 445 548 3702 5357 #prob some samba shit
+    24454 #minecraft voice chat
+    25565 # minecraft server
  ];
+  portRanges = [
+    {from = 47950; to = 49000;} #moonlight (wolf)
+  ];
+in
+{
  boot.kernelPackages = pkgs.linuxPackages;
-  boot.extraModulePackages = [ config.boot.kernelPackages.gasket ];
+  boot.extraModulePackages = [
+    config.boot.kernelPackages.gasket #driver for google coral edge tpu
+  ];

-  networking.hostName = "server";
  services.openssh.enable = true;
  services.openssh.settings.PasswordAuthentication = false;
  services.openssh.ports = [ 1880 ];

-  services.xserver.videoDrivers = [ "nvidia" ];
-
  boot.extraModprobeConfig = ''
    options amdgpu virtual_display=1
-  '';
-
-  environment.systemPackages = with pkgs; [
-  	zfs
-	nvidia-docker
-	libnvidia-container
-	screen
-  ];
-
+  ''; #create dummy display to be able to start x11

  boot.supportedFilesystems = [ "zfs" ];

-#  services.cron.enable = false;
-#  services.cron.systemCronJobs = [
-#    # m h dom m dow
-#	# https://crontab.guru <3
-#  ];
-
-  networking.firewall.allowedTCPPorts = [
-    22 #git ssh
-  	80 443 #http server
-	5000 #frigate
-	8083 137 138 139 445 548 3702 5357 #prob some samba shit
-	24454 #minecraft voice chat
-	25565 # minecraft server
-  ];
-  networking.firewall.allowedUDPPorts = [
-    22 #git ssh
-  	80 443 #http server
-	5000 #frigate
-	8083 137 138 139 445 548 3702 5357 #prob some samba shit
-	24454 #minecraft voice chat
-	25565 # minecraft server
-  ];
-
-  networking.firewall.allowedUDPPortRanges = [
-	{from = 47950; to = 49000;}
-  ];
-  networking.firewall.allowedTCPPortRanges = [
-	{from = 47950; to = 49000;}
+  environment.systemPackages = with pkgs; [
+    zfs
+    screen #can be user (and global)
  ];

  networking = {
+    hostName = "server";
+
    interfaces.eth0.ipv4.addresses = [ {
      address = "192.168.1.24";
-	  prefixLength = 24;
-    } ];
-	defaultGateway.address = "192.168.1.254";
-	defaultGateway.interface = "eth0";
-	nameservers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"];
-  	hostId = "68290da7";
-  };
-  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"];
-#    };
+      prefixLength = 24;
+      }
+    ];
+    defaultGateway.address = "192.168.1.254";
+    defaultGateway.interface = "eth0";
+    nameservers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"];
+      hostId = "68290da7";

+    firewall.allowedTCPPorts = ports;
+    firewall.allowedUDPPorts = ports;
+    firewall.allowedUDPPortRanges = portRanges;
+    firewall.allowedTCPPortRanges = portRanges;
  };

  services.fail2ban.enable = true;
-  services.fail2ban.bantime = "2h";
+  services.fail2ban.bantime = "5h";

-  hardware.nvidia-container-toolkit.enable = true;
-
-  hardware.nvidia = {
-  	package = config.boot.kernelPackages.nvidiaPackages.beta;
-	open = true;
-
-#	prime.nvidiaBusId = "PCI:1:0:0";
-#	prime.amdgpuBusId = "PCI:13:0:0";
-#	prime.sync.enable = true;
-
-#	modesetting.enable = true;
+  mods.docker = {
+    enable = true;
+    boot = true;
  };
 }
--- a/osConfigs/hosts/vbox.nix
+++ b/osConfigs/hosts/vbox.nix
@ -1,9 +1,18 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    vbox.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:56:42 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:52 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
 { ... }:

 {
  virtualisation.virtualbox.guest.enable = true;
-  mods.nvidia-graphics.enable = false;
-  mods.virtualManager.enable = false;
-  mods.gayming.enable = false;
 }

--- a/osConfigs/modules/displayManager.nix
+++ b/osConfigs/modules/displayManager.nix
@ -1,24 +1,36 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    displayManager.nix                                 :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:16 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:38 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
 {config, lib, ... }:

 {
  options.mods.displayManager.enable = lib.mkOption {
    type = lib.types.bool;
    default = false;
-    description = "enable the display manager";
+    description = "enable the ly 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;
-	};
+      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;
+    };
  };
 }

--- a/osConfigs/modules/docker.nix
+++ b/osConfigs/modules/docker.nix
@ -0,0 +1,36 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    docker.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:10:58 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:06:23 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, ... }:
+
+{
+  options.mods.docker = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable docker";
+    };
+    boot = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "start docker with the system (if false, trigered by docker.socket)";
+    };
+  };
+
+  config = lib.mkIf config.mods.docker.enable {
+    virtualisation.docker = {
+      enable = true;
+      liveRestore = false;
+      enableOnBoot = config.mods.docker.boot;
+    };
+  };
+}
--- a/osConfigs/modules/game.nix
+++ b/osConfigs/modules/game.nix
@ -1,10 +1,22 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    game.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    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        #
+#                                                                              #
+# **************************************************************************** #
+
 {config, lib, ... }:

 {
  options.mods.gayming.enable = lib.mkOption {
    type = lib.types.bool;
-    default = true;
-    description = "enable games on the host";
+    default = false;
+    description = "enable steam and other";
  };

  config = lib.mkIf config.mods.gayming.enable {
--- a/osConfigs/modules/nvidia.nix
+++ b/osConfigs/modules/nvidia.nix
@ -1,19 +1,65 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    nvidia.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    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        #
+#                                                                              #
+# **************************************************************************** #

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

 {
-  options.mods.nvidia-graphics.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = true;
-    description = "enable my nvidia graphics settings";
+  options.mods.nvidia = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable nvidia drivers";
+    };
+    beta = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "use beta version of the drivers";
+    };
+    open = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "use beta version of the drivers";
+    };
+    containerToolkit = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable the nvidia container toolkit (gpu in docker)";
+    };
+    prime = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable nvidia prime offload (saves battery)";
+    };
  };
  
-  config = lib.mkIf config.mods.nvidia-graphics.enable {
+  config = lib.mkIf config.mods.nvidia.enable {
    hardware.graphics = {
      enable = true;
      enable32Bit = true;
    };

+    hardware.nvidia = {
+      package = lib.mkIf config.mods.nvidia.beta config.boot.kernelPackages.nvidiaPackages.beta;
+      open = config.mods.nvidia.open;
+
+      prime.offload = lib.mkIf config.mods.nvidia.prime {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+    };
+
+    hardware.nvidia-container-toolkit.enable = config.mods.nvidia.containerToolkit;
+
    services.xserver.videoDrivers = ["nvidia"];
  };

--- a/osConfigs/modules/powerSave.nix
+++ b/osConfigs/modules/powerSave.nix
@ -0,0 +1,31 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    powerSave.nix                                      :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:45:04 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:02:29 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, ... }:
+
+{
+  options.mods.powerSave = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable services and settings to save power";
+    };
+  };
+
+  config = lib.mkIf config.mods.powerSave.enable {
+    services.tlp.enable = true;
+    powerManagement.enable = true;
+    powerManagement.cpuFreqGovernor = "powersave";
+    services.upower.enable = true;
+    mods.nvidia.prime = true;
+  };
+}
--- a/osConfigs/modules/touchpad.nix
+++ b/osConfigs/modules/touchpad.nix
@ -0,0 +1,29 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    touchpad.nix                                       :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:39:41 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:02:41 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, ... }:
+
+{
+  options.mods.touchpad = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable touchpad support";
+    };
+  };
+  
+  config = lib.mkIf config.mods.touchpad.enable {
+    services.libinput.enable = true;
+    services.libinput.touchpad.clickMethod = "clickfinger";
+    services.libinput.touchpad.tapping = false;
+  };
+}
--- a/osConfigs/modules/vboxHost.nix
+++ b/osConfigs/modules/vboxHost.nix
@ -1,19 +0,0 @@
-{ config, lib, inputs, pkgs, ... }:
-
-{
-  options.mods.virtualManager.enable = lib.mkOption {
-    type = lib.types.bool;
-	default = true;
-	description = "enable virtual manager as host";
-  };
-
-  config = lib.mkIf config.mods.virtualManager.enable {
-  	programs.virt-manager.enable = true;
-  	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 ];
-  };
-}
--- a/osConfigs/modules/virtualHost.nix
+++ b/osConfigs/modules/virtualHost.nix
@ -0,0 +1,31 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    virtualHost.nix                                    :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:19 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:03:07 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, pkgs, ... }:
+
+{
+  options.mods.virtualHost.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+    description = "enable virtual manager as host";
+  };
+
+  config = lib.mkIf config.mods.virtualHost.enable {
+      programs.virt-manager.enable = true;
+      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 ];
+  };
+}
--- a/osConfigs/modules/yubikey.nix
+++ b/osConfigs/modules/yubikey.nix
@ -1,20 +1,32 @@
-{ config, lib, inputs, pkgs, ... }:
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    yubikey.nix                                        :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:20 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:03:54 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, pkgs, ... }:

 {
-  options.mods.yubikey = {
+  options.mods.yubikey.pam = {
    enable = lib.mkOption {
      type = lib.types.bool;
-	  default = true;
-	  description = "enable yubikey";
-	};
+      default = false;
+      description = "enable yubikey pam module\nuse `ykpamcfg` to configure";
+    };

-	id = lib.mkOption {
-		type = lib.str;
-		description = "yubikey id";
-	};
+    id = lib.mkOption {
+        type = lib.str;
+        description = "id of the yubikey written under connector";
+    };
  };

-   config = lib.mkIf config.mods.yubikey.enable {
+  config = lib.mkIf config.mods.yubikey.pam.enable {
    programs.gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
@ -22,8 +34,12 @@

    security.pam.yubico = {
      enable = true;
-      id =  config.mods.yubikey.id;
+      id =  config.mods.yubikey.pam.id;
      mode = "challenge-response";
    };
+
+    environment.systemPackages = with pkgs; [
+      yubico-pam
+    ];
  };
 }
--- a/osConfigs/os.nix
+++ b/osConfigs/os.nix
@ -0,0 +1,24 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    os.nix                                             :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:56:36 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:37 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ lib, flakeName, ... }:
+
+{
+  imports = lib.concatLists [
+    [ ./hardware-configuration.nix ]
+    (lib.fileset.toList ./global)
+    (lib.fileset.toList ./modules)
+  ];
+
+  system.stateVersion = "25.05";
+  environment.etc.nixosFlakeName.text = "${flakeName}";
+}
--- a/osConfigs/packages.nix
+++ b/osConfigs/packages.nix
@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    home-manager
-    vim
-    pciutils
-    usbutils
-    ntfs3g
-    cryptsetup
-    acpi
-    yubico-pam
-  ];
-}
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@ -0,0 +1,18 @@
+#ENC[AES256_GCM,data:1NcFm2XqZzmSSlr8wH4aXHDBhf+lOaZ/gUeK2T/U/hIBbqtfKtw=,iv:yS5iogRp6e3We/7wZnGy0XJzqLVfRVKlDhUs+tamcJ0=,tag:+z/qqF9n6/hQfv9aWXkCDQ==,type:comment]
+nextcloud_fuse:
+    password: ENC[AES256_GCM,data:Rlyc9wO3rXJ97AAMzM+vJclEJ+eaSPtHkitqRL0=,iv:yuS2Tyo2HZGVb9tbWmmgOEwkyzLhlvq8iZ2YjGD0u9E=,tag:pf8n4pTvseh1pd12w8w4tw==,type:str]
+sops:
+    age:
+        - recipient: age1sjzkhwr8ycdsmuj8xg8y4v2hcpuq9vethnhytxtwzeury692dsxqf80fwv
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPRXNiNG9vRzJraERMSytl
+            Qkc4SVluRWQ1bE5Dc2FpaHQ2WGkxeHF2TWdjCml3OXpockc0NFJ6dDJTVzNjLzNU
+            cWxHTzhBVno1TlVDaXplR2tuN2wzN0kKLS0tIG5pWmcxYlhlb1lCN3RqNG5hRFJS
+            clZaazZQdW5wYUhUNmM0QW91K0NLOTAKB6z7cKg54QmJo0U03u6RQkSCfJOAdeJa
+            DiyPYjm02BNe8YPFbBFRpyT7G++j3h0yG+/Nr2zcQFyMMEpMv5QJvg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2025-09-05T17:58:05Z"
+    mac: ENC[AES256_GCM,data:96G7VqaG8A46tQ1L7I2asiYtNZF7K3Wf+SzbwPrNV8zQio2jInawtD4WSzHmLs4Nv7M1TBHug/ho8mfYq6auXgpathiSzvj0Tzs/IEKXiTYa86tM3szwAepavMYWOl6OYJ7S39ku6BOMo3qC2BK/gpT5iy4c84ashn2wFd1n41A=,iv:6TShIsqnhCf/3uoAaz/R+Cwr2HrorROOXodXluTKM8M=,tag:BA9rQ73scKgetW3orV0HdQ==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.10.2
Author	SHA1	Message	Date
tomoron	fbc24916b5	refactor os configurations All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m10s Details	2025-09-06 01:27:10 +02:00
tomoron	4b66e2489b	add fuse nextcloud and age encrypted passwords All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m8s Details	2025-09-05 20:01:58 +02:00
tomoron	e13360f793	add yubikey to unlock FDE on laptop; update flake; minor wayland changes All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m38s Details	2025-09-04 15:17:30 +02:00
tomoron	1e46d42f27	remove stremio pacakge (insecure) All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m45s Details	2025-08-30 16:36:33 +02:00