small fixes
This commit is contained in:
parent
9ab470a419
commit
903ad98313
3 changed files with 9 additions and 32 deletions
|
@ -3,8 +3,10 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
|
||||
sops-nix.url = github:Mic92/sops-nix;
|
||||
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
sops-nix = {
|
||||
url = github:Mic92/sops-nix;
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
microvm = {
|
||||
url = github:astro/microvm.nix;
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -18,6 +20,7 @@
|
|||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./hosts/microwave/configuration.nix
|
||||
./hosts/microwave/hardware-configuration.nix
|
||||
./modules/graphical.nix
|
||||
./modules/hw-accel-intel.nix
|
||||
./modules/kernel-latest.nix
|
||||
|
|
|
@ -5,11 +5,6 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# SWAP
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
|
@ -24,9 +19,8 @@
|
|||
gimp
|
||||
inkscape
|
||||
];
|
||||
networking.firewall.enable = true;
|
||||
services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
|
||||
|
||||
networking.firewall.enable = true;
|
||||
networking = {
|
||||
hostName = "microwave"; # Define your hostname.
|
||||
networkmanager.enable = true;
|
||||
|
@ -55,26 +49,6 @@
|
|||
hardware.cpu.intel.updateMicrocode = true;
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
# accidentally delete configuration.nix.
|
||||
# system.copySystemConfiguration = true;
|
||||
|
||||
|
||||
# Enable touchpad support.
|
||||
services.xserver.libinput = {
|
||||
enable = true;
|
||||
touchpad = {
|
||||
disableWhileTyping = true;
|
||||
naturalScrolling = true;
|
||||
scrollMethod = "twofinger";
|
||||
tapping = true;
|
||||
accelProfile = "adaptive";
|
||||
# clickMethod = "clickfinger";
|
||||
};
|
||||
};
|
||||
|
||||
# Shell config (bash)
|
||||
programs.bash = {
|
||||
enableCompletion = true;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
networking.wg-quick.interfaces = {
|
||||
wg-zw = {
|
||||
privateKeyFile="/root/zw-wg-key";
|
||||
privateKeyFile="/etc/wg/zw-wg-key";
|
||||
address = ["172.20.76.226" ];
|
||||
dns = [ "172.20.73.8" ];
|
||||
peers = [
|
||||
|
@ -15,7 +15,7 @@
|
|||
];
|
||||
};
|
||||
wg-dvb = {
|
||||
privateKeyFile = "/root/wg-dvb";
|
||||
privateKeyFile="/etc/wg/wg-dvb";
|
||||
address = [ "10.13.37.3/32" ];
|
||||
|
||||
peers = [
|
||||
|
@ -29,7 +29,7 @@
|
|||
};
|
||||
|
||||
mlwd-nl = {
|
||||
privateKeyFile = "/root/mlvd";
|
||||
privateKeyFile = "/etc/wg/mlvd";
|
||||
address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
|
||||
dns = [ "193.138.218.74" ];
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue