rilla
/
nix-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

many trantor changes

feat/kile-v2
Ricard Illa 2022-01-28 14:38:47 +01:00
parent 9a9ccc3a9c
commit 1a6d414243
No known key found for this signature in database
GPG Key ID: F69A672B72E54902
3 changed files with 118 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
capibara.nix
View File

@ -60,6 +60,17 @@ in {
options = [ "subvol=swap" ]; options = [ "subvol=swap" ];
}; };
"/home/rilla/Music" = {
device = "narwhal:/music";
fsType = "nfs";
options = [
"nfsvers=4"
"noauto"
"x-systemd.automount"
"x-systemd.idle-timeout=1min"
];
};
}; };
swapDevices = [{ device = "/swap/swapfile"; }]; swapDevices = [{ device = "/swap/swapfile"; }];

52
home/trantor.nix
View File

@ -46,6 +46,58 @@ in {
./zsh ./zsh
]; ];
home.persistence."/persist/system/${config.home.homeDirectory}" = {
directories = [
".abook"
".bitmonero"
".cache"
".config/Nextcloud"
".config/chromium"
".config/whatsapp-for-linux"
".gnupg/private-keys-v1.d"
".local/share/keyrings"
".local/share/mpd"
".local/share/webkitgtk"
".mozilla"
".newsboat"
".vdirsyncer"
];
files = [
".gnupg/pubring.kbx"
".gnupg/trustdb.gpg"
".mailsynclastrun"
".ssh/known_hosts"
".zsh_history"
];
allowOther = true;
};
home.persistence."/persist/user/${config.home.homeDirectory}" = {
directories = [
".config/Signal"
".config/Element"
".local/share/TelegramDesktop"
".local/share/dino"
".local/share/Bisq"
".password-store"
".walletwasabi"
"Calendars"
"Contacts"
"Documents"
"Downloads"
"Images"
"Maildir"
"Monero"
"Nextcloud"
"code"
"configs"
"misc"
"workspace"
];
files = [ ];
allowOther = true;
};
home.sessionVariables = { home.sessionVariables = {
EDITOR = "${pkgs.neovim}/bin/nvim"; EDITOR = "${pkgs.neovim}/bin/nvim";
VISUAL = "${pkgs.neovim}/bin/nvim"; VISUAL = "${pkgs.neovim}/bin/nvim";

88
trantor.nix
View File

@ -24,27 +24,35 @@ in {
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "tmpfs";
fsType = "tmpfs";
options = [ "defaults" "size=2G" "mode=755" ];
};
"/persist/system" = {
device = "/dev/mapper/system"; device = "/dev/mapper/system";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=root" "compress-force=zstd" ]; options = [ "subvol=persist" "compress=zstd" ];
neededForBoot = true;
};
"/persist/user" = {
device = "/dev/mapper/user";
fsType = "btrfs";
options = [ "subvol=persist" "compress=zstd" ];
neededForBoot = true;
}; };
"/nix" = { "/nix" = {
device = "/dev/mapper/system"; device = "/dev/mapper/system";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" "compress-force=zstd" ]; options = [ "subvol=nix" "compress=zstd" ];
}; };
"/var/log" = { "/boot" = {
device = "/dev/mapper/system"; device = "/dev/mapper/system";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=log" "compress-force=zstd" ]; options = [ "subvol=boot" "compress=zstd" ];
};
"/home" = {
device = "/dev/mapper/user";
fsType = "btrfs";
options = [ "subvol=home" "compress-force=zstd" ];
}; };
"/boot/efi" = { "/boot/efi" = {
@ -52,28 +60,21 @@ in {
fsType = "vfat"; fsType = "vfat";
}; };
"/home/rilla/Maildir" = {
device = "/dev/mapper/user";
fsType = "btrfs";
options = [ "subvol=mail" "compress-force=zstd" ];
};
"/swap" = { "/swap" = {
device = "/dev/mapper/system"; device = "/dev/mapper/system";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=swap" ]; options = [ "subvol=swap" ];
}; };
# "/home/rilla/music" = { "/home/rilla/music" = {
# device = "narwhal:/music"; device = "narwhal:/music";
# fsType = "nfs"; fsType = "nfs";
# options = [ options = [
# "nfsvers=4" "nfsvers=4"
# "noauto" "x-systemd.automount"
# "x-systemd.automount" "x-systemd.idle-timeout=1min"
# "x-systemd.idle-timeout=1min" ];
# ]; };
# };
# "/home/rilla/calibre" = { # "/home/rilla/calibre" = {
# device = "narwhal:/calibre"; # device = "narwhal:/calibre";
@ -89,11 +90,32 @@ in {
swapDevices = [{ device = "/swap/swapfile"; }]; swapDevices = [{ device = "/swap/swapfile"; }];
environment.variables = { environment.persistence = {
NIXOS_CONFIG = "/home/rilla/configs/nix-config/trantor.nix"; "/persist/system" = {
WINT_HDPI_FACTOR = "1"; directories = [
"/var/log"
"/var/lib/bluetooth"
"/var/lib/systemd/coredump"
"/var/lib/docker"
];
files = [
"/etc/machine-id"
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_ed25519_key.pub"
"/etc/ssh/ssh_host_rsa_key"
"/etc/ssh/ssh_host_rsa_key.pub"
# "/etc/wireguard/wg0"
];
};
"/persist/user" = {
directories =
[ "/etc/NetworkManager/system-connections" "/var/lib/libvirt" ];
};
}; };
environment.variables.NIXOS_CONFIG =
"/home/rilla/configs/nix-config/trantor.nix";
networking.networkmanager.wifi.macAddress = "80:FA:5B:41:12:0F"; networking.networkmanager.wifi.macAddress = "80:FA:5B:41:12:0F";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -118,16 +140,16 @@ in {
luks.devices = { luks.devices = {
"system" = { "system" = {
device = "/dev/disk/by-uuid/b9778e01-a86c-4c6b-beb3-f97888d4a6eb"; device = "/dev/disk/by-uuid/b9778e01-a86c-4c6b-beb3-f97888d4a6eb";
keyFile = "/root_keyfile.bin"; keyFile = "/system_keyfile.bin";
}; };
"user" = { "user" = {
device = "/dev/disk/by-uuid/d8e9b35d-704a-4f66-bc19-0dd3e158de36"; device = "/dev/disk/by-uuid/d8e9b35d-704a-4f66-bc19-0dd3e158de36";
keyFile = "/home_keyfile.bin"; keyFile = "/user_keyfile.bin";
}; };
}; };
secrets = { secrets = {
"/root_keyfile.bin" = "/boot/system_keyfile.bin"; "/system_keyfile.bin" = "/boot/system_keyfile.bin";
"/home_keyfile.bin" = "/boot/user_keyfile.bin"; "/user_keyfile.bin" = "/boot/user_keyfile.bin";
}; };
}; };
}; };