chore: bump all
This commit is contained in:
@@ -7,9 +7,9 @@ in {
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.dms-shell = {
|
||||
programs.dank-material-shell = {
|
||||
enable = true;
|
||||
enableDynamicTheming = false;
|
||||
# enableDynamicTheming = false;
|
||||
};
|
||||
|
||||
# Start after xwayland-satellite, if possible. So DMS can start
|
||||
@@ -19,10 +19,48 @@ in {
|
||||
after = ["xwayland-satellite.service"];
|
||||
};
|
||||
|
||||
services.displayManager.dms-greeter = {
|
||||
enable = true;
|
||||
compositor.name = assert config.sydnix.niri.enable; "niri";
|
||||
configHome = "/home/msyds"; # Really stupid.
|
||||
# programs.dank-material-shell.greeter = {
|
||||
# enable = true;
|
||||
# compositor.name = "niri";
|
||||
# # configHome = "/home/msyds";
|
||||
# logs = {
|
||||
# save = true;
|
||||
# path = "/tmp/dms-greeter.log";
|
||||
# };
|
||||
# };
|
||||
|
||||
# services.greetd.settings.default_session.command = "";
|
||||
|
||||
services.displayManager = {
|
||||
autoLogin.enable = false;
|
||||
dms-greeter = {
|
||||
enable = true;
|
||||
compositor = {
|
||||
name = assert config.sydnix.niri.enable; "niri";
|
||||
# see: https://github.com/AvengeMedia/DankMaterialShell/commit/5ceb908b8b69c253e259b5437020192dcad4bfde
|
||||
customConfig = ''
|
||||
hotkey-overlay {
|
||||
skip-at-startup
|
||||
}
|
||||
environment {
|
||||
DMS_RUN_GREETER "1"
|
||||
}
|
||||
gestures {
|
||||
hot-corners {
|
||||
off
|
||||
}
|
||||
}
|
||||
layout {
|
||||
background-color "#000000"
|
||||
}
|
||||
'';
|
||||
};
|
||||
# configHome = "/home/msyds"; # Really stupid.
|
||||
logs = {
|
||||
save = true;
|
||||
path = "/var/lib/dms-greeter/log";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,36 +24,51 @@ in {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
# Mount the btrfs filesystem.
|
||||
mkdir -p /btrfs-tmp
|
||||
mount -t btrfs "${cfg.device}" /btrfs-tmp
|
||||
boot.initrd.systemd.services.rollback = {
|
||||
description = ''
|
||||
Rollback root filesystem to empty while maintaining old roots
|
||||
'';
|
||||
wantedBy = [ "initrd.target" ];
|
||||
before = [ "sysroot.mount" ];
|
||||
path = with pkgs; [
|
||||
coreutils
|
||||
findutils
|
||||
util-linuxMinimal.bin
|
||||
btrfs-progs
|
||||
];
|
||||
unitConfig.DefaultDependencies = "no";
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
# Mount the btrfs filesystem.
|
||||
mkdir -p /btrfs-tmp
|
||||
mount -t btrfs "${cfg.device}" /btrfs-tmp
|
||||
|
||||
# If the moribund subvolume exists, send it do 'death row' (old-roots),
|
||||
# where live for about three days before its eventual deletion.
|
||||
if [[ -e "/btrfs-tmp/${cfg.subvolume}" ]]; then
|
||||
mkdir -p /btrfs-tmp/old-roots
|
||||
timestamp=$(date --date="@$(stat -c %Y "/btrfs-tmp/${cfg.subvolume}")" "+%Y-%m-%-d_%H:%M:%S")
|
||||
mv "/btrfs-tmp/${cfg.subvolume}" "/btrfs-tmp/old-roots/$timestamp"
|
||||
fi
|
||||
# If the moribund subvolume exists, send it do 'death row' (old-roots),
|
||||
# where live for about three days before its eventual deletion.
|
||||
if [[ -e "/btrfs-tmp/${cfg.subvolume}" ]]; then
|
||||
mkdir -p /btrfs-tmp/old-roots
|
||||
timestamp=$(date --date="@$(stat -c %Y "/btrfs-tmp/${cfg.subvolume}")" "+%Y-%m-%-d_%H:%M:%S")
|
||||
mv "/btrfs-tmp/${cfg.subvolume}" "/btrfs-tmp/old-roots/$timestamp"
|
||||
fi
|
||||
|
||||
delete_subvolume_recursively() {
|
||||
IFS=$'\n'
|
||||
for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
|
||||
delete_subvolume_recursively "/btrfs-tmp/$i"
|
||||
done
|
||||
btrfs subvolume delete "$1"
|
||||
}
|
||||
delete_subvolume_recursively() {
|
||||
IFS=$'\n'
|
||||
for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
|
||||
delete_subvolume_recursively "/btrfs-tmp/$i"
|
||||
done
|
||||
btrfs subvolume delete "$1"
|
||||
}
|
||||
|
||||
# Delete previous roots older than three days.
|
||||
# TODO: I would prefer archiving the last N previous roots, rather than
|
||||
# time.
|
||||
for i in $(find /btrfs-tmp/old-roots/ -maxdepth 1 -mtime +3); do
|
||||
delete_subvolume_recursively "$i"
|
||||
done
|
||||
# Delete previous roots older than three days.
|
||||
# TODO: I would prefer archiving the last N previous roots, rather than
|
||||
# time.
|
||||
for i in $(find /btrfs-tmp/old-roots/ -maxdepth 1 -mtime +3); do
|
||||
delete_subvolume_recursively "$i"
|
||||
done
|
||||
|
||||
btrfs subvolume create "/btrfs-tmp/${cfg.subvolume}"
|
||||
umount /btrfs-tmp
|
||||
'';
|
||||
btrfs subvolume create "/btrfs-tmp/${cfg.subvolume}"
|
||||
umount /btrfs-tmp
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ in {
|
||||
package = pkgs.niri-unstable;
|
||||
};
|
||||
|
||||
security.pam.services.swaylock = {};
|
||||
# security.pam.services.swaylock = {};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user