diff --git a/modules/home/backtest/default.nix b/modules/home/backtest/default.nix index 794c803..46cf6ee 100644 --- a/modules/home/backtest/default.nix +++ b/modules/home/backtest/default.nix @@ -3,14 +3,14 @@ pkgs, ... }: { - home.packages = [inputs.backtest.packages.${pkgs.system}.default]; + home.packages = [inputs.backtest.packages.${pkgs.stdenv.hostPlatform.system}.default]; systemd.user.services.backtest = { Unit.Description = "Backtest Streamlit dashboard"; Unit.After = ["network.target"]; Service = { - ExecStart = "${inputs.backtest.packages.${pkgs.system}.default}/bin/backtest --server.port 8501"; - WorkingDirectory = "${inputs.backtest.packages.${pkgs.system}.default}/lib"; + ExecStart = "${inputs.backtest.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/backtest --server.port 8501"; + WorkingDirectory = "${inputs.backtest.packages.${pkgs.stdenv.hostPlatform.system}.default}/lib"; Restart = "on-failure"; RestartSec = "5s"; }; diff --git a/modules/home/gtk/default.nix b/modules/home/gtk/default.nix index 9eab489..5abfbef 100644 --- a/modules/home/gtk/default.nix +++ b/modules/home/gtk/default.nix @@ -59,6 +59,8 @@ in { catppuccin = { enable = true; + # explicite : catppuccin/nix va basculer l'auto-enrôlement sur autoEnable + autoEnable = true; flavor = "mocha"; accent = "lavender"; cursors.enable = true; @@ -75,6 +77,8 @@ in { iconTheme.package = lib.mkDefault pkgs.papirus-icon-theme; gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; + # comportement historique (stateVersion < 26.05) : GTK4 suit le thème GTK + gtk4.theme = config.gtk.theme; }; qt = { diff --git a/modules/home/option-pricer/default.nix b/modules/home/option-pricer/default.nix index 974a301..ba585fe 100644 --- a/modules/home/option-pricer/default.nix +++ b/modules/home/option-pricer/default.nix @@ -3,13 +3,13 @@ pkgs, ... }: { - home.packages = [inputs.option-pricer.packages.${pkgs.system}.default]; + home.packages = [inputs.option-pricer.packages.${pkgs.stdenv.hostPlatform.system}.default]; systemd.user.services.option-pricer = { Unit.Description = "option-pricer Streamlit dashboard"; Unit.After = ["network.target"]; Service = { - ExecStart = "${inputs.option-pricer.packages.${pkgs.system}.default}/bin/option-pricer --server.port 8503"; - WorkingDirectory = "${inputs.option-pricer.packages.${pkgs.system}.default}/lib/option-pricer"; + ExecStart = "${inputs.option-pricer.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/option-pricer --server.port 8503"; + WorkingDirectory = "${inputs.option-pricer.packages.${pkgs.stdenv.hostPlatform.system}.default}/lib/option-pricer"; Restart = "on-failure"; RestartSec = "5s"; }; diff --git a/modules/home/portfolio-optimizer/default.nix b/modules/home/portfolio-optimizer/default.nix index b77a9c7..4b4688b 100644 --- a/modules/home/portfolio-optimizer/default.nix +++ b/modules/home/portfolio-optimizer/default.nix @@ -3,14 +3,14 @@ pkgs, ... }: { - home.packages = [inputs.portfolio-optimizer.packages.${pkgs.system}.default]; + home.packages = [inputs.portfolio-optimizer.packages.${pkgs.stdenv.hostPlatform.system}.default]; systemd.user.services.portfolio-optimizer = { Unit.Description = "portfolio-optimizer Streamlit dashboard"; Unit.After = ["network.target"]; Service = { - ExecStart = "${inputs.portfolio-optimizer.packages.${pkgs.system}.default}/bin/portfolio-optimizer --server.port 8502"; - WorkingDirectory = "${inputs.portfolio-optimizer.packages.${pkgs.system}.default}/lib"; + ExecStart = "${inputs.portfolio-optimizer.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/portfolio-optimizer --server.port 8502"; + WorkingDirectory = "${inputs.portfolio-optimizer.packages.${pkgs.stdenv.hostPlatform.system}.default}/lib"; Restart = "on-failure"; RestartSec = "5s"; }; diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 07f3380..d01ce97 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: let +{ + config, + pkgs, + ... +}: let shellAliases = import ./aliases.nix; in { home.packages = with pkgs; [ @@ -9,6 +13,8 @@ in { programs.zsh = { enable = true; + # garde .zshrc dans ~ (défaut historique, stateVersion < 26.05) + dotDir = config.home.homeDirectory; enableCompletion = true; initContent = builtins.readFile ./profile.sh; diff --git a/users/marc/packages.nix b/users/marc/packages.nix index 11394e7..9b2d46e 100644 --- a/users/marc/packages.nix +++ b/users/marc/packages.nix @@ -186,7 +186,7 @@ in { wg-netmanager openvpn openvpn3 - protonvpn-gui + proton-vpn tor-browser ungoogled-chromium netsurf-browser