refactor: purge impermanence.home-files
option
persisting individual files doesn't work super well. we can do without it and things are simpler.
This commit is contained in:
parent
8345375bc4
commit
ebf3152ced
|
@ -14,10 +14,6 @@ in
|
|||
default = false;
|
||||
type = types.bool;
|
||||
};
|
||||
sane.impermanence.home-files = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
sane.impermanence.home-dirs = mkOption {
|
||||
default = [];
|
||||
type = types.listOf (types.either types.str (types.attrsOf types.str));
|
||||
|
@ -40,14 +36,6 @@ in
|
|||
map-sys-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
|
||||
map-service-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
|
||||
|
||||
map-home-files = files: builtins.map (f: {
|
||||
parentDirectory = {
|
||||
user = "colin";
|
||||
group = "users";
|
||||
mode = "0755";
|
||||
};
|
||||
file = "/home/colin/${f}";
|
||||
}) files;
|
||||
in mkIf cfg.enable {
|
||||
sane.image.extraDirectories = [ "/nix/persist/var/log" ];
|
||||
environment.persistence."/nix/persist" = {
|
||||
|
@ -107,7 +95,7 @@ in
|
|||
# "/etc/group"
|
||||
# "/etc/passwd"
|
||||
# "/etc/shadow"
|
||||
] ++ map-home-files cfg.home-files;
|
||||
];
|
||||
};
|
||||
|
||||
systemd.services.sane-sops = {
|
||||
|
|
|
@ -13,8 +13,6 @@ let
|
|||
pkglist = pkgspec: builtins.map (e: e.pkg or e) pkgspec;
|
||||
# extract `dir` from `extraPackages`
|
||||
dirlist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "dir" then [ e.dir ] else []) pkgspec);
|
||||
# extract `persist-files` from `extraPackages`
|
||||
persistfileslist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "persist-files" then e.persist-files else []) pkgspec);
|
||||
# TODO: dirlist and persistfileslist should be folded
|
||||
feeds = import ./feeds.nix { inherit lib; };
|
||||
in
|
||||
|
@ -67,7 +65,6 @@ in
|
|||
"Pictures"
|
||||
"Videos"
|
||||
] ++ (dirlist cfg.extraPackages);
|
||||
sane.impermanence.home-files = persistfileslist cfg.extraPackages;
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
|
|
@ -114,7 +114,7 @@ let
|
|||
tdesktop # broken on phosh
|
||||
|
||||
# vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf
|
||||
{ pkg = vlc; persist-files = [ ".config/vlc/vlc-qt-interface.conf" ]; }
|
||||
{ pkg = vlc; dir = ".config/vlc"; }
|
||||
|
||||
whalebird # pleroma client. input is broken on phosh
|
||||
xdg-utils # for xdg-open
|
||||
|
|
Loading…
Reference in New Issue
Block a user