Compare commits

..

No commits in common. "main" and "add-yt-dlp" have entirely different histories.

4 changed files with 56 additions and 49 deletions

View file

@ -3,8 +3,7 @@
lib,
modulesPath,
...
}@args:
{
} @ args: {
networking.hostName = "instance-20221213-1915";
networking.hostId = "746d4523";
@ -17,7 +16,7 @@
./services/shitalloverme.nix
./users/remote-build.nix
./services/atticd.nix
#./services/minecraft.nix
./services/minecraft.nix
./services/postgres.nix
./services/uptime-kuma.nix
./services/reverse-proxy.nix
@ -28,14 +27,10 @@
./services/chir-rs.nix
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"virtio_pci"
"usbhid"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "tank/local/root";
@ -94,7 +89,7 @@
services.postgresql.dataDir = "/persist/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:746d:4523:5c04:1453/64" ];
networking.wireguard.interfaces."wg0".ips = ["fd0d:a262:1fa6:e621:746d:4523:5c04:1453/64"];
home-manager.users.darkkirb = import ./home-manager/darkkirb.nix {
desktop = false;
inherit args;
@ -127,8 +122,8 @@
owner = "root";
path = "/etc/secrets/initrd/ssh_host_ed25519_key";
};
sops.age.sshKeyPaths = lib.mkForce [ "/persist/ssh/ssh_host_ed25519_key" ];
services.bind.forwarders = lib.mkForce [ ];
sops.age.sshKeyPaths = lib.mkForce ["/persist/ssh/ssh_host_ed25519_key"];
services.bind.forwarders = lib.mkForce [];
boot.loader.systemd-boot.configurationLimit = lib.mkForce 1;
services.tailscale.useRoutingFeatures = "server";
services.postgresql.settings = {
@ -150,5 +145,5 @@
max_parallel_maintenance_workers = 2;
};
services.restic.backups.sysbackup.paths = [ "/persist" ];
services.restic.backups.sysbackup.paths = ["/persist"];
}

View file

@ -464,11 +464,11 @@
]
},
"locked": {
"lastModified": 1731235328,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github"
},
"original": {
@ -499,11 +499,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1731242966,
"narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
"lastModified": 1730403150,
"narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
"rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f",
"type": "github"
},
"original": {
@ -522,11 +522,11 @@
]
},
"locked": {
"lastModified": 1731240728,
"narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=",
"lastModified": 1730635946,
"narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "807ab623e6d01e931269a28a07c59dcfd6474173",
"rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51",
"type": "github"
},
"original": {
@ -576,11 +576,11 @@
]
},
"locked": {
"lastModified": 1731185731,
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
"lastModified": 1727752861,
"narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
"ref": "refs/heads/main",
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
"revCount": 117,
"rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
"revCount": 116,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@ -606,11 +606,11 @@
]
},
"locked": {
"lastModified": 1731235488,
"narHash": "sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM=",
"lastModified": 1730938523,
"narHash": "sha256-UAh8hocN7Vdl+sXxuToL6Cm1TsMHBpcEmHy+l5xFrMk=",
"ref": "refs/heads/main",
"rev": "d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771",
"revCount": 16476,
"rev": "72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f",
"revCount": 16454,
"type": "git",
"url": "https://git.lix.systems/lix-project/lix"
},
@ -695,11 +695,11 @@
"umu": "umu"
},
"locked": {
"lastModified": 1731202990,
"narHash": "sha256-Ac3ff4w9+xePGX6TF90zEVyhdHJkhg58pUafvoAjVEY=",
"lastModified": 1730770711,
"narHash": "sha256-UHm56cW/04efHY4NgboGFOXliGQCqRRY+l1HM7c8/Ms=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "faf26ec552997488d75a0fdb07783c0c2edd3d5f",
"rev": "0c25376479d11073346ed22de8571805543ede71",
"type": "github"
},
"original": {
@ -903,11 +903,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1731242223,
"narHash": "sha256-ASCKkiPc9lJ9AcIL+dcLzgQzGyUvdtRiIkSWh1EEhLs=",
"lastModified": 1730968922,
"narHash": "sha256-t9h9hga70NTgaeLzxtxET1GXbdP3lxJ7XAWCvia9ny8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8213a8a557f80086dac25ae2c613794ce9f0b4eb",
"rev": "652b22a3759aa4a2dfe54b6be84997a5c9a19298",
"type": "github"
},
"original": {
@ -1004,11 +1004,11 @@
]
},
"locked": {
"lastModified": 1731119076,
"narHash": "sha256-2eVhmocCZHJlFAz6Mt3EwPdFFVAtGgIySJc1EHQVxcc=",
"lastModified": 1730946479,
"narHash": "sha256-AxGJ3BRc44o3RBcfXxZqjVYftVtJ2sl+/WEjiLUmXRY=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "23c4b3ba5f806fcf25d5a3b6b54fa0d07854c032",
"rev": "7fba269fe89ffad47206e0afba233d337c04cf08",
"type": "github"
},
"original": {
@ -1027,11 +1027,11 @@
]
},
"locked": {
"lastModified": 1731213149,
"narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=",
"lastModified": 1730883027,
"narHash": "sha256-pvXMOJIqRW0trsW+FzRMl6d5PbsM4rWfD5lcKCOrrwI=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7",
"rev": "c5ae1e214ff935f2d3593187a131becb289ea639",
"type": "github"
},
"original": {

View file

@ -175,14 +175,26 @@ rec {
name = "nixos-8gb-fsn1-1"; # Hetzner Server
system = "x86_64-linux";
}
{
name = "thinkrac"; # Thinkpad T470
system = "x86_64-linux";
}
{
name = "nas"; # My nas
system = "x86_64-linux";
}
{
name = "installer"; # Installer iso
system = "x86_64-linux";
}
{
name = "instance-20221213-1915"; # Oracle server
system = "aarch64-linux";
}
{
name = "rainbow-resort"; # PC
system = "x86_64-linux";
}
/*
{
name = "devterm";

View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/mgba-emu/mgba",
"rev": "cfd30b7a95edf1dafaf5cfb6d691578d8b6554c5",
"date": "2024-11-08T21:38:25-08:00",
"path": "/nix/store/jcsrdhn7a1cxpy96sgjyc11j0gzlcc6m-mgba",
"sha256": "1q83dgsnf4pdz2li2ip6z7rnf1c7w8qf82jr1q5ck499rhv3v689",
"hash": "sha256-CZk9NswpkckKDlkK5DDihwVn8/nmRhGp+O0SZ/VrA+E=",
"rev": "77e747ebf6e2becd669312667999e39e79036ceb",
"date": "2024-11-03T19:38:17-08:00",
"path": "/nix/store/nb40imhfdq9ipj99x3jplv3ay246i7ha-mgba",
"sha256": "17kaxs4ws2c8q6d3iffwyq0srl2gpfmcmai1npiircbf4l7fqw16",
"hash": "sha256-JnDsDiVusRzjtSGqyqq7T9CsAfbcuTiawYgJzYnuap4=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,