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

Add Colmena to manage systems, use better pathing for smallfetch, use better mountpoints and hostnames from Colema

Browse source
This commit is contained in:
Bun 2025-06-01 06:17:48 -04:00
parent 215ad6b1a7
commit 1f7d01bb4d
53 changed files with 254 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hosts/detritus/colmena/default.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, ... }:
{
deployment = {
tags = [
"latptop"
"pc"
];
targetHost = "";
};
}

7
hosts/detritus/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./filesystems
./hardware
@ -9,12 +10,8 @@
../../modules/system
];
networking.hostName = "detritus";
system = {
desktop.enable = true;
stateVersion = "24.11";
stateVersion = "25.05";
};
services.xserver.videoDrivers = [ "amdgpu" ];
}

18
hosts/detritus/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }:
{ config, nodes, ... }:
{
fileSystems = with config.services.mycelium.ips; {
fileSystems = with config.sysusers; with nodes; {
# Local mounts
"/persist/storage" = {
device = "/dev/disk/by-uuid/d0d6783f-ad51-4d85-b8a9-3374f6460ef6";
@ -11,7 +11,7 @@
"subvol=storage"
];
};
"/persist/home/${config.sysusers.main}/games" = {
"/persist/home/${main}/games" = {
device = "/dev/disk/by-uuid/d0d6783f-ad51-4d85-b8a9-3374f6460ef6";
fsType = "btrfs";
options = [
@ -22,8 +22,8 @@
};
# Network mounts
"/home/${config.sysusers.main}/Network/Midas" = {
device = "[${midas}]:/storage";
"/home/${main}/Network/Midas" = {
device = "[${midas.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"
@ -31,8 +31,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Kitty" = {
device = "[${kitty}]:/storage/bun";
"/home/${main}/Network/Kitty" = {
device = "[${kitty.config.deployment.targetHost}]:/storage/bun";
fsType = "nfs4";
options = [
"noauto"
@ -40,8 +40,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Prophet" = {
device = "[${prophet}]:/storage";
"/home/${main}/Network/Prophet" = {
device = "[${prophet.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"

3
hosts/hidden/boot/default.nix
View file

@ -1,6 +1,7 @@
{ ... }:
{ pkgs, ... }:
{
boot = {
kernelPackages = pkgs.linuxPackages_6_14;
loader.systemd-boot.enable = true;
plymouth.enable = true;
};

10
hosts/hidden/colmena/default.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, ... }:
{
deployment = {
tags = [
"misc"
"pc"
];
targetHost = "4ec:1001:ca5a:ae79:40e2:cb4c:e3c9:f401";
};
}

3
hosts/hidden/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./hardware
./services
@ -9,8 +10,6 @@
../../modules/system
];
networking.hostName = "hidden";
system = {
desktop.enable = true;
stateVersion = "24.11";

10
hosts/intuos/colmena/default.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, ... }:
{
deployment = {
tags = [
"latptop"
"pc"
];
targetHost = "40e:404:a427:da33:163e:97b3:a2a3:9ed4";
};
}

3
hosts/intuos/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./filesystems
./hardware
@ -9,8 +10,6 @@
../../modules/system
];
networking.hostName = "intuos";
system = {
desktop.enable = true;
stateVersion = "24.11";

16
hosts/intuos/filesystems/default.nix
View file

@ -1,9 +1,9 @@
{ config, ... }:
{ config, nodes, ... }:
{
fileSystems = with config.services.mycelium.ips; {
fileSystems = with config.sysusers; with nodes; {
# Network mounts
"/home/${config.sysusers.main}/Network/Midas" = {
device = "[${midas}]:/storage";
"/home/${main}/Network/Midas" = {
device = "[${midas.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"
@ -11,8 +11,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Kitty" = {
device = "[${kitty}]:/storage/bun";
"/home/${main}/Network/Kitty" = {
device = "[${kitty.config.deployment.targetHost}]:/storage/bun";
fsType = "nfs4";
options = [
"noauto"
@ -20,8 +20,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Prophet" = {
device = "[${prophet}]:/storage";
"/home/${main}/Network/Prophet" = {
device = "[${prophet.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"

2
hosts/jupiter/boot/default.nix
View file

@ -1,7 +1,7 @@
{ pkgsStable, ... }:
{
boot = {
kernelPackages = pkgsStable.linuxPackages_latest;
kernelPackages = pkgsStable.linuxPackages_6_14;
loader.systemd-boot.enable = true;
plymouth.enable = true;
};

10
hosts/jupiter/colmena/default.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, ... }:
{
deployment = {
tags = [
"latptop"
"pc"
];
targetHost = "5ce:969c:40d1:9575:f5e:591d:c377:a20b";
};
}

3
hosts/jupiter/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./filesystems
./hardware
@ -11,8 +12,6 @@
../../modules/system
];
networking.hostName = "jupiter";
system = {
desktop.enable = true;
steamdeck.enable = true;

16
hosts/jupiter/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }:
{ config, nodes, ... }:
{
fileSystems = with config.services.mycelium.ips; {
fileSystems = with config.sysusers; with nodes; {
# Local mounts
"/mnt/Games" = {
device = "/dev/disk/by-uuid/cb109a85-846d-4417-9c50-a2279bd20803";
@ -12,8 +12,8 @@
};
# Network mounts
"/home/${config.sysusers.main}/Network/Midas" = {
device = "[${midas}]:/storage";
"/home/${main}/Network/Midas" = {
device = "[${midas.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"
@ -21,8 +21,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Kitty" = {
device = "[${kitty}]:/storage/bun";
"/home/${main}/Network/Kitty" = {
device = "[${kitty.config.deployment.targetHost}]:/storage/bun";
fsType = "nfs4";
options = [
"noauto"
@ -30,8 +30,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Prophet" = {
device = "[${prophet}]:/storage";
"/home/${main}/Network/Prophet" = {
device = "[${prophet.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"

2
hosts/jupiter/jovian/default.nix
View file

@ -32,7 +32,7 @@
services = {
keyd.enable = lib.mkForce false;
tlp.enable = lib.mkForce false;
xserver.desktopManager.gnome.enable = true;
desktopManager.gnome.enable = true;
};
hardware.xone.enable = true;

7
hosts/kitty/colmena/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ config, ... }:
{
deployment = {
tags = [ "server" ];
targetHost = "53f:dc2d:80c9:3ca2:4b15:ef4d:38a0:c868";
};
}

6
hosts/kitty/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./filesystems
./hardware
@ -9,10 +10,7 @@
../../modules/system
];
networking = {
hostName = "kitty";
hostId = "8745e22e";
};
networking.hostId = "8745e22e";
system = {
server.enable = true;

14
hosts/kitty/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }:
{ config, nodes, ... }:
{
fileSystems = with config.services.mycelium.ips; {
fileSystems = with config.sysusers; with nodes; {
"/persist/storage" = {
device = "/dev/disk/by-uuid/edd3e293-1aff-4fc0-96fa-4e17d6cccfca";
fsType = "btrfs";
@ -11,17 +11,17 @@
};
# Network mounts
"/home/${config.sysusers.main}/Network/Midas" = {
device = "[${midas}]:/storage";
"/home/${main}/Network/Midas" = {
device = "[${midas.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"x-systemd.automount"
"noauto"
"soft"
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Prophet" = {
device = "[${prophet}]:/storage";
"/home/${main}/Network/Prophet" = {
device = "[${prophet.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"

7
hosts/midas/colmena/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ config, ... }:
{
deployment = {
tags = [ "server" ];
targetHost = "538:e163:87ba:f847:3646:18b6:6b01:d8f8";
};
}

6
hosts/midas/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./filesystems
./hardware
@ -11,10 +12,7 @@
../../modules/system
];
networking = {
hostName = "midas";
hostId = "38ba3f57";
};
networking.hostId = "38ba3f57";
system = {
server.enable = true;

6
hosts/midas/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }:
{ config, nodes, ... }:
{
fileSystems = with config.services.mycelium.ips; {
fileSystems = with config.sysusers; with nodes; {
"/persist" = {
device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
fsType = "btrfs";
@ -11,7 +11,7 @@
];
};
"/kitty" = {
device = "[${kitty}]:/storage/bun";
device = "[${kitty.config.deployment.targetHost}]:/storage/${main}";
fsType = "nfs4";
options = [
"noauto"

8
hosts/prophet/colmena/default.nix Normal file
View file

@ -0,0 +1,8 @@
{ config, ... }:
{
deployment = {
buildOnTarget = true;
tags = [ "server" ];
targetHost = "42f:2737:2aed:4dee:cbe4:3c73:1918:ad9b";
};
}

6
hosts/prophet/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./filesystems
./hardware
@ -11,10 +12,7 @@
(modulesPath + "/profiles/headless.nix")
];
networking = {
hostName = "prophet";
hostId = "97a21a38";
};
networking.hostId = "97a21a38";
system = {
server.enable = true;

5
hosts/tower/boot/default.nix
View file

@ -12,7 +12,7 @@ let
in {
boot = {
# Latest kernel and IOMMU isolation
kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_6_14;
kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
# Load into GPU before video driver
@ -24,6 +24,9 @@ in {
# Secure boot
lanzaboote.enable = true;
# Emulate different architectures for remote builds
binfmt.emulatedSystems = [ "aarch64-linux" ];
};
# Use second GPU on boot

10
hosts/tower/colmena/default.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, ... }:
{
deployment = {
tags = [
"desktop"
"pc"
];
targetHost = "4e4:535:9d47:f367:becd:6557:458d:5b1b";
};
}

3
hosts/tower/default.nix
View file

@ -2,6 +2,7 @@
{
imports = [
./boot
./colmena
./disko
./filesystems
./hardware
@ -9,8 +10,6 @@
../../modules/system
];
networking.hostName = "tower";
system = {
desktop.enable = true;
nvidia.enable = true;

16
hosts/tower/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }:
{ config, nodes, ... }:
{
fileSystems = with config.services.mycelium.ips; {
fileSystems = with config.sysusers; with nodes; {
# Games and such
"/mnt/Linux1" = {
device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4";
@ -39,8 +39,8 @@
};
# Network mounts
"/home/${config.sysusers.main}/Network/Midas" = {
device = "[${midas}]:/storage";
"/home/${main}/Network/Midas" = {
device = "[${midas.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"
@ -48,8 +48,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Kitty" = {
device = "[${kitty}]:/storage/bun";
"/home/${main}/Network/Kitty" = {
device = "[${kitty.config.deployment.targetHost}]:/storage/${main}";
fsType = "nfs4";
options = [
"noauto"
@ -57,8 +57,8 @@
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Prophet" = {
device = "[${prophet}]:/storage";
"/home/${main}/Network/Prophet" = {
device = "[${prophet.config.deployment.targetHost}]:/storage";
fsType = "nfs4";
options = [
"noauto"