From 4f9079395dec8f5a34c3c5ba72117604ff79fad1 Mon Sep 17 00:00:00 2001 From: coolneng Date: Fri, 8 May 2020 20:55:53 +0200 Subject: [PATCH] Add swap file and minor cleanup --- configuration.nix | 5 +++++ modules/networking.nix | 10 ++++------ modules/software.nix | 6 ------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/configuration.nix b/configuration.nix index 54eb8b8..5b76ac2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,6 +4,7 @@ # Kernel configuration boot = { kernelPackages = pkgs.linuxPackages_latest; + # TODO Add resume_offset kernelParams = [ "zfs.zfs_arc_max=536870912" ]; kernelModules = [ "i915" "acpi_call" ]; extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; @@ -64,6 +65,10 @@ # Enable the TLP daemon services.tlp.enable = true; + # Add a swap file and resume from it + swapDevices = [ { device = "/swap"; size = 8192; } ]; + boot.resumeDevice = "/swap"; + # Import other configuration modules imports = [ ./modules/software.nix diff --git a/modules/networking.nix b/modules/networking.nix index badbf05..9ea2178 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -9,18 +9,16 @@ # Set hostname and hostid networking = { hostName = "panacea"; - hostId = ""; + hostId = "a434d9ed230d"; + wireless = { + enable = true; + } }; # Enable zeroconf services.avahi = { enable = true; nssmdns = true; - publish = { - enable = true; - userServices = true; - }; - reflector = true; }; # Wireguard setup diff --git a/modules/software.nix b/modules/software.nix index 1190c70..e165dd7 100644 --- a/modules/software.nix +++ b/modules/software.nix @@ -2,14 +2,8 @@ { environment.systemPackages = with pkgs; [ - # Development - git direnv lorri # Monitoring htop - # Text editors - neovim emacs - # Terminals - kitty tmux tmuxp # Password management pass-wayland passff-host gitAndTools.pass-git-helper # Browsers