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

Compare commits

base: titaniumtown:c173fee0b03b1ac3515037788aa47ca75f7ebff1
Branches Tags
titaniumtown:main
..
compare: titaniumtown:e65645c0231be67103c0f21b3eddf08e50428ae2
Branches Tags
titaniumtown:main

3 Commits
c173fee0b0 ... e65645c023

Author SHA1 Message Date
Simon Gardling
e65645c023 use deploy-rs 2025-06-18 20:54:39 -07:00
Simon Gardling
b17526a212 use srvos 2025-06-18 20:18:16 -07:00
Simon Gardling
af7f2bba73 update 2025-06-18 20:11:00 -07:00
4 changed files with 137 additions and 18 deletions
Expand all files Collapse all files

10
configuration.nix
View File

@@ -6,6 +6,7 @@
username,
eth_interface,
service_configs,
options,
...
}:
{
@@ -38,6 +39,15 @@
hybrid-sleep.enable = false;
};
# srvos enables vim, i don't want to use vim, disable it here:
programs.vim =
{
defaultEditor = false;
}
// lib.optionalAttrs (options.programs.vim ? enable) {
enable = false;
};
powerManagement = {
powertop.enable = true;
enable = true;

7
deploy.sh
View File

@@ -1,7 +0,0 @@
#!/bin/sh
ARG="$*"
if [ "$ARG" = "" ]; then
ARG="boot"
fi
nixos-rebuild "$ARG" --flake .#muffin --target-host root@server-public --build-host root@server-public --verbose

113
flake.lock generated
View File

@@ -15,6 +15,28 @@
"type": "github"
}
},
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1749105467,
"narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
@@ -36,6 +58,22 @@
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1747046372,
@@ -51,7 +89,7 @@
"type": "github"
}
},
"flake-compat_2": {
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1747046372,
@@ -108,7 +146,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
@@ -170,7 +208,7 @@
"lanzaboote": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
@@ -200,11 +238,11 @@
]
},
"locked": {
"lastModified": 1750192405,
"narHash": "sha256-lP8n2LvCy8TgLTSs7pmZI1PagvBNOAFgPp89vreymHc=",
"lastModified": 1750266626,
"narHash": "sha256-LSCxaOFIVNTdrNiR4IxtNokcaabTFOWA3wT7uqUiO/I=",
"owner": "ggml-org",
"repo": "llama.cpp",
"rev": "c46503014db0d63fa7b1b28c58adfb51054e2dec",
"rev": "8d947136546773f6410756f37fcc5d3e65b8135d",
"type": "github"
},
"original": {
@@ -215,7 +253,7 @@
},
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
@@ -253,11 +291,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1750005367,
"narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
"lastModified": 1750133334,
"narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
"rev": "36ab78dab7da2e4e27911007033713bab534187b",
"type": "github"
},
"original": {
@@ -323,6 +361,7 @@
},
"root": {
"inputs": {
"deploy-rs": "deploy-rs",
"disko": "disko",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
@@ -331,6 +370,7 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs-qbt": "nixpkgs-qbt",
"srvos": "srvos",
"vpn-confinement": "vpn-confinement"
}
},
@@ -355,6 +395,26 @@
"type": "github"
}
},
"srvos": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1750295173,
"narHash": "sha256-W2dgraLz7VZZz/x+6LGt+hiHb94+FCjfyGfxN0TR+Qo=",
"owner": "nix-community",
"repo": "srvos",
"rev": "7c93b611d175a62f3ce57fbda976c29261525a15",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "srvos",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@@ -370,6 +430,39 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"vpn-confinement": {
"locked": {
"lastModified": 1749672087,

25
flake.nix
View File

@@ -34,10 +34,20 @@
url = "github:ggml-org/llama.cpp";
inputs.nixpkgs.follows = "nixpkgs";
};
srvos = {
url = "github:nix-community/srvos";
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
{
self,
nixpkgs,
nix-minecraft,
nixos-hardware,
@@ -46,7 +56,8 @@
home-manager,
lanzaboote,
disko,
llamacpp,
srvos,
deploy-rs,
...
}@inputs:
let
@@ -189,6 +200,9 @@
}
)
# sets up things like the watchdog
srvos.nixosModules.server
./disk-config.nix
disko.nixosModules.disko
./configuration.nix
@@ -227,5 +241,14 @@
common-gpu-intel
]);
};
deploy.nodes.muffin = {
hostname = "server-public";
profiles.system = {
sshUser = "root";
user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.muffin;
};
};
};
}