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

vps-arm-2024-11-19-12-19-03

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-11-19 12:19:03 +01:00
parent d2dae7ffba
commit 6da6ab8d66
9 changed files with 65 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configs/common.nix
View File

@ -189,19 +189,6 @@
publicKey = "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGK0po6usux4Qv2d8zKZN1dDvbWjxKkGsx7XwFdSUCnF19Q8psHEUWR7C/LtSQ5crU/g+tQVRBtSgoUcE8T+FWp5wBxKvWG2X9gD+s9/4zRmDeSJR77W6gSA/+hpOZoSE+4KgNdnbYSNtbZH/dN74EG7GLb/gcIpbUUzPNXpfKl7mQitw=="; publicKey = "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGK0po6usux4Qv2d8zKZN1dDvbWjxKkGsx7XwFdSUCnF19Q8psHEUWR7C/LtSQ5crU/g+tQVRBtSgoUcE8T+FWp5wBxKvWG2X9gD+s9/4zRmDeSJR77W6gSA/+hpOZoSE+4KgNdnbYSNtbZH/dN74EG7GLb/gcIpbUUzPNXpfKl7mQitw==";
}; };
}; };
ssh.knownHosts = {
"github.com".hostNames = [ "github.com" ];
"github.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
"u278697.your-storagebox.de".hostNames = [ "u278697.your-storagebox.de" ];
"u278697.your-storagebox.de".publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5EB5p/5Hp3hGW1oHok+PIOH9Pbn7cnUiGmUEBrCVjnAw+HrKyN8bYVV0dIGllswYXwkG/+bgiBlE6IVIBAq+JwVWu1Sss3KarHY3OvFJUXZoZyRRg/Gc/+LRCE7lyKpwWQ70dbelGRyyJFH36eNv6ySXoUYtGkwlU5IVaHPApOxe4LHPZa/qhSRbPo2hwoh0orCtgejRebNtW5nlx00DNFgsvn8Svz2cIYLxsPVzKgUxs8Zxsxgn+Q/UvR7uq4AbAhyBMLxv7DjJ1pc7PJocuTno2Rw9uMZi1gkjbnmiOh6TTXIEWbnroyIhwc8555uto9melEUmWNQ+C+PwAK+MPw==";
# [u278697.your-storagebox.de]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs
# [u278697.your-storagebox.de]:23 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5EB5p/5Hp3hGW1oHok+PIOH9Pbn7cnUiGmUEBrCVjnAw+HrKyN8bYVV0dIGllswYXwkG/+bgiBlE6IVIBAq+JwVWu1Sss3KarHY3OvFJUXZoZyRRg/Gc/+LRCE7lyKpwWQ70dbelGRyyJFH36eNv6ySXoUYtGkwlU5IVaHPApOxe4LHPZa/qhSRbPo2hwoh0orCtgejRebNtW5nlx00DNFgsvn8Svz2cIYLxsPVzKgUxs8Zxsxgn+Q/UvR7uq4AbAhyBMLxv7DjJ1pc7PJocuTno2Rw9uMZi1gkjbnmiOh6TTXIEWbnroyIhwc8555uto9melEUmWNQ+C+PwAK+MPw==
# [u278697.your-storagebox.de]:23 ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGK0po6usux4Qv2d8zKZN1dDvbWjxKkGsx7XwFdSUCnF19Q8psHEUWR7C/LtSQ5crU/g+tQVRBtSgoUcE8T+FWp5wBxKvWG2X9gD+s9/4zRmDeSJR77W6gSA/+hpOZoSE+4KgNdnbYSNtbZH/dN74EG7GLb/gcIpbUUzPNXpfKl7mQitw==
};
}; };
services = { services = {

331
flake.lock generated
View File

@ -8,35 +8,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
<<<<<<< HEAD "lastModified": 1731977366,
<<<<<<< HEAD "narHash": "sha256-UufePQLAmJtLG2ghOSYG/asD+sSo2qubwdozd9Bj9f4=",
"lastModified": 1731866540,
"narHash": "sha256-wAz/S5GLm+9Vp0kmUPsva3Mxp+VUnbEUZ8aBM1aEhhY=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "0857914b69d90ba758e614298452636c6fdc9c7c", "rev": "a5536db0de3357bee3a78725ebecb6c0b660e3f6",
=======
<<<<<<< HEAD
"lastModified": 1728587571,
"narHash": "sha256-vQmYKJ9sLQP6VivCdKNdpisXrB6xpDaaTif5U+IogzQ=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "d73c548a001f367048d4f22cf2ae626cd2002503",
=======
"lastModified": 1727734424,
"narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
"lastModified": 1729599319,
"narHash": "sha256-e/4JPcIRte5zkwqmGFrFo3763e0iHURX6N0apz4jbI0=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "1b86b304c8eb1437d9337a760e7f930826fc4d6d",
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -46,42 +22,6 @@
"type": "github" "type": "github"
} }
}, },
<<<<<<< HEAD
<<<<<<< HEAD
=======
"fenix": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1728455642,
"narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=",
"owner": "nix-community",
"repo": "fenix",
"rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03",
=======
"lastModified": 1727591515,
"narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=",
"owner": "nix-community",
"repo": "fenix",
"rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -142,35 +82,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD "lastModified": 1731887066,
<<<<<<< HEAD "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
"lastModified": 1731535640,
"narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "35b055009afd0107b69c286fca34d2ad98940d57", "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
=======
<<<<<<< HEAD
"lastModified": 1728337164,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
=======
"lastModified": 1727383923,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
"lastModified": 1729414726,
"narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fe56302339bb28e3471632379d733547caec8103",
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731887066, "lastModified": 1731968878,
"narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "rev": "a42fa14b53ceab66274a21da480c9f8e06204173",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,35 +140,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD "lastModified": 1731736013,
<<<<<<< HEAD "narHash": "sha256-AYB3yeogE9vtBuSStdFFmGR0kzGuumW4nrpdlcuZ/As=",
"lastModified": 1731227601,
"narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", "rev": "a2c6d8d1acce49de8dc7ed951428aae901908316",
=======
<<<<<<< HEAD
"lastModified": 1728410210,
"narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d",
=======
"lastModified": 1727453186,
"narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "3390ff2632d0d8a14c92473db60fa52bf881f979",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
"lastModified": 1729177642,
"narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "bb69165ff372ddbd3228a03513922acd783040e8",
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,51 +199,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"lastModified": 1731797098, "lastModified": 1731797098,
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
=======
<<<<<<< HEAD
"lastModified": 1728729581,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
=======
"lastModified": 1727665282,
"narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
"lastModified": 1729624485,
"narHash": "sha256-iEffyT68tEU5kHQuyP05QRH+JhWNNLAwHfgZAzXFS7o=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "22e8de2729f40d29a445c8baeaf22740b8b25daf",
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
=======
"lastModified": 1730068391,
"narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "6906ac67a1078cf950b8527341e229eeecb5bc30",
>>>>>>> f36a48a (mini-2024-10-28-14-06-27)
=======
"lastModified": 1730161780,
"narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
>>>>>>> 0630f25 (vps-arm-2024-10-29-13-18-23)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,35 +215,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
<<<<<<< HEAD
<<<<<<< HEAD
"lastModified": 1731676054, "lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
=======
<<<<<<< HEAD
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
=======
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
"lastModified": 1729413321,
"narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,84 +229,18 @@
"type": "github" "type": "github"
} }
}, },
<<<<<<< HEAD
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
<<<<<<< HEAD "lastModified": 1732007104,
"lastModified": 1731919951, "narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=",
"narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "rev": "0705964c881cea8896474610188905ba41b59b08",
=======
<<<<<<< HEAD
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
=======
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
"nixpkgs-stable": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1729880355,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "nixos",
"repo": "nixpkgs",
<<<<<<< HEAD
"rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
=======
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
>>>>>>> f36a48a (mini-2024-10-28-14-06-27)
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
<<<<<<< HEAD
"ref": "nixos-unstable-small", "ref": "nixos-unstable-small",
=======
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -495,37 +257,6 @@
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },
<<<<<<< HEAD
<<<<<<< HEAD
=======
"rust-analyzer-src": {
"flake": false,
"locked": {
<<<<<<< HEAD
"lastModified": 1728386838,
"narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176",
=======
"lastModified": 1727465975,
"narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "546339a7be357b3e95fc4b79a8816dce540d477b",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -533,43 +264,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"lastModified": 1731954233, "lastModified": 1731954233,
"narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
=======
<<<<<<< HEAD
"lastModified": 1728345710,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
=======
"lastModified": 1727734513,
"narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "3198a242e547939c5e659353551b0668ec150268",
>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04)
>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04)
=======
"lastModified": 1729669122,
"narHash": "sha256-SpS3rSwYcskdOpx+jeCv1lcZDdkT/K5qT8dlenCBQ8c=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "a4c33bfecb93458d90f9eb26f1cf695b47285243",
>>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
=======
"lastModified": 1729999681,
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
>>>>>>> f36a48a (mini-2024-10-28-14-06-27)
"type": "github" "type": "github"
}, },
"original": { "original": {

2
machine/desktop/configuration.nix
View File

@ -92,7 +92,7 @@ in {
tmp.useTmpfs = false; tmp.useTmpfs = false;
supportedFilesystems = ["btrfs"]; supportedFilesystems = ["btrfs"];
kernelPackages = pkgs.linuxPackages_cachyos-rc; kernelPackages = pkgs.linuxPackages_cachyos-rc;
kernelParams = [ "clearcpuid=514" ]; kernelParams = ["clearcpuid=514"];
kernelModules = ["nct6775"]; kernelModules = ["nct6775"];
extraModulePackages = with pkgs.linuxPackages_cachyos-rc; [ryzen-smu]; extraModulePackages = with pkgs.linuxPackages_cachyos-rc; [ryzen-smu];
initrd = { initrd = {

23
machine/mini/configuration.nix
View File

@ -29,7 +29,7 @@
defaultSopsFile = ../../secrets.yaml; defaultSopsFile = ../../secrets.yaml;
validateSopsFiles = true; validateSopsFiles = true;
age = { age = {
sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
keyFile = "/var/lib/sops-nix/key.txt"; keyFile = "/var/lib/sops-nix/key.txt";
generateKey = true; generateKey = true;
}; };
@ -267,16 +267,17 @@
}; };
systemd = { systemd = {
mounts = [{ mounts = [
requires = [ "mnt-disk1.mount" "mnt-disk2.mount" "mnt-disk3.mount" ]; {
after = [ "mnt-disk1.mount" "mnt-disk2.mount" "mnt-disk3.mount" ]; requires = ["mnt-disk1.mount" "mnt-disk2.mount" "mnt-disk3.mount"];
what = "/mnt/disk1:/mnt/disk2:/mnt/disk3"; after = ["mnt-disk1.mount" "mnt-disk2.mount" "mnt-disk3.mount"];
where = "/mnt/storage"; what = "/mnt/disk1:/mnt/disk2:/mnt/disk3";
type = "fuse.mergerfs"; where = "/mnt/storage";
options = type = "fuse.mergerfs";
"defaults,allow_other,use_ino,fsname=mergerfs,minfreespace=50G,func.getattr=newest,noforget"; options = "defaults,allow_other,use_ino,fsname=mergerfs,minfreespace=50G,func.getattr=newest,noforget";
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
}]; }
];
}; };
system.stateVersion = "24.05"; system.stateVersion = "24.05";

8
machine/mini/hardware-configuration.nix
View File

@ -26,25 +26,25 @@
"/mnt/disk1" = { "/mnt/disk1" = {
device = "/dev/disk/by-uuid/3c4b5d00-43c0-48be-81b8-c2b3977e015b"; device = "/dev/disk/by-uuid/3c4b5d00-43c0-48be-81b8-c2b3977e015b";
fsType = "ext4"; fsType = "ext4";
options = [ "nofail" "x-systemd.automount" ]; options = ["nofail" "x-systemd.automount"];
}; };
"/mnt/disk2" = { "/mnt/disk2" = {
device = "/dev/disk/by-uuid/98a75e01-fa80-469e-820c-1e1e275937b8"; device = "/dev/disk/by-uuid/98a75e01-fa80-469e-820c-1e1e275937b8";
fsType = "ext4"; fsType = "ext4";
options = [ "nofail" "x-systemd.automount" ]; options = ["nofail" "x-systemd.automount"];
}; };
"/mnt/disk3" = { "/mnt/disk3" = {
device = "/dev/disk/by-uuid/0301db98-264f-4b18-9423-15691063f73d"; device = "/dev/disk/by-uuid/0301db98-264f-4b18-9423-15691063f73d";
fsType = "ext4"; fsType = "ext4";
options = [ "nofail" "x-systemd.automount" ]; options = ["nofail" "x-systemd.automount"];
}; };
"/mnt/parity" = { "/mnt/parity" = {
device = "/dev/disk/by-uuid/6cce037c-d2d4-4940-bb69-6d2b84fd41aa"; device = "/dev/disk/by-uuid/6cce037c-d2d4-4940-bb69-6d2b84fd41aa";
fsType = "ext4"; fsType = "ext4";
options = [ "nofail" "x-systemd.automount" ]; options = ["nofail" "x-systemd.automount"];
}; };
"/boot" = { "/boot" = {

10
services/gitea.nix
View File

@ -20,10 +20,12 @@
ensureDatabases = [ ensureDatabases = [
config.services.gitea.user config.services.gitea.user
]; ];
ensureUsers = [{ ensureUsers = [
name = config.services.gitea.database.user; {
ensureDBOwnership = true; name = config.services.gitea.database.user;
}]; ensureDBOwnership = true;
}
];
}; };
gitea = { gitea = {

24
services/headscale.nix
View File

@ -30,21 +30,21 @@
settings = { settings = {
logtail.enabled = false; logtail.enabled = false;
server_url = "https://headscale.szczepan.ski"; server_url = "https://headscale.szczepan.ski";
ip_prefixes = [ # ip_prefixes = [
"100.64.0.0/10" # "100.64.0.0/10"
"fd7a:115c:a1e0::/48" # "fd7a:115c:a1e0::/48"
]; # ];
# later # later
# prefixes = { prefixes = {
# v4 = "100.64.0.0/10"; v4 = "100.64.0.0/10";
# v6 = "fd7a:115c:a1e0::/48"; v6 = "fd7a:115c:a1e0::/48";
# }; };
dns_config = { dns = {
override_local_dns = true; override_local_dns = true;
base_domain = "szczepan.ski"; base_domain = "main.szczepan.ski";
magic_dns = true; magic_dns = true;
domains = ["main.szczepan.ski"]; search_domains = ["main.szczepan.ski"];
nameservers = [ nameservers.global = [
"100.64.0.2" "100.64.0.2"
"127.0.0.1" "127.0.0.1"
]; ];

14
services/nextcloud.nix
View File

@ -19,11 +19,13 @@
ensureDatabases = [ ensureDatabases = [
config.services.nextcloud.config.dbname config.services.nextcloud.config.dbname
]; ];
ensureUsers = [{ ensureUsers = [
name = config.services.nextcloud.config.dbuser; {
ensureDBOwnership = true; name = config.services.nextcloud.config.dbuser;
# ensurePermissions."DATABASE ${config.services.gitea.database.name}" = "ALL PRIVILEGES"; ensureDBOwnership = true;
}]; # ensurePermissions."DATABASE ${config.services.gitea.database.name}" = "ALL PRIVILEGES";
}
];
}; };
nextcloud = { nextcloud = {
@ -31,7 +33,7 @@
hostName = "nextcloud.szczepan.ski"; hostName = "nextcloud.szczepan.ski";
# Need to manually increment with every major upgrade. # Need to manually increment with every major upgrade.
package = pkgs.nextcloud29; package = pkgs.nextcloud30;
# Let NixOS install and configure the database automatically. # Let NixOS install and configure the database automatically.
database.createLocally = true; database.createLocally = true;

8
services/rustdesk-server.nix
View File

@ -8,7 +8,13 @@
rustdesk-server = { rustdesk-server = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
relayIP = "152.53.18.107"; signal = {
enable = true;
relayHosts = ["152.53.18.107"];
};
relay = {
enable = true;
};
}; };
}; };
} }