formatting
This commit is contained in:
parent
20e99d234d
commit
9ea28ef218
18 changed files with 183 additions and 75 deletions
|
|
@ -67,7 +67,6 @@
|
|||
|
||||
nix.channel.enable = false;
|
||||
|
||||
|
||||
nix.registry = {
|
||||
self.flake = inputs.self;
|
||||
nixpkgs.flake = inputs.nixpkgs;
|
||||
|
|
@ -91,7 +90,10 @@
|
|||
|
||||
osbm-nvim.flake = inputs.osbm-nvim;
|
||||
my-nixpkgs = {
|
||||
from = { type = "indirect"; id = "my-nixpkgs"; };
|
||||
from = {
|
||||
type = "indirect";
|
||||
id = "my-nixpkgs";
|
||||
};
|
||||
to = {
|
||||
owner = "osbm";
|
||||
repo = "nixpkgs";
|
||||
|
|
@ -99,7 +101,10 @@
|
|||
};
|
||||
};
|
||||
osbm-dev = {
|
||||
from = { type = "indirect"; id = "osbm-dev"; };
|
||||
from = {
|
||||
type = "indirect";
|
||||
id = "osbm-dev";
|
||||
};
|
||||
to = {
|
||||
owner = "osbm";
|
||||
repo = "osbm.dev";
|
||||
|
|
@ -107,7 +112,10 @@
|
|||
};
|
||||
};
|
||||
devshells = {
|
||||
from = { type = "indirect"; id = "devshells"; };
|
||||
from = {
|
||||
type = "indirect";
|
||||
id = "devshells";
|
||||
};
|
||||
to = {
|
||||
owner = "osbm";
|
||||
repo = "devshells";
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@
|
|||
enable = true;
|
||||
hostID = "0f7de22e";
|
||||
root = {
|
||||
useTmpfs = false; # Use ZFS root, not tmpfs
|
||||
useTmpfs = false; # Use ZFS root, not tmpfs
|
||||
encrypt = true;
|
||||
disk1 = "vda";
|
||||
impermanenceRoot = true; # Wipe root on boot with ZFS snapshots
|
||||
impermanenceRoot = true; # Wipe root on boot with ZFS snapshots
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -73,17 +73,24 @@
|
|||
useDHCP = false;
|
||||
interfaces.ens3 = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [{
|
||||
address = "152.53.152.129";
|
||||
prefixLength = 22;
|
||||
}];
|
||||
ipv6.addresses = [{
|
||||
address = "2a00:11c0:47:3b2a::1";
|
||||
prefixLength = 64;
|
||||
}];
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "152.53.152.129";
|
||||
prefixLength = 22;
|
||||
}
|
||||
];
|
||||
ipv6.addresses = [
|
||||
{
|
||||
address = "2a00:11c0:47:3b2a::1";
|
||||
prefixLength = 64;
|
||||
}
|
||||
];
|
||||
};
|
||||
defaultGateway = "152.53.152.1";
|
||||
defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
|
||||
defaultGateway6 = {
|
||||
address = "fe80::1";
|
||||
interface = "ens3";
|
||||
};
|
||||
};
|
||||
|
||||
# Override initrd kernel params for static IP
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
# Disko configuration is now managed by osbmModules.hardware.disko
|
||||
# All disk configuration moved to configuration.nix
|
||||
|
||||
|
||||
# Required for ZFS
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue