feat: Replace disk configuration

This commit is contained in:
uttarayan21
2025-01-05 20:25:46 +05:30
parent 1153534369
commit 3e70fa7efb
5 changed files with 75 additions and 53 deletions

View File

@@ -7,7 +7,7 @@
./goread.nix ./goread.nix
./hyprpaper.nix ./hyprpaper.nix
./aichat.nix ./aichat.nix
./ghostty.nix #./ghostty.nix
# ./sketchybar.nix # ./sketchybar.nix
]; ];
} }

View File

@@ -1,4 +1,4 @@
{lib, ...}: { {...}: {
disko.devices = { disko.devices = {
disk = { disk = {
one = { one = {
@@ -35,14 +35,6 @@
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
# esp = {
# size = "1G";
# type = "EF00";
# content = {
# type = "mdraid";
# name = "boot";
# };
# };
primary = { primary = {
size = "100%"; size = "100%";
content = { content = {
@@ -54,24 +46,12 @@
}; };
}; };
}; };
# mdadm = {
# esp = {
# type = "mdadm";
# level = 1;
# metadata = "1.0";
# content = {
# type = "filesystem";
# format = "vfat";
# mountpoint = "/boot";
# };
# };
# };
lvm_vg = { lvm_vg = {
pool = { pool = {
type = "lvm_vg"; type = "lvm_vg";
lvs = { lvs = {
root = { root = {
size = "128G"; size = "64G";
lvm_type = "mirror"; lvm_type = "mirror";
content = { content = {
type = "filesystem"; type = "filesystem";
@@ -82,8 +62,17 @@
]; ];
}; };
}; };
nix = {
size = "256G";
lvm_type = "raid0";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/nix";
};
};
home = { home = {
size = "512G"; size = "256G";
lvm_type = "raid0"; lvm_type = "raid0";
content = { content = {
type = "filesystem"; type = "filesystem";
@@ -91,6 +80,15 @@
mountpoint = "/home"; mountpoint = "/home";
}; };
}; };
media = {
size = "100%";
lvm_type = "raid0";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/media";
};
};
}; };
}; };
}; };

View File

@@ -41,7 +41,8 @@
}; };
}; };
jellyfin = { jellyfin = {
enable = false; enable = true;
openFirewall = true;
}; };
authelia = { authelia = {
instances.darksailor = { instances.darksailor = {
@@ -69,6 +70,10 @@
domain = "darksailor.dev"; domain = "darksailor.dev";
policy = "one_factor"; policy = "one_factor";
} }
{
domain = "media.darksailor.dev";
policy = "one_factor";
}
{ {
domain = "music.darksailor.dev"; domain = "music.darksailor.dev";
policy = "one_factor"; policy = "one_factor";
@@ -92,9 +97,14 @@
notifier.filesystem.filename = "/var/lib/authelia-darksailor/authelia-notifier.log"; notifier.filesystem.filename = "/var/lib/authelia-darksailor/authelia-notifier.log";
server = { server = {
address = "127.0.0.1:5555"; address = "127.0.0.1:5555";
endpoints.authz.forward-auth = { endpoints.authz = {
forward-auth = {
implementation = "ForwardAuth"; implementation = "ForwardAuth";
}; };
auth-request = {
implementation = "AuthRequest";
};
};
}; };
# log = { # log = {
# file_path = "/tmp/authelia.log"; # file_path = "/tmp/authelia.log";
@@ -193,6 +203,9 @@
} }
reverse_proxy localhost:4533 reverse_proxy localhost:4533
''; '';
virtualHosts."media.darksailor.dev".extraConfig = ''
reverse_proxy localhost:8096
'';
virtualHosts."atuin.darksailor.dev".extraConfig = '' virtualHosts."atuin.darksailor.dev".extraConfig = ''
reverse_proxy localhost:8888 reverse_proxy localhost:8888
''; '';
@@ -263,9 +276,6 @@
reverse_proxy localhost:8123 reverse_proxy localhost:8123
''; '';
virtualHosts."media.darksailor.dev".extraConfig = ''
reverse_proxy localhost:8096
'';
}; };
}; };
systemd.services.caddy = { systemd.services.caddy = {

View File

@@ -184,6 +184,21 @@
csshacks = final: prev: { csshacks = final: prev: {
csshacks = inputs.csshacks; csshacks = inputs.csshacks;
}; };
jellyfin = final: prev: {
jellyfin-web = prev.jellyfin-web.overrideAttrs (finalAttrs: previousAttrs: {
installPhase = ''
runHook preInstall
# this is the important line
sed -i "s#</head>#<script src=\"configurationpage?name=skip-intro-button.js\"></script></head>#" dist/index.html
mkdir -p $out/share
cp -a dist $out/share/jellyfin-web
runHook postInstall
'';
});
};
in in
[ [
libfprint libfprint
@@ -197,5 +212,6 @@ in
inputs.nur.overlays.default inputs.nur.overlays.default
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
csshacks csshacks
jellyfin
] ]
++ (import ./neovim/overlays.nix self) ++ (import ./neovim/overlays.nix self)

View File

@@ -1,4 +1,4 @@
{lib, ...}: { {...}: {
disko.devices = { disko.devices = {
disk = { disk = {
one = { one = {
@@ -35,14 +35,6 @@
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
# esp = {
# size = "1G";
# type = "EF00";
# content = {
# type = "mdraid";
# name = "boot";
# };
# };
primary = { primary = {
size = "100%"; size = "100%";
content = { content = {
@@ -54,24 +46,12 @@
}; };
}; };
}; };
# mdadm = {
# esp = {
# type = "mdadm";
# level = 1;
# metadata = "1.0";
# content = {
# type = "filesystem";
# format = "vfat";
# mountpoint = "/boot";
# };
# };
# };
lvm_vg = { lvm_vg = {
pool = { pool = {
type = "lvm_vg"; type = "lvm_vg";
lvs = { lvs = {
root = { root = {
size = "128G"; size = "64G";
lvm_type = "mirror"; lvm_type = "mirror";
content = { content = {
type = "filesystem"; type = "filesystem";
@@ -82,8 +62,17 @@
]; ];
}; };
}; };
nix = {
size = "256G";
lvm_type = "raid0";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/nix";
};
};
home = { home = {
size = "512G"; size = "256G";
lvm_type = "raid0"; lvm_type = "raid0";
content = { content = {
type = "filesystem"; type = "filesystem";
@@ -91,6 +80,15 @@
mountpoint = "/home"; mountpoint = "/home";
}; };
}; };
media = {
size = "100%";
lvm_type = "raid0";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/media";
};
};
}; };
}; };
}; };