From 6893e5c55226ea79f9ceb32fd52add6f6b3c4a58 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Tue, 14 Mar 2023 13:22:16 +0100 Subject: [PATCH] production client-2 --- flake.nix | 20 +++ home/features/desktop/media.nix | 1 + home/features/desktop/plasma.nix | 12 +- home/features/services/default.nix | 1 + home/features/services/netbird.nix | 14 ++ home/users/m3tam3re/m3-nix.nix | 4 + home/users/produktion/lkk-prod-1.nix | 4 + home/users/produktion/lkk-prod-2.nix | 20 +++ hosts/lkk-nix-1/services/#netbird.nix# | 5 + hosts/lkk-prod-1/default.nix | 7 +- hosts/lkk-prod-1/hardware-configuration.nix | 19 ++- hosts/lkk-prod-2/default.nix | 136 ++++++++++++++++++++ hosts/lkk-prod-2/hardware-configuration.nix | 39 ++++++ hosts/m3-nix/services/default.nix | 1 + 14 files changed, 264 insertions(+), 19 deletions(-) create mode 100644 home/features/services/default.nix create mode 100644 home/features/services/netbird.nix create mode 100644 home/users/produktion/lkk-prod-2.nix create mode 100644 hosts/lkk-nix-1/services/#netbird.nix# create mode 100644 hosts/lkk-prod-2/default.nix create mode 100644 hosts/lkk-prod-2/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index e1d9baf..11cf54a 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,17 @@ }) ]; }; + lkk-prod-2 = lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + allowUnfree + ./hosts/lkk-prod-2 + agenix.nixosModules.default + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ overlay-unstable ]; + }) + ]; + }; }; homeConfigurations = { # Laptop @@ -81,6 +92,15 @@ self.nixosConfigurations.lkk-prod-1; }; }; + deploy.nodes.lkk-prod-2 = { + hostname = "lkk-prod-2"; + sshUser = "root"; + profiles.system = { + user = "root"; + path = deploy-rs.lib.x86_64-linux.activate.nixos + self.nixosConfigurations.lkk-prod-2; + }; + }; deploy.remoteBuild = true; }; } diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix index f2823cd..8b01fc7 100644 --- a/home/features/desktop/media.nix +++ b/home/features/desktop/media.nix @@ -23,6 +23,7 @@ in { mpv obs-studio plexamp + uxplay vlc youtube-dl ]; diff --git a/home/features/desktop/plasma.nix b/home/features/desktop/plasma.nix index 2a563bb..fe5d451 100644 --- a/home/features/desktop/plasma.nix +++ b/home/features/desktop/plasma.nix @@ -1,14 +1,8 @@ - -{ pkgs, lib, outputs, ... }: -{ +{ pkgs, lib, outputs, ... }: { imports = [ # ]; - home.packages = with pkgs; [ - alacritty - brave - libreoffice - nextcloud-client - ]; + home.packages = with pkgs; [ alacritty brave libreoffice nextcloud-client ]; + services.espanso.enable = true; } diff --git a/home/features/services/default.nix b/home/features/services/default.nix new file mode 100644 index 0000000..265f13b --- /dev/null +++ b/home/features/services/default.nix @@ -0,0 +1 @@ +{ imports = [ ./netbird.nix ]; } diff --git a/home/features/services/netbird.nix b/home/features/services/netbird.nix new file mode 100644 index 0000000..aff92f4 --- /dev/null +++ b/home/features/services/netbird.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.features.services.netbird; + +in { + + options.features.services.netbird.enable = mkEnableOption "install netbird"; + + config = mkIf cfg.enable { + home.packages = with pkgs; [ netbird-ui ]; + }; +} diff --git a/home/users/m3tam3re/m3-nix.nix b/home/users/m3tam3re/m3-nix.nix index eed9b11..687c46a 100644 --- a/home/users/m3tam3re/m3-nix.nix +++ b/home/users/m3tam3re/m3-nix.nix @@ -6,6 +6,7 @@ ../../features/desktop ../../features/gaming ../../features/virtualization + ../../features/services ]; features = { @@ -27,6 +28,9 @@ podman.enable = true; qemu.enable = true; }; + services = { + netbird.enable = true; + }; }; diff --git a/home/users/produktion/lkk-prod-1.nix b/home/users/produktion/lkk-prod-1.nix index 52a99fd..8f7d848 100644 --- a/home/users/produktion/lkk-prod-1.nix +++ b/home/users/produktion/lkk-prod-1.nix @@ -3,6 +3,7 @@ ./base ../../features/cli ../../features/desktop/plasma.nix + ../../features/services ]; features = { @@ -10,6 +11,9 @@ fish.enable = true; starship.enable = true; }; + services = { + netbird.enable = true; + }; }; home.stateVersion = "22.11"; diff --git a/home/users/produktion/lkk-prod-2.nix b/home/users/produktion/lkk-prod-2.nix new file mode 100644 index 0000000..8f7d848 --- /dev/null +++ b/home/users/produktion/lkk-prod-2.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: { + imports = [ + ./base + ../../features/cli + ../../features/desktop/plasma.nix + ../../features/services + ]; + + features = { + cli = { + fish.enable = true; + starship.enable = true; + }; + services = { + netbird.enable = true; + }; + }; + + home.stateVersion = "22.11"; +} diff --git a/hosts/lkk-nix-1/services/#netbird.nix# b/hosts/lkk-nix-1/services/#netbird.nix# new file mode 100644 index 0000000..9296743 --- /dev/null +++ b/hosts/lkk-nix-1/services/#netbird.nix# @@ -0,0 +1,5 @@ +{ + services.netbird = { + enable = true; + }; +} \ No newline at end of file diff --git a/hosts/lkk-prod-1/default.nix b/hosts/lkk-prod-1/default.nix index 9f6667c..af2cb24 100644 --- a/hosts/lkk-prod-1/default.nix +++ b/hosts/lkk-prod-1/default.nix @@ -7,9 +7,10 @@ ../common/base ]; - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/vda"; - boot.loader.grub.useOSProber = true; + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking = { diff --git a/hosts/lkk-prod-1/hardware-configuration.nix b/hosts/lkk-prod-1/hardware-configuration.nix index 36e4eda..40448ea 100644 --- a/hosts/lkk-prod-1/hardware-configuration.nix +++ b/hosts/lkk-prod-1/hardware-configuration.nix @@ -5,29 +5,34 @@ { imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ (modulesPath + "/hardware/network/broadcom-43xx.nix") + (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/72016102-ac1b-462f-97c5-8575f91780d8"; + { device = "/dev/disk/by-uuid/88887b78-5a75-49cf-991d-7a3c8f813799"; fsType = "ext4"; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/0d57f573-b278-48d2-ad44-5a1cf28bcd2b"; } - ]; + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/67E3-17ED"; + fsType = "vfat"; + }; + + swapDevices = [ ]; # 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.enp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0f0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/lkk-prod-2/default.nix b/hosts/lkk-prod-2/default.nix new file mode 100644 index 0000000..c092af5 --- /dev/null +++ b/hosts/lkk-prod-2/default.nix @@ -0,0 +1,136 @@ +{ config, pkgs, ... }: + +{ + imports = [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ../common/users/produktion + ../common/base + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking = { + hostName = "lkk-prod-2"; + networkmanager.enable = true; + firewall.enable = true; + }; + services.openssh = { + enable = true; + permitRootLogin = "yes"; + }; + services.avahi = { + enable = true; + nssmdns = true; + }; + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "de_DE.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "de"; + xkbVariant = ""; + }; + + # Configure console keymap + console.keyMap = "de"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; + [ + neovim + ]; + + nix = { + gc = { + automatic = true; + options = "--delete-older-than 30d"; + }; + optimise.automatic = true; + }; + + system.stateVersion = "22.11"; # Did you read the comment? + # 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; + + # 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). + +} diff --git a/hosts/lkk-prod-2/hardware-configuration.nix b/hosts/lkk-prod-2/hardware-configuration.nix new file mode 100644 index 0000000..1ca9d67 --- /dev/null +++ b/hosts/lkk-prod-2/hardware-configuration.nix @@ -0,0 +1,39 @@ +# 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 + "/hardware/network/broadcom-43xx.nix") + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/73092ab4-3dcb-4b39-8fa2-44c0341c44c0"; + fsType = "ext4"; + }; + + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/67E3-17ED"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # 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.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/m3-nix/services/default.nix b/hosts/m3-nix/services/default.nix index c341392..9a5de27 100644 --- a/hosts/m3-nix/services/default.nix +++ b/hosts/m3-nix/services/default.nix @@ -14,4 +14,5 @@ }; services.kubo = { enable = true; }; # IPFS services.printing.enable = true; + services.netbird.enable = true; }