From 663ee59f822a778fb980728ed6bff4bcac1ffb67 Mon Sep 17 00:00:00 2001 From: derped Date: Sun, 29 Jan 2023 16:10:05 +0100 Subject: [PATCH] Remove old machines. --- machines/Behemoth/configuration.nix | 11 --- machines/Behemoth/hardware-configuration.nix | 67 ------------------- machines/Behemoth/options.nix | 50 -------------- machines/DavidsServer/configuration.nix | 14 ---- machines/DavidsServer/options.nix | 39 ----------- machines/Leviathan/Leviathan.nix | 18 ----- machines/Leviathan/configuration.nix | 26 ------- machines/Leviathan/hardware-configuration.nix | 65 ------------------ 8 files changed, 290 deletions(-) delete mode 100644 machines/Behemoth/configuration.nix delete mode 100644 machines/Behemoth/hardware-configuration.nix delete mode 100644 machines/Behemoth/options.nix delete mode 100644 machines/DavidsServer/configuration.nix delete mode 100644 machines/DavidsServer/options.nix delete mode 100644 machines/Leviathan/Leviathan.nix delete mode 100644 machines/Leviathan/configuration.nix delete mode 100644 machines/Leviathan/hardware-configuration.nix diff --git a/machines/Behemoth/configuration.nix b/machines/Behemoth/configuration.nix deleted file mode 100644 index 7ab2e47..0000000 --- a/machines/Behemoth/configuration.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -{ - services.cron.enable = false; - - networking.dhcpcd.extraConfig = "noarp"; - - environment.systemPackages = with pkgs; [ xdiskusage ]; - - system.stateVersion = "19.03"; -} diff --git a/machines/Behemoth/hardware-configuration.nix b/machines/Behemoth/hardware-configuration.nix deleted file mode 100644 index b8bf8ef..0000000 --- a/machines/Behemoth/hardware-configuration.nix +++ /dev/null @@ -1,67 +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, ... }: - -{ - imports = - [ - ]; - - boot = { - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - cleanTmpDir = true; - initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "xhci_pci" "usbhid" "sd_mod" "sr_mod" ]; - kernelModules = [ "kvm-amd" ]; - }; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/2f9455e9-ec8a-481e-9d5c-222eebab5e2d"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/DB3A-4C49"; - fsType = "vfat"; - }; - - nix.maxJobs = lib.mkDefault 6; - - hardware = { - firmware = with pkgs; [ firmwareLinuxNonfree ]; - enableAllFirmware = true; - ksm.enable = true; - opengl = { - driSupport = true; - extraPackages = with pkgs; [ libvdpau-va-gl vaapiVdpau ]; - driSupport32Bit = true; - extraPackages32 = with pkgs.pkgsi686Linux; [ libvdpau-va-gl vaapiVdpau ]; - }; - - pulseaudio = { - enable = true; - support32Bit = true; - package = pkgs.pulseaudioFull; - zeroconf.discovery.enable = false; - extraClientConf = '' - autospawn = no - ''; - }; - - bluetooth = { - enable = true; - powerOnBoot = true; - }; - }; - - powerManagement = { - enable = true; - cpuFreqGovernor = "powersave"; - }; - services.upower.enable = true; - services.xserver.videoDrivers = [ "nvidia" ]; - time.timeZone = "Europe/Berlin"; -} diff --git a/machines/Behemoth/options.nix b/machines/Behemoth/options.nix deleted file mode 100644 index 7cb34f3..0000000 --- a/machines/Behemoth/options.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - imports = [ - ../../options/copySysConf.nix - ]; - - config.machine = { - allowUnfree = true; - hostName = "Behemoth"; - administrators = [ { name = "derped"; id = 1337; } ]; - conffiles = [ - "etcfiles" - "etcvars" - "fonts" - "zsh" - ]; - pkgs = [ - "base" - "dict" - "emacs" - "extra" - "cpp" - "haskell" - "mail_utils" - "python3" - "rustpkgs" - "xpkgs" - ]; - services = [ - "desktop" - "udev" - "cups" - ]; - firewall = { - enable = true; - allowPing = true; - allowedUDPPortRanges = [ { from = 1714; to = 1764; } ]; - allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; - }; - desktop.wms = [ "i3" ]; - }; - - config.system.copySysConf = { - enable = false; - addToNixPath = false; - }; -} diff --git a/machines/DavidsServer/configuration.nix b/machines/DavidsServer/configuration.nix deleted file mode 100644 index c876cc9..0000000 --- a/machines/DavidsServer/configuration.nix +++ /dev/null @@ -1,14 +0,0 @@ -# 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’). - -{ - system.autoUpgrade.enable = false; - - programs.zsh.promptInit = "PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[magenta]%}%n@)%m %{$fg_bold[green]%}%(!.%1~.%~) $(git_prompt_info)%_$(prompt_char)%{$reset_color%} '"; - # This value determines the NixOS release with which your system is to be - # compatible, in order to avoid breaking some software such as database - # servers. You should change this only after NixOS release notes say you - # should. - system.stateVersion = "19.03"; -} diff --git a/machines/DavidsServer/options.nix b/machines/DavidsServer/options.nix deleted file mode 100644 index 125d1ee..0000000 --- a/machines/DavidsServer/options.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - config.machine = rec { - hostName = "DavidsServer"; - administrators = [ { name = "david"; id = 1000; } ]; - mailAccounts = [ { name = "david"; aliases = []; } ]; - domain = "davids-planet.de"; - allowUnfree = true; - conffiles = [ - "security" - "zsh" - ]; - pkgs = [ - "base" - "server" - ]; - services = [ - "fail2ban" - "mailserver" - "mariaDB" - "nextcloud" - "nginx" - "openssh" - ]; - vHosts = (let base = domain; in [ - { domain = base; service = "nextcloud"; } - { domain = "mail.${base}"; service = "mail"; } - ]); - firewall = { - enable = true; - allowPing = false; - allowedUDPPorts = [ 22 80 443 ]; - allowedTCPPorts = [ 80 443 ]; - }; - }; -} diff --git a/machines/Leviathan/Leviathan.nix b/machines/Leviathan/Leviathan.nix deleted file mode 100644 index 4b8bfe2..0000000 --- a/machines/Leviathan/Leviathan.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ - ./hardware-configuration.nix - ]; - - services = { - udev.extraRules = '' - SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666" - KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_mode=uinput" - ''; - }; - - environment.systemPackages = with pkgs; [ xdiskusage ]; - - system.stateVersion = "18.09"; -} diff --git a/machines/Leviathan/configuration.nix b/machines/Leviathan/configuration.nix deleted file mode 100644 index 0efcb06..0000000 --- a/machines/Leviathan/configuration.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - confPath = ./Leviathan.nix; - pkgs = [ - "base" - "emacs" - "haskell" - "python3" - "rustpkgs" - "xpkgs" - ]; - services = [ - ../../services/openssh.nix - ../../services/xserver.nix - ]; - conf = { - allowUnfree = true; - networking = { - hostName = "Leviathan"; - firewall = { - allowPing = true; - allowedUDPPorts = [ 22 ]; - allowedTCPPorts = []; - }; - }; - }; -} diff --git a/machines/Leviathan/hardware-configuration.nix b/machines/Leviathan/hardware-configuration.nix deleted file mode 100644 index e8a0156..0000000 --- a/machines/Leviathan/hardware-configuration.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = [ - - ]; - - boot = { - loader.systemd-boot.enable = true; - loader.efi.canTouchEfiVariables = true; - cleanTmpDir = true; - kernelPackages = pkgs.linuxPackages_4_19; - initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; - kernelModules = [ "kvm-intel" "wl" ]; - extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - }; - - hardware = { - cpu.intel.updateMicrocode = true; - enableAllFirmware = true; - enableKSM = true; - opengl = { - driSupport = true; - extraPackages = with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]; - driSupport32Bit = true; - extraPackages32 = with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]; - }; - - pulseaudio = { - enable = true; - support32Bit = true; - package = pkgs.pulseaudioFull; - zeroconf.discovery.enable = false; - extraClientConf = '' - autospawn = no - ''; - }; - - bluetooth = { - enable = true; - powerOnBoot = true; - }; - }; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/4f0a49f8-04f6-437c-ad5d-b0a82a7251ef"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2860-11F4"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/c50ad046-8bfd-4248-8195-7a0d370b641f"; } - ]; - - powerManagement = { - enable = true; - cpuFreqGovernor = "powersave"; - }; - - time.timeZone = "Europe/Berlin"; -}