add some persist dirs

This commit is contained in:
Dmitriy Kholkin 2023-03-27 16:00:57 +03:00
parent f003e3af0f
commit 9fa46edbb1
12 changed files with 192 additions and 111 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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