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 pkgs,
, modulesPath inputs,
, nixos-unstable modulesPath,
, ... nixos-unstable,
...
}: { }: {
networking.hostName = "crocoite"; # Define your hostname. networking.hostName = "crocoite"; # Define your hostname.
@ -41,7 +42,7 @@
}; };
nix = { 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, # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
# focused on correctness, usability, and growth # focused on correctness, usability, and growth
@ -52,34 +53,33 @@
}; };
imports = [ imports = [
# steam and other stuff seems to depend on perl # steam and other stuff seems to depend on perl
#"${modulesPath}/profiles/perlless.nix" #"${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 ../../modules
./hardware-configuration.nix
./boot.nix
../../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/wm_and_de
../../modules/software/browser
../../modules/software/nix-helper
../../modules/software/shells
../../modules/software/office
../../modules/wm_and_de ../../modules/pkg_mgrmnt
../../modules/pkg_mgrmnt # ../../tests
];
# ../../tests
];
} }

View file

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

View file

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