Compare commits
No commits in common. "fecfdec551ac17e999b53328f0444f998d92ac2d" and "5b84ce4c5d5a40f81b469e5015a1ff77ead3cc78" have entirely different histories.
fecfdec551
...
5b84ce4c5d
|
@ -2,10 +2,8 @@
|
||||||
# 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, materusCfg, materusArg, ... }:
|
{ config, pkgs, materusArg, ... }:
|
||||||
let
|
|
||||||
unstable = import materusCfg.materusFlake.inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; nvidia.acceptLicense = true; }; };
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
|
@ -35,7 +33,7 @@ in
|
||||||
};
|
};
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
boot.kernelPackages = unstable.linuxPackages_zen;
|
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||||
boot.tmp.useTmpfs = true;
|
boot.tmp.useTmpfs = true;
|
||||||
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
@ -233,7 +231,7 @@ in
|
||||||
|
|
||||||
fonts.fontDir.enable = true;
|
fonts.fontDir.enable = true;
|
||||||
fonts.enableDefaultPackages = true;
|
fonts.enableDefaultPackages = true;
|
||||||
fonts.packages = with pkgs; [
|
fonts.fonts = with pkgs; [
|
||||||
dejavu_fonts
|
dejavu_fonts
|
||||||
hack-font
|
hack-font
|
||||||
noto-fonts
|
noto-fonts
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
"wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = {
|
"wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = {
|
||||||
endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}";
|
endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}";
|
||||||
allowed-ips = "${materusArg.ip-masks.wireguard.general};";
|
allowed-ips = "${materusArg.ip-masks.wireguard.general};";
|
||||||
persistent-keepalive = "20";
|
|
||||||
};
|
};
|
||||||
ipv4 = {
|
ipv4 = {
|
||||||
address1 = "${materusArg.ips.wireguard.Old-materusPC}/23";
|
address1 = "${materusArg.ips.wireguard.Old-materusPC}/23";
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.latest;
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,6 @@
|
||||||
"wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = {
|
"wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = {
|
||||||
endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}";
|
endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}";
|
||||||
allowed-ips = "${materusArg.ip-masks.wireguard.general};";
|
allowed-ips = "${materusArg.ip-masks.wireguard.general};";
|
||||||
persistent-keepalive = "20";
|
|
||||||
};
|
};
|
||||||
ipv4 = {
|
ipv4 = {
|
||||||
address1 = "${materusArg.ips.wireguard.materusPC}/23";
|
address1 = "${materusArg.ips.wireguard.materusPC}/23";
|
||||||
|
|
Loading…
Reference in New Issue