add some persist dirs

profiles/applications/corectrl.nix

@@ -8,5 +8,9 @@ with config.deviceSpecific; {
     };
 
     startupApplications = [ "${pkgs.corectrl}/bin/corectrl" ];
+
+    persist.state.homeDirectories = [
+      ".config/corectrl"
+    ];
   };
 }

profiles/applications/firefox.nix

@@ -18,6 +18,8 @@ let
     ${pkgs.firefox}/bin/firefox -profile ${homeDir}/.mozilla/firefox/kpoxa
   '';
 in {
+  services.dbus.packages = [ pkgs.firefox-wayland ];
+
   environment.sessionVariables = {
     MOZ_USE_XINPUT2 = "1";
     MOZ_DBUS_REMOTE = "1";
@@ -177,7 +179,7 @@ in {
   };
 
   persist.state.homeDirectories = [
-    ".mozilla/firefox/default"
+    ".mozilla/firefox/${config.mainuser}"
     ".mozilla/firefox/kpoxa"
   ];
 }

profiles/applications/himalaya.nix

@@ -4,20 +4,42 @@
     home.packages = [ pkgs.himalaya ];
 
     xdg.configFile."himalaya/config.toml".text = ''
-      downloads-dir="/home/${config.mainuser}/Downloads/mail"
-      name="Dmitriy Kholkin"
-      signature="Regards,"
+      downloads-dir = "/home/${config.mainuser}/Downloads/mail"
+      name = "Dmitriy Kholkin"
+      signature = "Regards,"
+      # email-reading-verify-cmd
+      # email-reading-decrypt-cmd
+      # email-writing-sign-cmd
+      # email-writing-encrypt-cmd
+      # notify-cmd
+      # notify-query
+      # sync
+
       [ataraxiadev]
-      default=true
-      email="ataraxiadev@ataraxiadev.com"
-      imap-host="mail.ataraxiadev.com"
-      imap-login="ataraxiadev@ataraxiadev.com"
-      imap-passwd-cmd="pass show email/ataraxiadev@ataraxiadev.com"
-      imap-port=993
-      smtp-host="mail.ataraxiadev.com"
-      smtp-login="ataraxiadev@ataraxiadev.com"
-      smtp-passwd-cmd="pass show email/ataraxiadev@ataraxiadev.com"
-      smtp-port=995
+      default = true
+      email = "ataraxiadev@ataraxiadev.com"
+
+      backend = "imap"
+      imap-host = "mail.ataraxiadev.com"
+      imap-port = 993
+      imap-login = "ataraxiadev@ataraxiadev.com"
+      imap-passwd-cmd = "${pkgs.pass}/bin/pass show email/ataraxiadev@ataraxiadev.com"
+      imap-ssl = true
+      imap-starttls = false
+      imap-insecure = false
+
+      sender = "smtp"
+      smtp-host = "mail.ataraxiadev.com"
+      smtp-port = 465
+      smtp-login = "ataraxiadev@ataraxiadev.com"
+      smtp-passwd-cmd = "${pkgs.pass}/bin/pass show email/ataraxiadev@ataraxiadev.com"
+      smtp-ssl = true
+      smtp-starttls = false
+      smtp-insecure = false
     '';
   };
+
+  persist.state.homeDirectories = [
+    ".config/himalaya"
+  ];
 }

profiles/applications/mpv.nix

@@ -22,4 +22,8 @@
       --mark-watched
     '';
   };
+
+  persist.state.homeDirectories = [
+    ".config/mpv"
+  ];
 }

profiles/applications/nnn.nix

@@ -17,4 +17,8 @@
       "n" = "nnn -deE";
     };
   };
+
+  persist.state.homeDirectories = [
+    ".config/nnn"
+  ];
 }

profiles/applications/packages.nix

@@ -2,99 +2,130 @@
 with config.deviceSpecific; {
   programs.adb.enable = true;
 
-  home-manager.users.${config.mainuser}.home.packages = with pkgs; [
-    # cli
-    a2ln
-    bat
-    comma
-    curl
-    exa
-    fd
-    ffmpeg.bin
-    # git-filter-repo
-    glib.out
-    # gptfdisk
-    jq
-    libqalculate
-    lm_sensors
-    lnav
-    # nix-alien
-    nix-prefetch-git
-    nix-index-update
-    p7zip
-    # (p7zip.override { enableUnfree = true; })
-    pciutils
-    # pinfo
-    ripgrep
-    ripgrep-all
-    sd
-    tealdeer
-    translate-shell
-    unrar
-    unzip
-    usbutils
-    wget
-    yt-dlp
-    zip
+  home-manager.users.${config.mainuser} = {
+    home.packages = with pkgs; [
+      # cli
+      a2ln
+      bat
+      comma
+      curl
+      exa
+      fd
+      ffmpeg.bin
+      # git-filter-repo
+      glib.out
+      # gptfdisk
+      jq
+      libqalculate
+      lm_sensors
+      lnav
+      # nix-alien
+      nix-prefetch-git
+      nix-index-update
+      p7zip
+      # (p7zip.override { enableUnfree = true; })
+      pciutils
+      # pinfo
+      ripgrep
+      ripgrep-all
+      sd
+      tealdeer
+      translate-shell
+      unrar
+      unzip
+      usbutils
+      wget
+      yt-dlp
+      zip
 
-    # tui
-    bottom
-    micro
-    ncdu
-    nix-tree
-    procs
+      # tui
+      bottom
+      micro
+      ncdu
+      nix-tree
+      procs
 
-    # gui
-    bitwarden
-    ungoogled-chromium
-    deadbeef
-    discord
-    feh
-    foliate
-    pinta
-    qbittorrent
-    qimgv
-    system-config-printer
-    tdesktop
-    xarchiver
-    youtube-to-mpv
-    zathura
+      # gui
+      bitwarden
+      ungoogled-chromium
+      deadbeef
+      discord
+      feh
+      foliate
+      pinta
+      qbittorrent
+      qimgv
+      system-config-printer
+      tdesktop
+      xarchiver
+      youtube-to-mpv
+      zathura
 
-    xdg-utils
+      xdg-utils
 
-    # awesome-shell
-    curlie
-    duf
-    zsh-z
-  ] ++ lib.optionals (!(isVM || isISO)) [
-    audacity
-    blueman
-    cachix
-    jellyfin-media-player
-    joplin-desktop
-    libreoffice
-    nodePackages.peerflix
-    samba
-    schildichat-desktop-wayland
-    scrcpy
-    sonixd
-  ] ++ lib.optionals isGaming [
-    ceserver
-    gamescope
-    # goverlay
-    lutris
-    moonlight-qt
-    obs-studio
-    # reshade-shaders
-    # (retroarch.override { cores = [ libretro.genesis-plus-gx libretro.dosbox ]; })
-    # parsec
-    protonhax
-    protontricks
-    vkBasalt
-    wine
-    winetricks
-  ] ++ lib.optionals isLaptop [
-    acpi
-    # seadrive-fuse
+      # awesome-shell
+      curlie
+      duf
+      zsh-z
+    ] ++ lib.optionals (!(isVM || isISO)) [
+      audacity
+      blueman
+      cachix
+      jellyfin-media-player
+      joplin-desktop
+      libreoffice
+      monero-gui
+      nodePackages.peerflix
+      samba
+      schildichat-desktop-wayland
+      # scrcpy
+      sonixd
+    ] ++ lib.optionals isGaming [
+      ceserver
+      gamescope
+      # goverlay
+      lutris
+      moonlight-qt
+      obs-studio
+      # reshade-shaders
+      # (retroarch.override { cores = [ libretro.genesis-plus-gx libretro.dosbox ]; })
+      # parsec
+      protonhax
+      protontricks
+      vkBasalt
+      wine
+      winetricks
+    ] ++ lib.optionals isLaptop [
+      acpi
+      # seadrive-fuse
+    ];
+  };
+
+  persist.state.homeDirectories = [
+    # ".config/audacity"
+    ".config/Bitwarden"
+    ".config/chromium"
+    ".config/deadbeef"
+    ".config/discord"
+    ".config/jellyfin.org"
+    ".config/joplin-desktop"
+    ".config/kdeconnect"
+    ".config/libreoffice"
+    # ".config/looking-glass"
+    ".config/lutris"
+    # ".config/monero-project"
+    ".config/obs-studio"
+    ".config/pcmanfm"
+    # ".config/Pinta"
+    ".config/qBittorrent"
+    ".config/rclone"
+    # ".config/qimgv"
+    ".config/SchildiChat"
+    ".config/Sonixd"
+    # ".config/xarchiver"
+    ".local/share/TelegramDesktop"
+    ".android"
+    ".anydesk"
+    ".monero"
   ];
 }

profiles/applications/spotify.nix

@@ -5,4 +5,8 @@
   startupApplications = [
     "${pkgs.spotifywm}/bin/spotifywm"
   ];
+
+  persist.state.homeDirectories = [
+    ".config/spotify"
+  ];
 }

profiles/applications/steam.nix

@@ -8,10 +8,6 @@
     "${pkgs.steam}/bin/steam"
   ];
 
-  persist.state.homeDirectories = [
-    ".local/share/Steam"
-  ];
-
   systemd.user.services.x11-ownership = rec {
     script = ''
       doas chown ${config.mainuser} /tmp/.X11-unix
@@ -20,6 +16,10 @@
     wantedBy = [ "hyprland-session.target" ];
   };
 
+  persist.state.homeDirectories = [
+    ".local/share/Steam"
+  ];
+
   # Start Steam only after the network is up
   # home-manager.users.${config.mainuser}.systemd.user.services.steam-startup = {
   #   Service = {

profiles/applications/vscode/default.nix

@@ -17,6 +17,10 @@ in
     desktop = "code-wayland";
   };
 
+  persist.state.homeDirectories = [
+    ".config/Code"
+  ];
+
   home-manager.users.${config.mainuser} = {
     programs.vscode = {
       enable = true;

profiles/virtualisation.nix

@@ -70,9 +70,9 @@ with config.deviceSpecific; {
         [storage]
         driver = "overlay2"
       '';
-      home.file.".config/libvirt/libvirt.conf".text = ''
-        uri_default = "qemu:///system"
-      '';
+      # home.file.".config/libvirt/libvirt.conf".text = ''
+      #   uri_default = "qemu:///system"
+      # '';
     };
 
 #     users.users.${config.mainuser} = {
@@ -88,6 +88,10 @@ with config.deviceSpecific; {
 
     programs.extra-container.enable = true;
 
+    persist.state.homeDirectories = [
+      ".config/containers"
+    ];
+
     persist.state.directories = lib.mkIf (devInfo.fileSystem != "zfs") [
       "/var/lib/docker"
       "/var/lib/libvirt"

profiles/vpn.nix

@@ -12,6 +12,7 @@ in {
       };
       startupApplications = [ "${pkgs.mullvad-vpn}/bin/mullvad-gui" ];
       persist.state.homeDirectories = [ ".config/Mullvad VPN" ];
+      persist.state.directories = [ "/etc/mullvad-vpn" ];
       persist.cache.directories = [ "/var/cache/mullvad-vpn" ];
     })
 

profiles/workspace/copyq.nix

@@ -7,4 +7,5 @@
     # command = "move position mouse";
   };
   startupApplications = [ "${pkgs.copyq}/bin/copyq" ];
+  persist.state.homeDirectories = [ ".config/copyq" ];
 }