Rename filesystem directory

This commit is contained in:
Manuel Thalmann 2024-12-07 18:36:19 +01:00
parent c818c8c477
commit 4f3c380340
13 changed files with 9 additions and 9 deletions

View file

@ -4,7 +4,7 @@ let
cfg = config.valhalla.fileSystems;
in {
imports = [
./partition/disks.nix
./fileSystems/disks.nix
];
options = {
@ -33,7 +33,7 @@ in {
+ (lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init devices)))
+ (if (builtins.length devices) > 1 then " and " else "") + (lib.lists.last devices).deviceVariable + ''"'')
''
if ! fish ${./partition/confirm.fish} "Are you sure you want to continue?" "n"; then
if ! fish ${./fileSystems/confirm.fish} "Are you sure you want to continue?" "n"; then
exit 1
fi
''

View file

@ -1,5 +1,5 @@
{ ... }: {
imports = [
./partition/disks.nix
./fileSystems/disks.nix
];
}

View file

@ -1,5 +1,5 @@
{ lib, config, ... }:
let fs = import ../../../../lib/modules/partition/fs.nix;
let fs = import ../../../../lib/modules/fileSystems/fs.nix;
in {
imports = [ ../defaults.nix ];

View file

@ -1,5 +1,5 @@
{ lib, config, ... }:
let fs = import ../../../lib/modules/partition/fs.nix;
let fs = import ../../../lib/modules/fileSystems/fs.nix;
in {
imports = [ ../../users/manuel/config.nix ];

View file

@ -7,7 +7,7 @@ function initBackupConfig -V dir -d "Fetches the configuration by prompting the
if [ -z "$VALHALLA_BACKUP_DIR" ]
argparse -i "action=" -- $argv
set -l index
set -l confirm fish "$dir/../../lib/modules/partition/confirm.fish"
set -l confirm fish "$dir/../../lib/modules/fileSystems/confirm.fish"
switch "$_flag_action"
case backup

View file

@ -4,7 +4,7 @@ function isConfigured -S
end
function selectProfile -S -a result
source "$(status dirname)/../../lib/modules/partition/select.fish"
source "$(status dirname)/../../lib/modules/fileSystems/select.fish"
set -l file (mktemp)
set -l header NAME
set -l profiles

View file

@ -1,6 +1,6 @@
#!/bin/env fish
function chooseDisk -a result message
set -l file (mktemp)
fish "$(status dirname)/../../lib/modules/partition/choose-disk.fish" "$file" "$message"
fish "$(status dirname)/../../lib/modules/fileSystems/choose-disk.fish" "$file" "$message"
set -g "$result" (cat "$file")
end

View file

@ -1,4 +1,4 @@
#!/bin/env fish
function confirm -a message default
fish "$(status dirname)/../../lib/modules/partition/confirm.fish" $argv
fish "$(status dirname)/../../lib/modules/fileSystems/confirm.fish" $argv
end