diff --git a/hosts/common/base.nix b/hosts/common/base.nix index e4a85f3..404ac1d 100644 --- a/hosts/common/base.nix +++ b/hosts/common/base.nix @@ -105,10 +105,11 @@ options = "--delete-older-than 30d"; }; - # Convergence automatique depuis le repo public, sans netrc. + # Convergence automatique depuis le repo public, sans netrc. Cadence + # weekly (même format que oreo, plutôt que daily). system.autoUpgrade = { enable = true; - dates = "daily"; + dates = "weekly"; flake = "git+https://gitea.miniclic.net/Damien/Nixos_Fleet.git#usagers"; }; diff --git a/hosts/common/desktop.nix b/hosts/common/desktop.nix index 42d2fa9..955bb79 100644 --- a/hosts/common/desktop.nix +++ b/hosts/common/desktop.nix @@ -78,8 +78,84 @@ }; environment.systemPackages = with pkgs; [ + # === Office/Notes === libreoffice + pdfarranger + simple-scan + + # === System tools === + btop + unzip + screenfetch + tmux + fwupd + fwupd-efi + ncdu + gdu + hplip + gutenprint + cups + inxi + ntfs3g + + # === Communication/Media === thunderbird + ffmpeg vlc + mpv + strawberry ]; + + # Flatpak + services.flatpak.enable = true; + xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + + systemd.services.flatpak-repo = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + path = [ pkgs.flatpak ]; + script = '' + flatpak remote-add --if-not-exists flathub \ + https://dl.flathub.org/repo/flathub.flatpakrepo + ''; + }; + + systemd.services.flatpak-install = { + wantedBy = [ "multi-user.target" ]; + after = [ + "flatpak-repo.service" + "network-online.target" + ]; + wants = [ "network-online.target" ]; + requires = [ "flatpak-repo.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + path = [ pkgs.flatpak ]; + script = '' + flatpak install -y flathub \ + net.waterfox.waterfox \ + eu.betterbird.Betterbird + ''; + }; + + systemd.services.flatpak-update = { + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.flatpak ]; + script = '' + flatpak update -y + ''; + }; + + programs.appimage = { + enable = true; + binfmt = true; + }; }