fix: cleanup!

This commit is contained in:
Ranomier 2025-05-04 20:26:19 +02:00
parent 4880ce65ae
commit bf19849309
7 changed files with 53 additions and 65 deletions

View file

@ -33,22 +33,9 @@
# })
];
# Configure your nixpkgs instance
config = {
allowUnfree = true;
};
};
nix = {
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
# and committed to doing right by its community.
package = pkgs.lix;
channel.enable = false;
};
imports = [
# steam and other stuff seems to depend on perl
@ -77,7 +64,8 @@
../../modules/wm_and_de
../../modules/pkg_mgrmnt
../../system_profiles/defaults.nix
# ../../tests
];
}

View file

@ -12,30 +12,23 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.05"; # Did you read the comment?
nixpkgs.config = {
# Disable if you don't want unfree packages
allowUnfree = true;
};
nix.settings.experimental-features = ["nix-command" "flakes"];
# Disable if you don't want unfree packages
nixpkgs.config.allowUnfree = true;
nix = {
# https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
# focused on correctness, usability, and growth
# and committed to doing right by its community.
nix.package = pkgs.lix;
package = pkgs.lix;
settings.experimental-features = ["nix-command" "flakes"];
};
imports = [
./hardware-configuration.nix
../../modules/locale.nix
../../system_profiles/mini.nix
{
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.ens18.useDHCP = lib.mkDefault true;
}
../../system_profiles/mini-container.nix
];
}

View file

@ -17,7 +17,6 @@
# Disable if you don't want unfree packages
allowUnfree = true;
};
nix.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
@ -29,27 +28,5 @@
../../modules/locale.nix
(modulesPath + "/profiles/perlless.nix")
(modulesPath + "/profiles/minimal.nix")
{
environment.defaultPackages = [];
boot.kernel.enable = false;
boot.isContainer = true;
nixpkgs.overlays = [(self: super: {})];
}
{
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.ens18.useDHCP = lib.mkDefault true;
}
];
disabledModules = [
(modulesPath + "/profiles/all-hardware.nix")
(modulesPath + "/profiles/base.nix")
# <nixpkgs/nixos/modules/profiles/all-hardware.nix>
# <nixpkgs/nixos/modules/profiles/base.nix>
];
../../system_profiles/mini.nix
}

View file

@ -1,27 +1,26 @@
inArgs: let
lib = inArgs.nixpkgs.lib;
hostHelper = import ./hostHelper.nix inArgs;
# Supported systems for your flake packages, shell, etc.
systems = [
#"aarch64-linux"
"x86_64-linux"
];
# This is a function that generates an attribute by calling a function you
# pass to it, with each system as an argument
forAllSystems = inArgs.nixpkgs.lib.genAttrs systems;
lib = inArgs.nixpkgs.lib;
hostHelper = import ./hostHelper.nix inArgs;
in {
# NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname'
# to add more append // (host_helper example);
nixosConfigurations = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) {
crocoite = {};
game-luanti = {unstable = true;};
#jitsi = {};
};
# Your custom packages
# Accessible through 'nix build', 'nix shell', etc
#packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});

View file

@ -0,0 +1,23 @@
{
lib,
pkgs,
...
}: {
nix.settings.experimental-features = lib.mkDefault ["nix-command" "flakes"];
# Disable if you don't want unfree packages
nixpkgs.config.allowUnfree = lib.mkDefault true;
nix = {
# https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
# focused on correctness, usability, and growth
# and committed to doing right by its community.
package = lib.mkDefault pkgs.lix;
channel.enable = lib.mkDefault false;
};
imports = [
../modules/locale.nix
];
}

View file

@ -1,10 +1,13 @@
{
lib,
...
}: {
imports = [
./mini.nix
{
boot.isContainer = true;
boot.kernel.enable = false;
boot.isContainer = lib.mkDefault true;
boot.kernel.enable = lib.mkDefault false;
}
];
}

View file

@ -1,4 +1,5 @@
{
lib,
modulesPath,
...
}: {
@ -7,10 +8,14 @@
(modulesPath + "/profiles/perlless.nix")
{
boot.isContainer = true;
boot.kernel.enable = false;
environment.defaultPackages = [];
nixpkgs.overlays = [(self: super: {})];
environment.defaultPackages = lib.mkDefault [];
nixpkgs.overlays = lib.mkDefault [(self: super: {})];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
}
];