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