update GLaDOS's disko setup
This commit is contained in:
commit
6fe74f891b
5 changed files with 20 additions and 42 deletions
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
disko.devices = {
|
||||
disk = {
|
||||
sda1 = {
|
||||
main = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-path/pci-0000:06:00.0-ata-6";
|
||||
device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
|
@ -14,64 +14,45 @@
|
|||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
];
|
||||
mountOptions = [ "umask=0077" ];
|
||||
};
|
||||
};
|
||||
luks = {
|
||||
nvme_luks = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "crypted";
|
||||
extraOpenArgs = [];
|
||||
name = "nvme_crypted";
|
||||
extraOpenArgs = [ ];
|
||||
settings = {
|
||||
# if you want to use the key for interactive login be sure there is no trailing newline
|
||||
# for example use `echo -n "password" > /tmp/secret.key`
|
||||
#keyFile = "/tmp/secret.key";
|
||||
allowDiscards = true;
|
||||
};
|
||||
#additionalKeyFiles = ["/tmp/additionalSecret.key"];
|
||||
content = {
|
||||
type = "lvm_pv";
|
||||
vg = "pool";
|
||||
vg = "nvme_pool";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
#sdc = {
|
||||
#device = "/dev/disk/by-path/pci-0000:06:00.0-ata-2";
|
||||
#type = "disk";
|
||||
#content = {
|
||||
#type = "gpt";
|
||||
#partitions = {
|
||||
#root = {
|
||||
#size = "100%";
|
||||
#content = {
|
||||
#type = "filesystem";
|
||||
#format = "ext4";
|
||||
#mountpoint = "/media";
|
||||
#};
|
||||
#};
|
||||
#};
|
||||
#};
|
||||
#};
|
||||
};
|
||||
lvm_vg = {
|
||||
pool = {
|
||||
nvme_pool = {
|
||||
type = "lvm_vg";
|
||||
lvs = {
|
||||
swap = {
|
||||
size = "16G";
|
||||
nvme_swap = {
|
||||
size = "32G";
|
||||
content = {
|
||||
type = "swap";
|
||||
discardPolicy = "both";
|
||||
resumeDevice = true; # resume from hiberation from this device
|
||||
};
|
||||
};
|
||||
root = {
|
||||
size = "100%FREE";
|
||||
nvme_root = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
|
@ -84,13 +65,5 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
nodev = {
|
||||
"/home/lillian/Downloads" = {
|
||||
fsType = "tmpfs";
|
||||
mountOptions = [
|
||||
"size=4G"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -93,6 +93,8 @@
|
|||
hidden = [
|
||||
"Xwayland Video Bridge_pipewireToXProxy"
|
||||
"org.kde.plasma.devicenotifier"
|
||||
"org.kde.plasma.keyboardindicator"
|
||||
"org.kde.plasma.keyboardlayout"
|
||||
"org.kde.kscreen"
|
||||
"org.kde.plasma.printmanager"
|
||||
"chrome_status_icon_1"
|
||||
|
@ -100,6 +102,7 @@
|
|||
"Nitrokey App"
|
||||
"qBittorrent"
|
||||
"vlc"
|
||||
"obs"
|
||||
"steam"
|
||||
"nitrokey-app"
|
||||
];
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
lutris
|
||||
];
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
|
|
|
@ -107,8 +107,8 @@
|
|||
programs = {
|
||||
# Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently
|
||||
command-not-found.enable = lib.mkForce false;
|
||||
# nix-index.enable = true;
|
||||
# nix-index-database.comma.enable = true;
|
||||
nix-index.enable = true;
|
||||
nix-index-database.comma.enable = true;
|
||||
|
||||
direnv = {
|
||||
enable = true;
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
gparted
|
||||
];
|
||||
|
||||
services.vpn-ip = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue