BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vps-arm-2024-12-24-16-36-44

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-12-24 16:36:44 +01:00
parent 8155995620
commit e43c61e8ec
5 changed files with 96 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configs/user.nix
View File

@ -92,12 +92,12 @@ in {
matchBlocks."szczepan.ski" = {hostname = "szczepan.ski";}; matchBlocks."szczepan.ski" = {hostname = "szczepan.ski";};
matchBlocks."mini" = {hostname = "mini";}; matchBlocks."mini" = {hostname = "mini";};
matchBlocks."desktop" = {hostname = "desktop";};
matchBlocks."framework" = {hostname = "framework";};
matchBlocks."nixos-vm" = { matchBlocks."nixos-vm" = {
hostname = "127.0.0.1"; hostname = "127.0.0.1";
port = 1337; port = 1337;
}; };
matchBlocks."thinkpad" = {hostname = "thinkpad";};
}; };
git = { git = {

79
flake.lock generated
View File

@ -5,14 +5,15 @@
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
"home-manager": "home-manager", "home-manager": "home-manager",
"jovian": "jovian", "jovian": "jovian",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-small": "nixpkgs-small"
}, },
"locked": { "locked": {
"lastModified": 1733677156, "lastModified": 1734987419,
"narHash": "sha256-TSgU+M0Zm0PMnb6J/gOovC63wtqSbhgdmN7CucDO0oU=", "narHash": "sha256-2K4V615Y29QhMUShX9k52l7gXF2erkq9yH9qGRZGKQ0=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "354bcbbadbd00f5bda884bb2c119b7de63b197e9", "rev": "d61084b851dbf3072f8b40c3870b0f7938ca3f22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +83,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1734622215,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +103,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1735053786,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +119,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1731242966, "lastModified": 1734945620,
"narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "rev": "d000479f4f41390ff7cf9204979660ad5dd16176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733491721, "lastModified": 1734725857,
"narHash": "sha256-n4fTKTYXeGRngeanNDxSxbuWSRCQ6l74IwOBlqp8dcw=", "narHash": "sha256-bivlV9l/UjMtTfz/CZaoNJ5RfH2Lre4P9Ds64conoUQ=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "0f415721ee427270bc078ef3a5ba2a308d47461f", "rev": "dbae2fd6adaf34c947d310bec08deac7c4ed265b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +162,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1733586715, "lastModified": 1734735212,
"narHash": "sha256-qRwBwL6bI3ZIDHHaFgpOSYWhcVN102rsSvueHbyfxFs=", "narHash": "sha256-9EJ/XadUCvlKWkLV/YGFFMbjMwi5XZWhW6pbxF/Ytm4=",
"owner": "taj-ny", "owner": "taj-ny",
"repo": "kwin-effects-forceblur", "repo": "kwin-effects-forceblur",
"rev": "6c5705e8f96d5d0cdd1fcbd48007740921fa7313", "rev": "9a385496e5662f4caca5be463d9c6d5d2ff0fa8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +220,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1733481457, "lastModified": 1734954597,
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "rev": "def1d472c832d77885f174089b0d34854b007198",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +236,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733581040, "lastModified": 1734649271,
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,13 +250,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-small": {
"locked": {
"lastModified": 1734838250,
"narHash": "sha256-Xi8ST/QiyuYXc3ujnMYOBuRUaMh6p16XWH6BKARa7xQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da8a31d09dd004be34b5c54eda83f9a27b357726",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1733581040, "lastModified": 1734649271,
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,11 +302,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733128155, "lastModified": 1734546875,
"narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
machine/mini/configuration.nix
View File

@ -84,7 +84,6 @@
tailscale = { tailscale = {
enable = true; enable = true;
useRoutingFeatures = "both"; useRoutingFeatures = "both";
extraUpFlags = "--advertise-exit-node --login-server=https://headscale.szczepan.ski";
}; };
borgbackup.jobs.all = rec { borgbackup.jobs.all = rec {

75
machine/vps-arm/configuration.nix
View File

@ -11,6 +11,7 @@
../../configs/common-linux.nix ../../configs/common-linux.nix
../../configs/docker.nix ../../configs/docker.nix
../../configs/user.nix ../../configs/user.nix
# ../../configs/borg.nix
../../configs/services/adguardhome.nix ../../configs/services/adguardhome.nix
../../configs/services/atuin.nix ../../configs/services/atuin.nix
@ -104,7 +105,7 @@
}; };
luks.devices = { luks.devices = {
root = { root = {
device = "/dev/disk/by-uuid/d17f6d8b-aec8-4c48-834d-f88d6308e281"; device = "/dev/disk/by-uuid/cad303e1-16d8-4c15-b6c6-1f5bfc498419";
preLVM = true; preLVM = true;
}; };
}; };
@ -133,7 +134,7 @@
useDHCP = true; useDHCP = true;
ipv6.addresses = [ ipv6.addresses = [
{ {
address = "2a0a:4cc0:1:124c::1"; address = "2a0a:4cc0:c0:30aa::1";
prefixLength = 64; prefixLength = 64;
} }
]; ];
@ -254,40 +255,42 @@
}; };
}; };
borgbackup.jobs.home = rec { # borgbackup.jobs.home = rec {
compression = "auto,zstd"; # compression = "auto,zstd";
encryption = { # encryption = {
mode = "repokey-blake2"; # mode = "repokey-blake2";
passCommand = "cat ${config.sops.secrets.borg-key.path}"; # passCommand = "cat ${config.sops.secrets.borg-key.path}";
}; # };
extraCreateArgs = "--stats --verbose --checkpoint-interval=600 --exclude-caches"; # extraCreateArgs = "--stats --verbose --checkpoint-interval=600 --exclude-caches";
extraPruneArgs = [ # extraPruneArgs = [
"--save-space" # "--save-space"
"--stats" # "--stats"
]; # ];
extraCompactArgs = [ # extraCompactArgs = [
"--cleanup-commits" # "--cleanup-commits"
]; # ];
environment = { # environment = {
BORG_RSH = "ssh -i /home/alex/.ssh/id_borg_rsa"; # BORG_RSH = "ssh -i /home/alex/.ssh/id_borg_rsa";
BORG_BASE_DIR = "/persist/borg"; # BORG_BASE_DIR = "/persist/borg";
}; # };
readWritePaths = ["/persist/borg"]; # readWritePaths = ["/persist/borg"];
paths = ["/home/alex" "/persist"]; # paths = ["/home/alex" "/persist"];
repo = "ssh://u278697-sub3@u278697.your-storagebox.de:23/./borg-arm"; # repo = "ssh://u278697-sub3@u278697.your-storagebox.de:23/./borg-arm";
startAt = "daily"; # startAt = "daily";
prune.keep = { # prune.keep = {
daily = 7; # daily = 7;
weekly = 4; # weekly = 4;
monthly = 6; # monthly = 6;
}; # };
exclude = [ # exclude = [
"/home/alex/mounted" # "/home/alex/mounted"
"/home/alex/.cache" # "/home/alex/.cache"
"/persist/borg" # "/persist/borg"
]; # ];
}; # };
journald = {extraConfig = "SystemMaxUse=10G";};
}; };
system.stateVersion = "25.05"; system.stateVersion = "24.11";
} }

14
machine/vps-arm/hardware-configuration.nix
View File

@ -18,45 +18,45 @@
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/3a21f244-5bf9-4c65-bce7-92c03fb0fd69"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=root"]; options = ["subvol=root"];
}; };
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/3a21f244-5bf9-4c65-bce7-92c03fb0fd69"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=home"]; options = ["subvol=home"];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/3a21f244-5bf9-4c65-bce7-92c03fb0fd69"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=nix"]; options = ["subvol=nix"];
}; };
fileSystems."/persist" = { fileSystems."/persist" = {
device = "/dev/disk/by-uuid/3a21f244-5bf9-4c65-bce7-92c03fb0fd69"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=persist"]; options = ["subvol=persist"];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/var/log" = { fileSystems."/var/log" = {
device = "/dev/disk/by-uuid/3a21f244-5bf9-4c65-bce7-92c03fb0fd69"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=log"]; options = ["subvol=log"];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/438B-D3D2"; device = "/dev/disk/by-uuid/DE94-E9C1";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = ["fmask=0022" "dmask=0022"];
}; };
swapDevices = [ swapDevices = [
{device = "/dev/disk/by-uuid/4608cfa2-da5b-45b1-97f4-8486957e409b";} {device = "/dev/disk/by-uuid/3c63b075-76ca-403f-bf75-53269b6bf4fa";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking