From d3cd3ca613eb647542ef582f1bf6d6a3014174ef Mon Sep 17 00:00:00 2001 From: ChUrl Date: Thu, 7 Sep 2023 17:50:29 +0200 Subject: [PATCH] Remove servenix system (too different, will be stored separately) --- flake.nix | 12 -- system/servenix/default.nix | 100 ----------------- system/servenix/hardware-configuration.nix | 122 --------------------- 3 files changed, 234 deletions(-) delete mode 100644 system/servenix/default.nix delete mode 100644 system/servenix/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 1c26bfae..b60ff3ab 100644 --- a/flake.nix +++ b/flake.nix @@ -113,18 +113,6 @@ hyprland.nixosModules.default # Use system module for SDDM config ]; }; - - # Usage: sudo nixos-rebuild switch --flake .#nixtop - servenix = mylib.nixos.mkNixosConfig { - inherit system mylib; - - hostname = "servenix"; - username = "christoph"; - - extraModules = [ - hyprland.nixosModules.default # Use system module for SDDM config - ]; - }; }; }; } diff --git a/system/servenix/default.nix b/system/servenix/default.nix deleted file mode 100644 index 9548af19..00000000 --- a/system/servenix/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - inputs, - config, - lib, - mylib, - pkgs, - ... -}: rec { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ../modules - - # inputs.musnix.nixosModules.musnix - ]; - - boot.loader = lib.mkForce { - systemd-boot.enable = false; - - grub.enable = true; - grub.device = "/dev/sda"; - grub.useOSProber = true; - }; - - modules = { - containers = { - enable = true; - - homeassistant.enable = false; - stablediffusion.enable = false; - jellyfin.enable = true; - fileflows.enable = false; - - # TODO: These have to be moved from nixinator to servenix - # The netns is the problem: Can't access UI when it's running in NS, - # somehow connect to netns from other PC? - sonarr.enable = false; - radarr.enable = false; - hydra.enable = false; - sabnzbd.enable = false; - }; - - systemd-networkd = { - wireguard-tunnels = { - wg0-de-115 = ( - mylib.networking.mkWireguardService - "wg0-de-115" - "proton-de-115.key" - "9+CorlxrTsQR7qjIOVKsEkk8Z7UUS5WT3R1ccF7a0ic=" - "194.126.177.14" - ); - - wg0-lu-16 = ( - mylib.networking.mkWireguardService - "wg0-lu-16" - "proton-lu-16.key" - "asu9KtQoZ3iKwELsDTgjPEiFNcD1XtgGgy3O4CZFg2w=" - "92.223.89.133" - ); - }; - }; - }; - - programs = lib.mkForce { - fish.enable = true; - firejail.enable = true; - git.enable = true; - neovim.enable = true; - starship.enable = true; - }; - - services = lib.mkForce { - xserver = { - enable = false; - - # Configure keymap in X11 - layout = "us"; - xkbVariant = "altgr-intl"; - - # videoDrivers = [ "nvidia" ]; # NVIDIA - # videoDrivers = ["amdgpu"]; - # videoDrivers = ["intel"]; - }; - - pipewire.enable = false; - printing.enable = false; - avahi.enable = false; - openssh.enable = true; - acpid.enable = false; - dbus.enable = true; - flatpak.enable = false; - fstrim.enable = true; - fwupd.enable = false; - locate.enable = false; - ntp.enable = false; - gvfs.enable = true; - qemuGuest.enable = true; - gnome.gnome-keyring.enable = true; - }; -} diff --git a/system/servenix/hardware-configuration.nix b/system/servenix/hardware-configuration.nix deleted file mode 100644 index 89309612..00000000 --- a/system/servenix/hardware-configuration.nix +++ /dev/null @@ -1,122 +0,0 @@ -# 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")]; - imports = [(modulesPath + "/profiles/qemu-guest.nix")]; - - boot = { - # initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; - initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; - initrd.kernelModules = []; # Initrd modules are always loaded, e.g. when they are required to mount the rootfs - # kernelModules = ["kvm-intel" "iwlwifi"]; - # kernelModules = ["kvm-amd"]; - kernelModules = []; - - # extraModprobeConfig = '' - # options iwlwifi 11n_disable=1 wd_disable=0 - # ''; - - # Specific to used kernel (currently linux_zen) - extraModulePackages = with config.boot.kernelPackages; []; - }; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/f7871268-76f6-49d3-a75b-7fe78e8c55b4"; - fsType = "ext4"; - options = [ "noatime" "nodiratime" "discard" ]; - }; - - fileSystems."/media/Picture" = { - device = "//192.168.86.100/Picture"; - fsType = "cifs"; - options = let - # this line prevents hanging on network split - automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; - - in ["${automount_opts},credentials=/home/christoph/samba.login"]; - }; - - fileSystems."/media/Video" = { - device = "//192.168.86.100/Video"; - fsType = "cifs"; - options = let - # this line prevents hanging on network split - automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; - - in ["${automount_opts},credentials=/home/christoph/samba.login"]; - }; - - fileSystems."/media/Usenet" = { - device = "//192.168.86.100/Usenet"; - fsType = "cifs"; - options = let - # this line prevents hanging on network split - automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; - - in ["${automount_opts},credentials=/home/christoph/samba.login"]; - }; - - swapDevices = lib.mkForce [ - # { - # device = "/var/swap"; - # # size = 1024 * 16 * 2; # twice the RAM for hibernation - # size = 1024 * 8; # Without hibernation 4.0 GB to 0.5 x RAM - # } - ]; - - # 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 false; # NOTE: Set to false bc systemd-networkd - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.enp4s0u2.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - # networking.networkmanager.enable = true; - # networking.wireless.iwd.enable = true; - # networking.networkmanager.wifi.backend = "iwd"; - - # nixpkgs.config.allowUnfree = true; - - hardware = { - # Use all redistributable firmware (i.e. nonfree) - # enableAllFirmware = true; - # enableRedistributableFirmware = true; - # cpu.intel.updateMicrocode = true; - - # nvidia.modesetting.enable = true; # Not officially supported by NVidia but needed for wayland - # video.hidpi.enable = lib.mkDefault true; # No longer has any effect - # opengl.enable = true; - - # Vulkan - # opengl.driSupport = true; - # opengl.driSupport32Bit = true; - - # AMD: https://nixos.wiki/wiki/AMD_GPU - opengl.extraPackages = with pkgs; [ - # amdvlk # RADV (mesa) and AMDVLK (amd) can be used simultaneously - - # OpenCL - # rocm-opencl-icd - # rocm-opencl-runtime - # rocm-runtime # Wiki doesn't mention this, but it exists... - - # TODO: Disabled for the moment, because hardware acceleration crashes AMDGPU driver - # VAAPI/VDPAU: https://nixos.wiki/wiki/Accelerated_Video_Playback - # vaapiVdpau # Taken from wiki - # libvdpau-va-gl # Taken from wiki - # libvdpau # NOTE: Don't know if needed/where it belongs... - # libva # NOTE: Don't know if needed/where it belongs... - ]; - }; - - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; -}