derped/nixos
1
0
Fork 0
Code Releases Activity

Hydra kind of works now. Switched to nixos nextcloud module. Renamed some stuff and added kdeconnect firewall rules. Added gvfs modules environmen variable.

Browse source
This commit is contained in:
Kevin Baensch 2019-03-04 10:35:50 +01:00
parent 764f126524
commit 2efae4f888
13 changed files with 144 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

8
machines/Lilim/Lilim.nix
View file

@ -1,8 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = import ./configuration.nix;
in {
{
imports = [
./hardware-configuration.nix
];
@ -15,7 +13,7 @@ in {
'';
};
environment.systemPackages = with pkgs; [ surface-firmware xdiskusage ];
environment.systemPackages = with pkgs; [ firmware_surface xdiskusage ];
system.stateVersion = "18.09";
system.stateVersion = "19.03";
}

2
machines/Lilim/configuration.nix
View file

@ -24,6 +24,8 @@
allowPing = true;
allowedUDPPorts = [];
allowedTCPPorts = [];
allowedUDPPortRanges = [ { from = 1714; to = 1764; } ];
allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
};
};
};

7
machines/Lilim/hardware-configuration.nix
View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
surfacepkgs = import <linux-surface> {};
localpkgs = import <nixpkgs-local> {};
in {
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
@ -9,8 +9,7 @@ in {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
cleanTmpDir = true;
# kernelPackages = pkgs.linuxPackages_surface;
kernelPackages = surfacepkgs.linuxPackages_surface;
kernelPackages = pkgs.linuxPackages_latest;
initrd.kernelModules = [ "hid-multitouch" ];
initrd.availableKernelModules = [ "hid-microsoft" "hid-multitouch" "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
kernelModules = [ "kvm-intel" "hid-microsoft" "hid-multitouch" "uinput" ];
@ -30,7 +29,7 @@ in {
swapDevices = [ ];
hardware = {
firmware = with pkgs; [ firmwareLinuxNonfree surface-firmware ];
firmware = with pkgs; [ firmwareLinuxNonfree firmware_surface ];
cpu.intel.updateMicrocode = true;
enableAllFirmware = true;
enableKSM = true;

5
machines/Ophanim/configuration.nix
View file

@ -10,6 +10,7 @@
../../services/hydra.nix
../../services/mailserver.nix
../../services/mariaDB.nix
../../services/nextcloud.nix
../../services/nginx.nix
../../services/openssh.nix
];
@ -20,7 +21,9 @@
firewall = {
allowPing = false;
allowedUDPPorts = [ 22 80 443 ];
allowedTCPPorts = [ 80 443 5222 5269 ];
allowedTCPPorts = [ 80 443 ]; # 5222 5269 ];
allowedUDPPortRanges = [];
allowedTCPPortRanges = [];
};
};
};