From bb08214389c805e744d4322802b892052203698b Mon Sep 17 00:00:00 2001 From: tristan Date: Thu, 7 Dec 2023 18:02:10 +0100 Subject: [PATCH] WIP --- os-mods/common/default.nix | 1 + systems/nixos-docker/default.nix | 49 +++++++++++++------ .../nixos-docker/hardware-configuration.nix | 23 +++++---- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index 5147d8c..938db87 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -60,6 +60,7 @@ neovim # editor veracrypt vim # fallback ed + git ]; fileSystems."/etc/nixos" = { diff --git a/systems/nixos-docker/default.nix b/systems/nixos-docker/default.nix index 94511d6..94ff14b 100644 --- a/systems/nixos-docker/default.nix +++ b/systems/nixos-docker/default.nix @@ -1,14 +1,15 @@ -{ config, pkgs, lib, ... }: - -{ - imports = - [ - # Include the results of the hardware scan. - ../../os-mods/common - ../../os-mods/cachix - ../../os-mods/network - ./hardware-configuration.nix - ]; +{ config +, pkgs +, lib +, ... +}: { + imports = [ + # Include the results of the hardware scan. + ../../os-mods/common + ../../os-mods/cachix + ../../os-mods/network + ./hardware-configuration.nix + ]; # Bootloader. boot.loader.grub.enable = true; @@ -95,7 +96,6 @@ services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "reopen5194"; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -111,18 +111,34 @@ # started in user sessions. # programs.mtr.enable = true; - # QemuGuest services.qemuGuest.enable = true; # Virtualization virtualisation.docker = { enable = true; - rootless = { - enable = true; - setSocketVariable = true; + # rootless = { + # enable = true; + # setSocketVariable = true; + # }; + daemon.settings = { + # fixed-cidr-v6 = "fd00::/80"; + # ipv6 = true; + dns = [ "9.9.9.9" "149.112.112.112" ]; }; }; + # allow to bind to priv ports + # boot.kernel.sysctl = { + # "net.ipv4.ip_unprivileged_port_start" = 79; + # }; + + networking.firewall.allowedTCPPortRanges = [ + { + from = 19999; + to = 19999; + } # netdata + ]; + services.netdata = { enable = true; @@ -160,6 +176,7 @@ }; }; + zramSwap.enable = true; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/systems/nixos-docker/hardware-configuration.nix b/systems/nixos-docker/hardware-configuration.nix index 786bb55..2d9f8fb 100644 --- a/systems/nixos-docker/hardware-configuration.nix +++ b/systems/nixos-docker/hardware-configuration.nix @@ -1,22 +1,25 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; +{ config +, lib +, pkgs +, modulesPath +, ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/8598929f-bf20-4f02-9f20-acf899eeee2c"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/8598929f-bf20-4f02-9f20-acf899eeee2c"; + fsType = "ext4"; + }; swapDevices = [ ];