aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/by-name/at/atuin/module.nix1
-rw-r--r--modules/by-name/ba/backup/module.nix4
-rw-r--r--modules/by-name/bo/boot/module.nix27
-rw-r--r--modules/by-name/di/disks/module.nix15
-rw-r--r--modules/by-name/lf/lf/commands/default.nix9
-rw-r--r--modules/by-name/lf/lf/ctpv/prev/application/archive/default.nix2
-rwxr-xr-xmodules/by-name/lf/lf/wrappers/ll/ll.sh14
-rw-r--r--modules/by-name/qu/qutebrowser/include/redirects.py2
-rw-r--r--modules/common/default.nix2
9 files changed, 27 insertions, 49 deletions
diff --git a/modules/by-name/at/atuin/module.nix b/modules/by-name/at/atuin/module.nix
index 6cf8a396..78a4332c 100644
--- a/modules/by-name/at/atuin/module.nix
+++ b/modules/by-name/at/atuin/module.nix
@@ -10,7 +10,6 @@
{
config,
lib,
- pkgs,
...
}: let
cfg = config.soispha.programs.atuin;
diff --git a/modules/by-name/ba/backup/module.nix b/modules/by-name/ba/backup/module.nix
index 7a788764..dd0dfac7 100644
--- a/modules/by-name/ba/backup/module.nix
+++ b/modules/by-name/ba/backup/module.nix
@@ -186,7 +186,7 @@ in {
# This setting is normally passed to rclone, but we force
# the command on the remote.
- # As such, the value does not matter and must only be parseable by restic.
+ # As such, the value does not matter and must only be parse-able by restic.
repository = "rclone: ";
timerConfig = {
@@ -209,7 +209,7 @@ in {
# This setting is normally passed to rclone, but we force
# the command on the remote.
- # As such, the value does not matter and must only be parseable by restic.
+ # As such, the value does not matter and must only be parse-able by restic.
repository = "rclone: ";
timerConfig = null;
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 01c98d6e..6a0c0cf7 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -35,29 +35,8 @@ in {
# this module.
soispha.impermanence.directories = [
"/var/lib/sbctl"
- "/boot"
];
- fileSystems = {
- # Emulate XBOOTLDR for lanzaboote (see: https://github.com/nix-community/lanzaboote/issues/173#issuecomment-1532386210)
- "/efi/EFI/Linux" = {
- device = "/boot/EFI/Linux";
- options = ["bind"];
- fsType = "btrfs";
- };
- "/efi/EFI/nixos" = {
- device = "/boot/EFI/nixos";
- options = ["bind"];
- fsType = "btrfs";
- };
-
- "/efi/${tailsPrefix}" = lib.mkIf cfg.enableIsoEntry {
- device = "/boot/${tailsPrefix}";
- options = ["bind"];
- fsType = "btrfs";
- };
- };
-
boot = {
initrd = {
kernelModules = ["nvme" "btrfs"];
@@ -134,6 +113,8 @@ in {
systemdCfg.extraFiles
)}
+ ${lib.getExe pkgs.sbctl} sign "${bootMountPoint}/${tailsPrefix}/vmlinuz-linux"
+
${concatStrings (
mapAttrsToList (n: v: ''
${install} -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n}
@@ -155,7 +136,7 @@ in {
title Tails Live ISO
linux /${tailsPrefix}/vmlinuz-linux
initrd /${tailsPrefix}/initramfs-linux.img
- options img_dev=${config.soispha.disks.disk} img_loop=/${tailsPrefix}/tails.iso copytoram
+ options root=/${tailsPrefix}/tails.iso
'';
};
@@ -170,7 +151,7 @@ in {
efi = {
canTouchEfiVariables = true;
- efiSysMountPoint = "/efi";
+ efiSysMountPoint = "/boot";
};
};
};
diff --git a/modules/by-name/di/disks/module.nix b/modules/by-name/di/disks/module.nix
index 542648a2..ed5c939a 100644
--- a/modules/by-name/di/disks/module.nix
+++ b/modules/by-name/di/disks/module.nix
@@ -50,7 +50,7 @@ in {
services.btrfs.autoScrub = {
enable = true;
- fileSystems = ["/srv" "/nix" "/boot"];
+ fileSystems = ["/srv" "/nix"];
interval = "monthly";
};
@@ -62,21 +62,20 @@ in {
type = "gpt";
partitions = {
ESP = {
- # This can be relatively small, as we store all the big stuff in the
- # XBOOTLDR directory.
- size = "256M";
+ # 2GiB plus 512MiB for tails ISO and normal boot stuff
+ size = "2600M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
- mountpoint = "/efi";
+ mountpoint = "/boot";
mountOptions = ["umask=0077"];
};
};
nix = {
- size = "30GB";
+ size = "30G";
content = {
type = "luks";
name = "nixos-store";
@@ -108,10 +107,6 @@ in {
mountpoint = "/srv/.snapshots";
mountOptions = defaultMountOptions;
};
- "boot" = {
- mountpoint = "/boot";
- mountOptions = defaultMountOptions;
- };
"swap" = {
mountpoint = "/swap";
mountOptions = [
diff --git a/modules/by-name/lf/lf/commands/default.nix b/modules/by-name/lf/lf/commands/default.nix
index e8230556..ae02c45b 100644
--- a/modules/by-name/lf/lf/commands/default.nix
+++ b/modules/by-name/lf/lf/commands/default.nix
@@ -16,7 +16,14 @@
pkgs.writeShellApplication {
inherit name;
text = builtins.readFile ./base.sh + builtins.readFile ./scripts/${name}.sh;
- runtimeInputs = [pkgs.lf pkgs.mktemp pkgs.coreutils] ++ dependencies;
+ runtimeInputs =
+ [
+ pkgs.lf
+ pkgs.mktemp
+ pkgs.coreutils
+ pkgs.gnused
+ ]
+ ++ dependencies;
inheritPath = keepPath;
}
+ "/bin/${name}";
diff --git a/modules/by-name/lf/lf/ctpv/prev/application/archive/default.nix b/modules/by-name/lf/lf/ctpv/prev/application/archive/default.nix
index d64c9572..dc34d5de 100644
--- a/modules/by-name/lf/lf/ctpv/prev/application/archive/default.nix
+++ b/modules/by-name/lf/lf/ctpv/prev/application/archive/default.nix
@@ -94,6 +94,8 @@
pkgs.xz
pkgs.zip
+ pkgs.coreutils
+
# Unfree stuff
# pkgs.lha
# pkgs.rar
diff --git a/modules/by-name/lf/lf/wrappers/ll/ll.sh b/modules/by-name/lf/lf/wrappers/ll/ll.sh
index ce29fd97..9bb314c6 100755
--- a/modules/by-name/lf/lf/wrappers/ll/ll.sh
+++ b/modules/by-name/lf/lf/wrappers/ll/ll.sh
@@ -10,20 +10,14 @@
# You should have received a copy of the License along with this program.
# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-last_directory="$(mktemp -t ll_last_directory_XXXXXXX)"
-cleanup() {
- rm "$last_directory"
-}
-trap cleanup EXIT
+[ -d "$XDG_RUNTIME_DIR/ll" ] || mkdir "$XDG_RUNTIME_DIR/ll"
+last_directory="$XDG_RUNTIME_DIR/ll/last_directory"
command lf -last-dir-path="$last_directory" "$@"
dir="$(cat "$last_directory")"
-if cd "$dir"; then
- [ -d "$XDG_RUNTIME_DIR/ll" ] || mkdir "$XDG_RUNTIME_DIR/ll"
- echo "$dir" >"$XDG_RUNTIME_DIR/ll/last_directory"
-else
- die "$dir does not exist!"
+if ! cd "$dir"; then
+ die "ll: Failed to cd to '$dir'. Does it exist?"
fi
# vim: ft=sh
diff --git a/modules/by-name/qu/qutebrowser/include/redirects.py b/modules/by-name/qu/qutebrowser/include/redirects.py
index 63a44ecf..2588b9e0 100644
--- a/modules/by-name/qu/qutebrowser/include/redirects.py
+++ b/modules/by-name/qu/qutebrowser/include/redirects.py
@@ -34,7 +34,7 @@ def farside_redir(target: str, url: QUrl) -> bool:
# Any return value other than a literal 'False' means we redirect
REDIRECT_MAP: typing.Dict[str, typing.Callable[..., typing.Optional[bool]]] = {
- "reddit.com": operator.methodcaller("setHost", "redlib.vhack.eu"),
+ "reddit.com": partial(farside_redir, "redlib"),
# Source: https://libredirect.github.io/
"medium.com": partial(farside_redir, "scribe"),
"stackoverflow.com": partial(farside_redir, "anonymousoverflow"),
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 080d3f2a..ea9f2ded 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -106,7 +106,7 @@
"~/.local/share/maildir"
- # "Unknown filetype (and there is no real reason to (try to) synchronize sockets)"
+ # "Unknown filetype" (and there is no real reason to (try to) synchronize sockets)
"~/.local/share/gnupg/S.gpg-agent"
"~/.local/share/gnupg/S.gpg-agent.browser"
"~/.local/share/gnupg/S.gpg-agent.extra"
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-01 07:29:27 +0000