Rename filesystem directory
This commit is contained in:
parent
c818c8c477
commit
4f3c380340
13 changed files with 9 additions and 9 deletions
|
@ -4,7 +4,7 @@ let
|
||||||
cfg = config.valhalla.fileSystems;
|
cfg = config.valhalla.fileSystems;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./partition/disks.nix
|
./fileSystems/disks.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
@ -33,7 +33,7 @@ in {
|
||||||
+ (lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init devices)))
|
+ (lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init devices)))
|
||||||
+ (if (builtins.length devices) > 1 then " and " else "") + (lib.lists.last devices).deviceVariable + ''"'')
|
+ (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
|
exit 1
|
||||||
fi
|
fi
|
||||||
''
|
''
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ ... }: {
|
{ ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./partition/disks.nix
|
./fileSystems/disks.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, config, ... }:
|
{ lib, config, ... }:
|
||||||
let fs = import ../../../../lib/modules/partition/fs.nix;
|
let fs = import ../../../../lib/modules/fileSystems/fs.nix;
|
||||||
in {
|
in {
|
||||||
imports = [ ../defaults.nix ];
|
imports = [ ../defaults.nix ];
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, config, ... }:
|
{ lib, config, ... }:
|
||||||
let fs = import ../../../lib/modules/partition/fs.nix;
|
let fs = import ../../../lib/modules/fileSystems/fs.nix;
|
||||||
in {
|
in {
|
||||||
imports = [ ../../users/manuel/config.nix ];
|
imports = [ ../../users/manuel/config.nix ];
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ function initBackupConfig -V dir -d "Fetches the configuration by prompting the
|
||||||
if [ -z "$VALHALLA_BACKUP_DIR" ]
|
if [ -z "$VALHALLA_BACKUP_DIR" ]
|
||||||
argparse -i "action=" -- $argv
|
argparse -i "action=" -- $argv
|
||||||
set -l index
|
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"
|
switch "$_flag_action"
|
||||||
case backup
|
case backup
|
||||||
|
|
|
@ -4,7 +4,7 @@ function isConfigured -S
|
||||||
end
|
end
|
||||||
|
|
||||||
function selectProfile -S -a result
|
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 file (mktemp)
|
||||||
set -l header NAME
|
set -l header NAME
|
||||||
set -l profiles
|
set -l profiles
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/env fish
|
#!/bin/env fish
|
||||||
function chooseDisk -a result message
|
function chooseDisk -a result message
|
||||||
set -l file (mktemp)
|
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")
|
set -g "$result" (cat "$file")
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/env fish
|
#!/bin/env fish
|
||||||
function confirm -a message default
|
function confirm -a message default
|
||||||
fish "$(status dirname)/../../lib/modules/partition/confirm.fish" $argv
|
fish "$(status dirname)/../../lib/modules/fileSystems/confirm.fish" $argv
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue