tomasr/nixos
1
0
Fork 0
mirror of https://github.com/tomasriveral/nixos.git synced 2026-08-11 18:18:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Auto: cleanup-2026-06-04T16-10-09Z

Browse Source
This commit is contained in:
tomasr
2026-06-04 18:10:27 +02:00
parent d673efcc8c
commit 8ee9c3f639
4 changed files with 114 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/applications/zsh.nix
+1 -1
View File
@@ -33,7 +33,7 @@ _: {
command cat "$@"
fi
}
custom-eza() { # behaves differently if we just call it or if we pipe initContent
if [[ -t 1 ]]; then
eza -hlF -aa --color=always --hyperlink --group-directories-first --show-symlinks --icons=always --git --no-permissions "$@"
modules/hardware/disko/disko-config.nix
+110 -108
View File
@@ -1,78 +1,117 @@
_: {
flake.diskoConfigurations.desktop = _: {
disko.devices = {
disk = {
ssd = {
# Replace with actual disk id from:
# ls -l /dev/disk/by-id
device = "/dev/disk/by-id/REPLACE_SSD_ID";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
size = "1G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
disko.devices = {
disk = {
ssd = {
# Replace with actual disk id from:
# ls -l /dev/disk/by-id
device = "/dev/disk/by-id/REPLACE_SSD_ID";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
size = "1G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "cryptroot";
# You will type this password at boot.
settings.allowDiscards = true;
content = {
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@snapshots" = {
mountpoint = "/.snapshots";
};
# Keyfile storage.
# This subvolume will contain the key used
# to unlock the HDD automatically.
"@keys" = {
mountpoint = "/keys";
};
};
};
};
};
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "cryptroot";
# You will type this password at boot.
settings.allowDiscards = true;
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
];
};
hdd = {
# Replace with actual disk id
device = "/dev/disk/by-id/REPLACE_HDD_ID";
type = "disk";
content = {
type = "gpt";
partitions = {
luks = {
size = "100%";
content = {
type = "luks";
name = "cryptdata";
# IMPORTANT:
# This keyfile will be created after installation.
# The SSD unlocks first.
# Then this keyfile unlocks the HDD automatically.
settings = {
keyFile = "/keys/hdd.key";
};
"@home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@snapshots" = {
mountpoint = "/.snapshots";
};
# Keyfile storage.
# This subvolume will contain the key used
# to unlock the HDD automatically.
"@keys" = {
mountpoint = "/keys";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/data";
};
};
};
@@ -80,43 +119,6 @@ disk = {
};
};
};
};
hdd = {
# Replace with actual disk id
device = "/dev/disk/by-id/REPLACE_HDD_ID";
type = "disk";
content = {
type = "gpt";
partitions = {
luks = {
size = "100%";
content = {
type = "luks";
name = "cryptdata";
# IMPORTANT:
# This keyfile will be created after installation.
# The SSD unlocks first.
# Then this keyfile unlocks the HDD automatically.
settings = {
keyFile = "/keys/hdd.key";
};
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/data";
};
};
};
};
};
};
};
};};}
}
modules/utilities/autoCleanup.nix
+1 -2
View File
@@ -49,7 +49,6 @@
};
};
};
## Desktop
flake.nixosModules.autoCleanup-desktop = {
@@ -102,7 +101,7 @@
};
};
};
perSystem = {pkgs, ...}: {
perSystem = {pkgs, ...}: {
packages.custom-cleanNix-laptop = pkgs.writeShellApplication {
name = "custom-cleanNix";
modules/utilities/autoUpdate.nix
+2 -2
View File
@@ -44,7 +44,7 @@
};
};
};
## desktop
flake.nixosModules.autoUpdate-desktop = {pkgs, ...}: {
# Ensure your script is available system-wide
@@ -91,7 +91,7 @@
};
};
};
perSystem = {pkgs, ...}: {
perSystem = {pkgs, ...}: {
packages.custom-autoupdate-laptop = pkgs.writeShellApplication {
name = "custom-autoupdate";