347 current 2025-03-29 20:41:46 24.11.20250320.7105ae3 6.12.10-zen1 *

This commit is contained in:
Ranomier 2025-03-29 20:41:51 +01:00
parent cec7ed3818
commit baf8c080f6
3 changed files with 85 additions and 80 deletions

View file

@ -1,8 +1,9 @@
{ pkgs
, inputs
, modulesPath
, nixos-unstable
, ...
{
pkgs,
inputs,
modulesPath,
nixos-unstable,
...
}: {
networking.hostName = "crocoite"; # Define your hostname.
@ -41,7 +42,7 @@
};
nix = {
settings.experimental-features = [ "nix-command" "flakes" ];
settings.experimental-features = ["nix-command" "flakes"];
# https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
# focused on correctness, usability, and growth
@ -52,34 +53,33 @@
};
imports = [
# steam and other stuff seems to depend on perl
#"${modulesPath}/profiles/perlless.nix"
# steam and other stuff seems to depend on perl
#"${modulesPath}/profiles/perlless.nix"
inputs.nix-flatpak.nixosModules.nix-flatpak
inputs.nix-flatpak.nixosModules.nix-flatpak
#nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
./hardware-configuration.nix
./boot.nix
#nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
./hardware-configuration.nix
./boot.nix
../../modules
../../modules
../../modules/users
../../modules/users
../../modules/hardware
../../modules/hardware
../../modules/sec_auth
../../modules/sec_auth
../../modules/software
../../modules/software/browser
../../modules/software/nix-helper
../../modules/software/shells
../../modules/software/office
../../modules/software
../../modules/software/browser
../../modules/software/nix-helper
../../modules/software/shells
../../modules/software/office
../../modules/wm_and_de
../../modules/wm_and_de
../../modules/pkg_mgrmnt
../../modules/pkg_mgrmnt
# ../../tests
];
# ../../tests
];
}

View file

@ -51,6 +51,7 @@
# move to homemanager?
unstable.mumble
amberol
mpv
nuclear
#zathura
sioyek

View file

@ -1,69 +1,73 @@
{ nixos-unstable, inputs, ... }:
{
nixos-unstable,
inputs,
...
}: {
networking.nat = {
enable = true;
internalInterfaces = [ "ve-+" ];
internalInterfaces = ["ve-+"];
externalInterface = "ens3";
# Lazy IPv6 connectivity for the container
enableIPv6 = true;
};
containers.glitchtip =
{
autoStart = true;
privateNetwork = true;
hostAddress = "192.168.100.10";
localAddress = "192.168.100.11";
hostAddress6 = "fc00::1";
localAddress6 = "fc00::2";
path = (nixos-unstable.lib.nixosSystem {
containers.glitchtip = {
autoStart = true;
privateNetwork = true;
hostAddress = "192.168.100.10";
localAddress = "192.168.100.11";
hostAddress6 = "fc00::1";
localAddress6 = "fc00::2";
path =
(nixos-unstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [{
boot.isContainer = true;
#services.glitchtip = {
# enable = true;
# listenAddress = "0.0.0.0";
# settings = {
# GLITCHTIP_DOMAIN = "http://localhost";
# };
#};
#services = {
# logrotate.enable = lib.mkForce false;
# httpd = {
# enable = true;
# adminAddr = "admin@example.org";
# };
#};
modules = [
{
boot.isContainer = true;
#services.glitchtip = {
# enable = true;
# listenAddress = "0.0.0.0";
# settings = {
# GLITCHTIP_DOMAIN = "http://localhost";
# };
#};
#services = {
# logrotate.enable = lib.mkForce false;
# httpd = {
# enable = true;
# adminAddr = "admin@example.org";
# };
#};
# imports = [
# #(modulesPath + "/profiles/perlless.nix")
# (modulesPath + "/profiles/minimal.nix")
# {
# environment.defaultPackages = [ ];
# boot.kernel.enable = false;
# boot.isContainer = true;
# nixpkgs.overlays = [ (self: super: { }) ];
# }
# ];
# disabledModules = [
# (modulesPath + "/profiles/all-hardware.nix")
# (modulesPath + "/profiles/base.nix")
# ];
# imports = [
# #(modulesPath + "/profiles/perlless.nix")
# (modulesPath + "/profiles/minimal.nix")
# {
# environment.defaultPackages = [ ];
# boot.kernel.enable = false;
# boot.isContainer = true;
# nixpkgs.overlays = [ (self: super: { }) ];
# }
# ];
# disabledModules = [
# (modulesPath + "/profiles/all-hardware.nix")
# (modulesPath + "/profiles/base.nix")
# ];
networking = {
firewall.allowedTCPPorts = [80];
# Use systemd-resolved inside the container
# Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
useHostResolvConf = false;
};
networking = {
firewall.allowedTCPPorts = [ 80 ];
services.resolved.enable = true;
# Use systemd-resolved inside the container
# Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
useHostResolvConf = false;
};
services.resolved.enable = true;
system.stateVersion = "25.05";
}];
}).outPath;
};
system.stateVersion = "25.05";
}
];
})
.outPath;
};
}