Compare commits
4 commits
bdba785ab6
...
339938b213
Author | SHA1 | Date | |
---|---|---|---|
339938b213 | |||
62364a9db5 | |||
d493ea127a | |||
4d1af7a40d |
3 changed files with 39 additions and 18 deletions
19
flake.nix
Normal file
19
flake.nix
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
description = "NixOS system flake";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
|
||||||
|
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs, ... }@inputs: {
|
||||||
|
|
||||||
|
nixosConfigurations.thinknix = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [ ./nixos/configuration.nix ];
|
||||||
|
# necessary to make the top-level inputs available to system configuration
|
||||||
|
specialArgs = { inherit inputs; };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,10 +2,10 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
unstable = import <nixos-unstable> { };
|
unstable = inputs.nixos-unstable;
|
||||||
localfork = import /home/spiollinux/src/nixpkgs { };
|
localfork = import /home/spiollinux/src/nixpkgs { };
|
||||||
|
|
||||||
in
|
in
|
||||||
|
@ -234,15 +234,22 @@ in
|
||||||
# Enable all sysrq functions (useful to recover from some issues):
|
# Enable all sysrq functions (useful to recover from some issues):
|
||||||
boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
|
boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
|
||||||
|
|
||||||
|
nix = {
|
||||||
|
# expose all flake inputs through nix Path and registry
|
||||||
|
registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // {
|
||||||
|
nixpkgs.flake = inputs.nixpkgs;
|
||||||
|
};
|
||||||
|
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||||
# keep build-time deps around for offline-rebuilding
|
# keep build-time deps around for offline-rebuilding
|
||||||
nix.settings = {
|
settings = {
|
||||||
# keep around all inputs necessary for offline-rebuilding the system
|
# keep around all inputs necessary for offline-rebuilding the system
|
||||||
keep-outputs = true;
|
keep-outputs = true;
|
||||||
keep-derivations = true;
|
keep-derivations = true;
|
||||||
trusted-users = [ "spiollinux" ];
|
trusted-users = [ "spiollinux" ];
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
# use all cores for building
|
# use all cores for building
|
||||||
cores = 0;
|
cores = 0;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
# override tmpdir for daemon
|
# override tmpdir for daemon
|
||||||
#systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
|
#systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, modulesPath, inputs, ... }:
|
||||||
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -7,13 +7,8 @@ in
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
(
|
(inputs.nixos-hardware + "/lenovo/thinkpad/t440s")
|
||||||
builtins.fetchGit {
|
|
||||||
url = "https://github.com/NixOS/nixos-hardware";
|
|
||||||
rev = "a4bc66709604ab78abc575b60baa6d23ae027a59";
|
|
||||||
} + "/lenovo/thinkpad/t440s"
|
|
||||||
)
|
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue