0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

small fixes

Browse source
This commit is contained in:
Grigory Shipunov 2022-05-29 13:39:17 +02:00
parent 9ab470a419
commit 903ad98313
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
3 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

@ -3,8 +3,10 @@
inputs = { inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
sops-nix.url = github:Mic92/sops-nix; sops-nix = {
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; url = github:Mic92/sops-nix;
inputs.nixpkgs.follows = "nixpkgs";
};
microvm = { microvm = {
url = github:astro/microvm.nix; url = github:astro/microvm.nix;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -18,6 +20,7 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hosts/microwave/configuration.nix ./hosts/microwave/configuration.nix
./hosts/microwave/hardware-configuration.nix
./modules/graphical.nix ./modules/graphical.nix
./modules/hw-accel-intel.nix ./modules/hw-accel-intel.nix
./modules/kernel-latest.nix ./modules/kernel-latest.nix

28
hosts/microwave/configuration.nix
View file

@ -5,11 +5,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
# SWAP # SWAP
zramSwap = { zramSwap = {
enable = true; enable = true;
@ -24,9 +19,8 @@
gimp gimp
inkscape inkscape
]; ];
networking.firewall.enable = true;
services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
networking.firewall.enable = true;
networking = { networking = {
hostName = "microwave"; # Define your hostname. hostName = "microwave"; # Define your hostname.
networkmanager.enable = true; networkmanager.enable = true;
@ -55,26 +49,6 @@
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;
hardware.enableAllFirmware = 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) # Shell config (bash)
programs.bash = { programs.bash = {
enableCompletion = true; enableCompletion = true;

6
modules/wireguard.nix
View file

@ -3,7 +3,7 @@
{ {
networking.wg-quick.interfaces = { networking.wg-quick.interfaces = {
wg-zw = { wg-zw = {
privateKeyFile="/root/zw-wg-key"; privateKeyFile="/etc/wg/zw-wg-key";
address = ["172.20.76.226" ]; address = ["172.20.76.226" ];
dns = [ "172.20.73.8" ]; dns = [ "172.20.73.8" ];
peers = [ peers = [
@ -15,7 +15,7 @@
]; ];
}; };
wg-dvb = { wg-dvb = {
privateKeyFile = "/root/wg-dvb"; privateKeyFile="/etc/wg/wg-dvb";
address = [ "10.13.37.3/32" ]; address = [ "10.13.37.3/32" ];
peers = [ peers = [
@ -29,7 +29,7 @@
}; };
mlwd-nl = { mlwd-nl = {
privateKeyFile = "/root/mlvd"; privateKeyFile = "/etc/wg/mlvd";
address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ]; address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
dns = [ "193.138.218.74" ]; dns = [ "193.138.218.74" ];