Compare commits
4 Commits
2d57da56b2
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
517d5df1b6 | ||
|
|
c4a468cdc7 | ||
|
|
f60368ae30 | ||
|
|
46177d4af0 |
@@ -1,5 +1,5 @@
|
|||||||
#+title: Hosts
|
#+title: Hosts
|
||||||
* Setting up a new vult host
|
* Setting up a new vultr host
|
||||||
** Generate a password for your host
|
** Generate a password for your host
|
||||||
#+begin_src bash
|
#+begin_src bash
|
||||||
pass generate samfelag/<host>
|
pass generate samfelag/<host>
|
||||||
@@ -60,5 +60,7 @@ Host remotehost
|
|||||||
IdentityFile ~/.ssh/remotehost
|
IdentityFile ~/.ssh/remotehost
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
* List of hosts
|
* List of hosts
|
||||||
** [[file:../hosts/reykjavik/README.org][Reykjavik]]
|
** [[file:../hosts/reykjavik/reykjavik.org][Reykjavik]]
|
||||||
** [[file:../hosts/kopavogur/README.org][Kopavogur]]
|
** [[file:../hosts/kopavogur/kopavogur.org][Kopavogur]]
|
||||||
|
** [[file:../hosts/thingvellir/thingvellir.org][Thingvellir]]
|
||||||
|
** [[file:../hosts/quinto/quinto.org][Quinto]]
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ in
|
|||||||
# - Gaming -----------------------------------
|
# - Gaming -----------------------------------
|
||||||
gaming.lutris.enable = true;
|
gaming.lutris.enable = true;
|
||||||
gaming.steam.enable = true;
|
gaming.steam.enable = true;
|
||||||
app.discord.enable = false;
|
app.discord.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# - Extra / Temporary --------------------------
|
# - Extra / Temporary --------------------------
|
||||||
|
|||||||
73
hosts/skaftafell/default.nix
Normal file
73
hosts/skaftafell/default.nix
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./hardware.nix
|
||||||
|
./secrets.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
# - Basic --------------------------------------
|
||||||
|
|
||||||
|
user.name = "marc";
|
||||||
|
user.shell = pkgs.zsh;
|
||||||
|
networking = {
|
||||||
|
hostName = "skaftafell";
|
||||||
|
firewall = {
|
||||||
|
enable = false;
|
||||||
|
# allowedUDPPorts = [
|
||||||
|
# 53 # DNS (pihole + unbound)
|
||||||
|
# 8600 # Consul DNS
|
||||||
|
# ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# - Bootloader ---------------------------------
|
||||||
|
|
||||||
|
boot.loader.grub = {
|
||||||
|
enable = true;
|
||||||
|
device = "/dev/vda";
|
||||||
|
};
|
||||||
|
|
||||||
|
# - Agenix ---------------------------------
|
||||||
|
|
||||||
|
age.identityPaths = [
|
||||||
|
"/home/marc/.ssh/id_ed25519"
|
||||||
|
];
|
||||||
|
|
||||||
|
# - Modules ------------------------------------
|
||||||
|
|
||||||
|
samfelag.modules = {
|
||||||
|
# - Common -----------------------------------
|
||||||
|
# See modules/common.nix for common packages installed
|
||||||
|
|
||||||
|
# - System -----------------------------------
|
||||||
|
system.utils.enable = true;
|
||||||
|
system.gpg.enable = true;
|
||||||
|
system.pass.enable = true;
|
||||||
|
system.ssh.enable = true;
|
||||||
|
system.sshfs.enable = true;
|
||||||
|
system.nvidia = {
|
||||||
|
enable = true;
|
||||||
|
intelBusId = "PCI:0:2:0";
|
||||||
|
nvidiaBusId = "PCI:0:6:0";
|
||||||
|
};
|
||||||
|
|
||||||
|
# - Server ----------------------------------
|
||||||
|
# server.vatnajokull.enable = true;
|
||||||
|
|
||||||
|
# - Editors and development ------------------
|
||||||
|
dev.git.userName = "marc";
|
||||||
|
dev.git.userEmail = "marc@sastre.cat";
|
||||||
|
|
||||||
|
dev.docker.enable = true;
|
||||||
|
dev.docker.users = ["marc"];
|
||||||
|
};
|
||||||
|
|
||||||
|
# TODO: Move to a module
|
||||||
|
services.ollama = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.ollama-cuda;
|
||||||
|
host = "100.74.218.64";
|
||||||
|
};
|
||||||
|
}
|
||||||
36
hosts/skaftafell/hardware.nix
Normal file
36
hosts/skaftafell/hardware.nix
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [ ];
|
||||||
|
|
||||||
|
boot = {
|
||||||
|
initrd = {
|
||||||
|
availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||||
|
kernelModules = [ ];
|
||||||
|
};
|
||||||
|
kernelModules = [ ];
|
||||||
|
extraModulePackages = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems = {
|
||||||
|
"/" = {
|
||||||
|
device = "/dev/disk/by-label/nixos";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-label/swap"; }
|
||||||
|
];
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
useDHCP = lib.mkDefault true;
|
||||||
|
interfaces = {
|
||||||
|
ens3.useDHCP = lib.mkDefault true;
|
||||||
|
};
|
||||||
|
nameservers = [ "108.61.10.10" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
virtualisation.hypervGuest.enable = true;
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
}
|
||||||
6
hosts/skaftafell/secrets.nix
Normal file
6
hosts/skaftafell/secrets.nix
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
age.secrets = {
|
||||||
|
};
|
||||||
|
}
|
||||||
2
hosts/skaftafell/skaftafell.org
Normal file
2
hosts/skaftafell/skaftafell.org
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
* Skaftafell
|
||||||
|
Servidor a Vultr
|
||||||
@@ -17,6 +17,8 @@ in
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# - Tools ----------------------------------
|
# - Tools ----------------------------------
|
||||||
jq
|
jq
|
||||||
|
# - Audio ----------------------------------
|
||||||
|
pulseaudio
|
||||||
# - Appearance -----------------------------
|
# - Appearance -----------------------------
|
||||||
rose-pine-gtk-theme
|
rose-pine-gtk-theme
|
||||||
rose-pine-icon-theme
|
rose-pine-icon-theme
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ inputs, ... }:
|
{ inputs, ... }:
|
||||||
[
|
[
|
||||||
(import ./discord.nix { })
|
|
||||||
(import ./nur.nix { nur = inputs.nur; })
|
(import ./nur.nix { nur = inputs.nur; })
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
(
|
|
||||||
final: prev:
|
|
||||||
{
|
|
||||||
discord = prev.discord.overrideAttrs (_: {
|
|
||||||
src = builtins.fetchTarball https://discord.com/api/download?platform=linux&format=tar.gz;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
)
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,11 @@
|
|||||||
age-encryption.org/v1
|
age-encryption.org/v1
|
||||||
-> ssh-ed25519 GWuf0Q HU052z43DHXbPh4m0Cn8YWEabVMdT9Ab9ZvnRTkiGiM
|
-> ssh-ed25519 GWuf0Q bW+hxNOISsRCrRS0OOIAPPju119EgOotwZ6niLAFzkw
|
||||||
jsGBcbgj1JeYBdvnRqKT310VnWqZmRYIE+LbkPVmDxs
|
lz23ChdAIsATg/mKc91fNLlGGJ9NFUt9uNYq0cHJPk0
|
||||||
-> ssh-ed25519 zhVGHw 1oy7y5z6KQy+JYRIPyqfeCgJUbGWdo77NiGnVRA0QRk
|
-> ssh-ed25519 zhVGHw v4g1bMvVf9kB61WkvkyI1mucwtHrml9Fe8Byya+dcUQ
|
||||||
qNrRnats5cFFv8K3YUtUXdSwhWkgcBGTeDlhWTkrNRM
|
ag6FoKKpdEwB3rW2zYAoOp66J2dgpp1GFA50qpXUSqg
|
||||||
-> ssh-ed25519 kNjiNQ IWfsJxXu1Kg6Z5p1qNBopU0RkYt7/s6jw/DJDQXpTHc
|
-> ssh-ed25519 kNjiNQ MUk4rt+iiLSapgtAwip2W482ElclcU/TEY++ZRftEj4
|
||||||
ouzaIxV7Y+pE8t/8s4Vk/AO/MccUpgHGhn1cq6C+E08
|
rSp4fJxuyfVy62NcE458e9KB28c5vfLUiH/j8Lfpg3g
|
||||||
--- LL3bXyeMTogvYXqjhwL75j64P9bNIFG2pwFanjOYm2o
|
-> ssh-ed25519 W0CP4A O25wWVlFCtMYyWwyc0vgHzVyFQWzjwDGbkewVsHZ5Wg
|
||||||
)Љ>‹ÊóFÚâ®ö=»!‰Ëvÿ•½ƒE`¹Æe*ëmOg¸Jö+CT‰
|
yEatTfY8VwvAviaXYQKKDIz/ergEoMIjNa0MnUZ5tmY
|
||||||
Õèw+ïºÖÍtΫpû[ÝéÏ^8kÿ RYœ°_”ôýã=8xgîö–!ƒÇ
|
--- 4is/3sp6dIeifbWEOrhsHd9Ff7lnRXHvMJPN/PDzJs4
|
||||||
|
8Jíßj]äÓÎÃrƒ}¢žŒ6
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
age-encryption.org/v1
|
age-encryption.org/v1
|
||||||
-> ssh-ed25519 GWuf0Q GSvUmcsNXSkoVOD8V/UP+KAGfKX4REahFDmwlROkoSw
|
-> ssh-ed25519 GWuf0Q Iz+zbIXV2o+GBZCHEv6YWi+JjaQuU4T+g21TVPrQr1c
|
||||||
ruTijdplgtQZP3wjnNGemh3a0omKK95xsfXzkWce0lM
|
op3yyGCAU+GQtm0k+gbq/yUvHDXmWcTMc4kRi7O7x+s
|
||||||
-> ssh-ed25519 kNjiNQ zT/ticPDHAujEWqSUrPaGsgPBdbaLvLQ/RSMz5C0aW8
|
-> ssh-ed25519 kNjiNQ EATD3QCgsJQU+K0JG1vRxzO3DhYme+KodKaTWopeNVk
|
||||||
JTy+b/N6yjfPtrhYXkFWb26PGa+b/M1DVKeGsW2oimg
|
mM9A5+jdhB0Qkx/7uR/3Vs7YnzjZ2qgTKedHDxWtolU
|
||||||
--- TKdmCeaBKPBBIkKvUqqqQz9DQigRuLRT2ZFto7Jtqr0
|
--- SGjf+G9rCCrDr6oqk58hkiP5o+BQpZ1RrxmC/r0soz8
|
||||||
ÈëW†3L®<EFBFBD>þj䯕¤'HgçR’s†;•w§¸Û‘<C39B>¿Ö<C2BF>t{E"Üævó‚Ÿè©Š•÷õÍ17%&Óü(†ô{Ë<>õŸE¦.§Óô3ÇSˆzNcÅçVÒ·läˆfŠWÊ–u5d2
|
ÒÃ<0B>™”®«!<21>êƒ#<23>à‚YC¸çPpÕRIë‘n´%ŒÈv~pä¶<1A>ŒÔ¸F<C2B8>OËÍKŸj£ †dAÚƒ7
|
||||||
@@ -3,6 +3,7 @@ let
|
|||||||
id-hvannadal = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICy1ocZywBvFHpIj+FvaC7QspRWuLXjy6fwakq9t+0Ev";
|
id-hvannadal = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICy1ocZywBvFHpIj+FvaC7QspRWuLXjy6fwakq9t+0Ev";
|
||||||
id-thingvellir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEIvWEwYayFK8iRb4g2+cnQXlqiMBu3aWxTahXkaCNG7";
|
id-thingvellir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEIvWEwYayFK8iRb4g2+cnQXlqiMBu3aWxTahXkaCNG7";
|
||||||
id-quinto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxgIT2+aoP+ZLMPupV8M0UwCLX6A3s+H6z3BJPCjJc0";
|
id-quinto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxgIT2+aoP+ZLMPupV8M0UwCLX6A3s+H6z3BJPCjJc0";
|
||||||
|
id-skaftafell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINA2DjHGlJOComWzUzbr/vdT74r7VBJLkmekn8b6783q";
|
||||||
|
|
||||||
# --- Host lists ---
|
# --- Host lists ---
|
||||||
# Since we want to be able to manage/edit all secrets from reykjavik, we create helper lists that
|
# Since we want to be able to manage/edit all secrets from reykjavik, we create helper lists that
|
||||||
@@ -10,11 +11,13 @@ let
|
|||||||
reykjavik = [id-reykjavik];
|
reykjavik = [id-reykjavik];
|
||||||
thingvellir = [id-reykjavik id-thingvellir];
|
thingvellir = [id-reykjavik id-thingvellir];
|
||||||
quinto = [id-reykjavik id-quinto];
|
quinto = [id-reykjavik id-quinto];
|
||||||
|
skaftafell = [id-reykjavik id-skaftafell];
|
||||||
|
|
||||||
samfelag-hosts = [
|
samfelag-hosts = [
|
||||||
id-reykjavik
|
id-reykjavik
|
||||||
id-hvannadal
|
id-hvannadal
|
||||||
id-thingvellir
|
id-thingvellir
|
||||||
|
id-skaftafell
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
BIN
secrets/ssh-keys/id_skaftafell.gpg
Normal file
BIN
secrets/ssh-keys/id_skaftafell.gpg
Normal file
Binary file not shown.
1
secrets/ssh-keys/id_skaftafell.pub
Normal file
1
secrets/ssh-keys/id_skaftafell.pub
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINA2DjHGlJOComWzUzbr/vdT74r7VBJLkmekn8b6783q marc@reykjavik
|
||||||
Reference in New Issue
Block a user