thary/sp-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of system argument; do not set nixpkgs.hostPlatform

Browse Source
This commit is contained in:
Alexander Tomokhov
2023-12-05 07:36:26 +04:00
parent 4c4aef5363
commit 519ebbcb69
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configuration.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, lib, system, ... }: { config, pkgs, lib, ... }:
{ {
imports = [ imports = [
./variables-module.nix ./variables-module.nix
@@ -103,7 +103,6 @@
if lib.versionAtLeast pkgs.nix.version "2.15.2" if lib.versionAtLeast pkgs.nix.version "2.15.2"
then pkgs.nix.out then pkgs.nix.out
else pkgs.nixUnstable.out; else pkgs.nixUnstable.out;
nixpkgs.hostPlatform = system;
services.journald.extraConfig = "SystemMaxUse=500M"; services.journald.extraConfig = "SystemMaxUse=500M";
boot.kernel.sysctl = { boot.kernel.sysctl = {
"net.ipv4.ip_forward" = 1; # TODO why is it here by default, for VPN only? "net.ipv4.ip_forward" = 1; # TODO why is it here by default, for VPN only?

4
flake.nix
View File

@@ -12,8 +12,7 @@
outputs = { self, nixpkgs, selfprivacy-api }: { outputs = { self, nixpkgs, selfprivacy-api }: {
nixosConfigurations-fun = nixosConfigurations-fun =
{ system { hardware-configuration
, hardware-configuration
, deployment , deployment
, userdata , userdata
, top-level-flake , top-level-flake
@@ -21,7 +20,6 @@
}: }:
{ {
sp-nixos = nixpkgs.lib.nixosSystem { sp-nixos = nixpkgs.lib.nixosSystem {
specialArgs = { inherit system; };
modules = [ modules = [
hardware-configuration hardware-configuration
deployment deployment