From 9857aeb18684bf1f70764e7bd9cf532855e3b5c0 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sat, 18 Jun 2022 16:16:12 +0200 Subject: [PATCH] feat: add apache base config --- flake.nix | 7 +- machines/apache/configuration.nix | 136 ++++++++++++++++++ machines/apache/hardware-configuration.nix | 41 ++++++ .../nixos-vm/configuration.nix | 2 +- .../nixos-vm/hardware-configuration.nix | 0 5 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 machines/apache/configuration.nix create mode 100644 machines/apache/hardware-configuration.nix rename configuration.nix => machines/nixos-vm/configuration.nix (99%) rename hardware-configuration.nix => machines/nixos-vm/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix index 701c76d..aea87bc 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,12 @@ nixosConfigurations.nixos-vm = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = inputs; - modules = [ ./configuration.nix ]; + modules = [ ./machines/nixos-vm/configuration.nix ]; + }; + nixosConfigurations.apache = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = inputs; + modules = [ ./machines/apache/configuration.nix ]; }; }; } diff --git a/machines/apache/configuration.nix b/machines/apache/configuration.nix new file mode 100644 index 0000000..1c72046 --- /dev/null +++ b/machines/apache/configuration.nix @@ -0,0 +1,136 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.loader = { + timeout = 1; + efi.canTouchEfiVariables = true; + + grub = { + efiSupport = true; + enableCryptodisk = true; + device = "nodev"; + }; + }; + + boot.initrd.luks.devices = { + crypt-nixos.device = "/dev/disk/by-uuid/4345618c-6968-465f-8ebd-1d76defc0f57"; + crypt-swap.device = "/dev/disk/by-uuid/fa3440af-0354-4299-860e-01a3b012416f"; + }; + + networking.hostName = "apache"; # Define your hostname. + # Pick only one of the below networking options. + networking.wireless.enable = true; + + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminus16"; + keyMap = "de-latin1-nodeadkeys"; + # useXkbConfig = true; # use xkbOptions in tty. + }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + fonts.fonts = with pkgs; [ + (nerdfonts.override { fonts = [ "DejaVuSansMono" ]; }) + ]; + + + + + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = { + # "eurosign:e"; + # "caps:escape" # map caps to escape. + # }; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.jane = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # thunderbird + # ]; + # }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + neovim + git + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # 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; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.05"; # Did you read the comment? + + nix = { + package = pkgs.nixFlakes; + extraOptions = "experimental-features = nix-command flakes"; + }; + +} + diff --git a/machines/apache/hardware-configuration.nix b/machines/apache/hardware-configuration.nix new file mode 100644 index 0000000..bfbb695 --- /dev/null +++ b/machines/apache/hardware-configuration.nix @@ -0,0 +1,41 @@ +# 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 + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/58100870-c0e2-414f-aa8a-2f2cde8ae4da"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."crypt-nixos".device = "/dev/disk/by-uuid/4345618c-6968-465f-8ebd-1d76defc0f57"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/01E5-F47D"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/9b775e18-ab8c-4647-9ab1-a51391af6d6d"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/configuration.nix b/machines/nixos-vm/configuration.nix similarity index 99% rename from configuration.nix rename to machines/nixos-vm/configuration.nix index 890909a..04f560a 100644 --- a/configuration.nix +++ b/machines/nixos-vm/configuration.nix @@ -7,7 +7,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./users.nix + ../../users.nix ]; boot.loader = { diff --git a/hardware-configuration.nix b/machines/nixos-vm/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to machines/nixos-vm/hardware-configuration.nix