add fuse nextcloud and age encrypted passwords

add yubikey to unlock FDE on laptop; update flake; minor wayland changes
remove stremio pacakge (insecure)
2025-09-05 20:01:58 +02:00 · 2025-09-04 15:17:30 +02:00 · 2025-08-30 16:36:33 +02:00 · 2025-08-28 23:39:10 +02:00 · 2025-08-28 23:38:22 +02:00 · 2025-08-15 19:16:46 +02:00
24 changed files with 327 additions and 146 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/8
+++ b/8
@ -1,7 +1,7 @@
 HOST ?= $(file < /etc/nixosFlakeName)
 THREADS ?= $(shell nproc)
 FLAKE ?= .
-MODE = boot
+MODE ?= boot

 FLAGS = --impure --cores $(THREADS) -j $(THREADS) 

@ -22,4 +22,10 @@ iso :
 	rm -rf result

 cleanup :
+	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": 1750651402,
-        "narHash": "sha256-mT97WT4FlJyvfWp7rso3tUZca0qKU46czyi/HBJHG4w=",
+        "lastModified": 1756958609,
+        "narHash": "sha256-1nRGsnPZjOubRTsXEsnJqWlLsgo/Xq7tN7PWK57dFDQ=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "13fa5e2e89062281dee88508f97e93360bfe2e2d",
+        "rev": "b2a4e1bc62946403f82594ab9550ac13a1afa4df",
        "type": "gitlab"
      },
      "original": {
@ -29,11 +47,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750690749,
-        "narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=",
+        "lastModified": 1756954499,
+        "narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "05b8c9506452349d8be854ac46e5a7630fa7917d",
+        "rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
        "type": "github"
      },
      "original": {
@ -44,11 +62,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1750431636,
-        "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
+        "lastModified": 1756925795,
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
        "type": "github"
      },
      "original": {
@ -60,11 +78,27 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1750506804,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "lastModified": 1756266583,
+        "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": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
        "type": "github"
      },
      "original": {
@ -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/05 18:37:36 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -15,6 +15,11 @@

  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 +31,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/global.nix ./osConfigs/hosts/${flakeName}.nix catppuccin.nixosModules.catppuccin]
 		  extraModules
 		];
      };
@ -49,7 +53,12 @@
        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
 		];
 	  };
@ -68,7 +77,6 @@
            (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
            ./osConfigs/hosts/iso.nix
 			inputs.home-manager.nixosModules.default
-
          ];
 		};
      };
@ -76,7 +84,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"; };
--- 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/ft.nix
+++ b/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";
--- a/homeConfigs/hosts/laptop.nix
+++ b/homeConfigs/hosts/laptop.nix
@ -36,9 +36,9 @@
  };

  home.packages = with pkgs; [
-    stremio
    blender
 	wireshark
+	localsend
  ];

 #mods.sync.syncedAdditions = ["VirtualBox VMs"];
--- a/homeConfigs/hosts/vbox.nix
+++ b/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 = {
--- 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
@ -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";

--- a/homeConfigs/modules/wayland/hyprland.nix
+++ b/homeConfigs/modules/wayland/hyprland.nix
@ -16,8 +16,10 @@
  	  " , 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,"
        "$mainMod, D, exec, rofi -show drun -show-icons"
        "$mainMod, M, fullscreen, 1"
        "$mainMod, F, fullscreen, 0"
@ -63,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"
@ -79,7 +81,7 @@
        " ,XF86KbdBrightnessDown, exec, asusctl -p"
      ];
  
-      bindl = [
+      bindl = [ #repeat
        " , XF86AudioNext, exec, playerctl next"
        " , XF86AudioPrev, exec, playerctl previous"
        " , XF86AudioPause, exec, playerctl play-pause"
@ -151,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/modules/x11/polybar.nix
+++ b/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 = "/";
-        interval = 30;
+        mount-0 = config.mods.polybar.fspath;
+        interval = 10;
        fixed-values = true;
        format-mounted = "<label-mounted>";
        format-mounted-prefix = "󰋊";
--- 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/04/15 15:58:07 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/05 19:28:45 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #

@ -14,22 +14,36 @@

 {
  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
    bibata-cursors
    libcaca
    nasm
+    nerd-fonts.iosevka
+	compiledb
+	yubikey-personalization
+	sops
  ];
 }
--- a/homeConfigs/result
+++ b/homeConfigs/result
@ -1 +0,0 @@
-/nix/store/ffxpgsp8bpdfab8kd0vnlpappy5s65ag-home-manager-generation
--- a/osConfigs/global.nix
+++ b/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;
 }
--- a/osConfigs/hosts/iso.nix
+++ b/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.users.tom = {
-    imports = [
-	  ../../homeConfigs/home.nix 
-	  ../../homeConfigs/hosts/iso.nix
-	];
-  };
+#  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,17 +1,65 @@
 { 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";
+		};
+	};
+  };
+
+  programs.fuse.enable = true;
+
+  boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ];

  mods.displayManager.enable = true;
-  mods.virtualmanager.enable = false;
+  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;
@ -36,24 +84,33 @@
  #power management
  powerManagement.enable = true;
  powerManagement.cpuFreqGovernor = "powersave";
-  services.auto-cpufreq.enable = true;
-  services.auto-cpufreq.settings = {
-    battery = {
-      governor = "powersave";
-      turbo = "never";
-    };
-    charger = {
-      governor = "performance";
-      turbo = "auto";
-    };
-  };
-  services.upower.enable = true;

-  services.udev.packages = [ pkgs.yubikey-personalization ];
+  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.upower.enable = true;

  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";
--- a/osConfigs/hosts/server.nix
+++ b/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"];
--- a/osConfigs/hosts/vbox.nix
+++ b/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;
 }

--- a/osConfigs/modules/displayManager.nix
+++ b/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;
--- a/osConfigs/modules/vboxHost.nix
+++ b/osConfigs/modules/vboxHost.nix
@ -12,5 +12,8 @@
  	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/packages.nix
+++ b/osConfigs/packages.nix
@ -2,31 +2,13 @@

 {
  environment.systemPackages = with pkgs; [
-    lrzip
    home-manager
    vim
    pciutils
-	pigz
-	htop
-	gnumake
-	git
-	neofetch
-	neovim
-	ntfs3g
-	clang
-	ninja
-	gdb
-	valgrind
-	wget
-	cmake
    usbutils
-	man-pages
-	stress
+    ntfs3g
    cryptsetup
    acpi
-	dconf
-
-	ffmpeg-full
-	nv-codec-headers
+    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	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
tomoron	7aef691ea2	update flake All checks were successful Build iso when a new version is pushed / test (push) Successful in 9m35s Details	2025-08-28 23:39:10 +02:00
tomoron	63d2538734	add localsend to laptop packages Some checks failed Build iso when a new version is pushed / test (push) Has been cancelled Details	2025-08-28 23:38:22 +02:00
tomoron	84bc2fd737	add usbmuxd on laptop All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m17s Details	2025-08-15 19:16:46 +02:00
tomoron	f362997567	update flake, add alvr on laptop	2025-08-12 17:12:08 +02:00
tomoron	ea4489732b	remove config All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m24s Details	2025-08-11 17:47:52 +02:00
tomoron	6c35b8fb99	fix typo in polybar module All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m31s Details	2025-08-07 15:30:14 +02:00
tomoron	76702ea878	use x11 on vbox and add option to polybar module for fspath All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m25s Details	2025-08-07 15:27:08 +02:00
tomoron	b261195413	fix 42header (deleted revision) All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m35s Details	2025-08-07 15:13:39 +02:00
tomoron	6651ba444e	add compiledb to packages fixes on vbox config All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m30s Details	2025-08-07 15:06:36 +02:00
tomoron	093ac9c011	set supergfxd config in nix files, change ly config, update flake All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m38s Details	2025-08-06 00:26:52 +02:00
tomoron	d6ca7ba793	update flake All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m27s Details	2025-07-30 18:52:08 +02:00
tomoron	17e3fc6a9e	Merge branch 'new-42-homes' All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m40s Details	2025-07-29 12:55:09 +02:00
tomoron	0da22649eb	move nerdfont.iosevka to home config (broken in os config) All checks were successful Build iso when a new version is pushed / test (push) Successful in 3m0s Details	2025-07-23 18:02:45 +02:00
tomoron	f14bc8c082	update flake and remove duplicate neovim All checks were successful Build iso when a new version is pushed / test (push) Successful in 2m31s Details	2025-07-21 23:00:41 +02:00
tomoron	c766b08973	remove full home config from iso Some checks failed Build iso when a new version is pushed / test (push) Failing after 2m41s Details	2025-07-16 20:07:12 +02:00
tomoron	27ca179697	update flake, sort system and home packages Some checks failed Build iso when a new version is pushed / test (push) Failing after 7m42s Details	2025-07-15 16:12:16 +02:00
tomoron	66b67b9b03	set kvmfr size to 128mb and change cleanup makefile rule Some checks failed Build iso when a new version is pushed / test (push) Has been cancelled Details	2025-07-15 12:37:05 +02:00
tomoron	116e81d080	change specialisation name, blacklist xpad when in vfio mode All checks were successful Build iso when a new version is pushed / test (push) Successful in 17m4s Details	2025-07-12 18:15:24 +02:00
tomoron	e64579832a	fix typo on laptop config All checks were successful Build iso when a new version is pushed / test (push) Successful in 18m35s Details	2025-07-12 16:57:03 +02:00
tomoron	11e350751a	repair usb redirection on libvirt Some checks failed Build iso when a new version is pushed / test (push) Has been cancelled Details	2025-07-12 16:54:59 +02:00
tomoron	d86380c995	add pin shortcut and add kvm windows gpu passthrough support in a specialisation config on laptop Some checks failed Build iso when a new version is pushed / test (push) Has been cancelled Details	2025-07-12 16:52:43 +02:00
tomoron	34e087b815	change home location Some checks are pending Build iso when a new version is pushed / test (push) Waiting to run Details	2025-04-09 16:50:26 +02:00
				`@ -1 +0,0 @@`
				`/nix/store/ffxpgsp8bpdfab8kd0vnlpappy5s65ag-home-manager-generation`