From 3ae99f6288294ddf87a4f1c4d692a7eb509d9104 Mon Sep 17 00:00:00 2001 From: jalr Date: Sun, 7 Nov 2021 13:14:08 +0000 Subject: [PATCH] Remove t470s --- hardware/t470s.nix | 15 -- machines/t470s/configuration.nix | 227 ---------------------- machines/t470s/hardware-configuration.nix | 37 ---- 3 files changed, 279 deletions(-) delete mode 100644 hardware/t470s.nix delete mode 100644 machines/t470s/configuration.nix delete mode 100644 machines/t470s/hardware-configuration.nix diff --git a/hardware/t470s.nix b/hardware/t470s.nix deleted file mode 100644 index dd2bf71..0000000 --- a/hardware/t470s.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot.initrd.availableKernelModules = [ - "i915" - ]; - - environment.systemPackages = with pkgs; [ - intel-media-driver - libva - libva-utils - libva1 - ]; - hardware.opengl.extraPackages = lib.singleton pkgs.vaapiIntel; -} diff --git a/machines/t470s/configuration.nix b/machines/t470s/configuration.nix deleted file mode 100644 index 0b48674..0000000 --- a/machines/t470s/configuration.nix +++ /dev/null @@ -1,227 +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’). - -{ config, pkgs, ... }: - -{ - imports = - [ - ./hardware-configuration.nix - ../../hardware/t470s.nix - ../../sway.nix - ../../unstable.nix - ../../fish.nix - ../../autologin.nix - ../../lxc.nix - ../../obs.nix - ]; - - nix = { - daemonNiceLevel = 19; - daemonIONiceLevel = 7; - }; - - hardware.cpu.intel.updateMicrocode = true; - - # Use the GRUB 2 boot loader. - boot = { - cleanTmpDir = true; - loader = { - systemd-boot.enable = true; - efi.efiSysMountPoint = "/boot"; - efi.canTouchEfiVariables = true; - }; - initrd = { - availableKernelModules = [ - "aes_generic" - "aesni_intel" - "cryptd" - ]; - luks.devices = { - pvcrypt = { - device = "/dev/disk/by-uuid/edd860f1-13e5-4301-bfb9-58d0b0bd1c74"; - preLVM = true; - }; - }; - }; - }; - - networking = { - hostName = "mercury"; - interfaces.enp0s31f6.useDHCP = true; - networkmanager = { - enable = true; - }; - useDHCP = false; - - firewall = { - allowedUDPPorts = [ - 53 - ]; - allowedTCPPorts = [ - 53 - ]; - }; - }; - - i18n.defaultLocale = "de_DE.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "neo"; - }; - - time.timeZone = "UTC"; - - environment.systemPackages = with pkgs; [ - file - firefox-wayland - fzf - git - gnome3.adwaita-icon-theme - htop - ike - jq - neovim - openconnect - pavucontrol - redir - ripgrep - spice-gtk - tcpdump - usbutils - virt-manager - ]; - - xdg.icons.enable = true; - - fonts.fonts = with pkgs; [ - powerline-fonts - roboto - font-awesome - ]; - - environment.variables.EDITOR = "nvim"; - - nixpkgs.overlays = [ - (self: super: { - neovim = super.neovim.override { - viAlias = true; - vimAlias = true; - }; - }) - ]; - - programs.mtr.enable = true; - - programs.gnupg.agent = { - enable = true; - pinentryFlavor = "gnome3"; - }; - - sound.enable = true; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.extraModules = [ - pkgs.pulseaudio-modules-bt - ]; - - hardware.bluetooth.enable = true; - services.blueman.enable = true; - services.ofono.enable = true; - - services.udisks2.enable = true; - - services.openssh.enable = true; - - services.udev.extraRules = '' - # mute indicator - SUBSYSTEM=="tty", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="6d75", SYMLINK+="mute-indicator" - ''; - - virtualisation = { - docker.enable = true; - libvirtd.enable = true; - }; - - #virtualisation.docker.extraOptions = "--dns 172.17.0.1"; - - # https://github.com/NixOS/nixpkgs/issues/60594 - security.wrappers.spice-client-glib-usb-acl-helper.source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; - - security.polkit.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.jal = { - isNormalUser = true; - extraGroups = [ - "dialout" - "docker" - "libvirtd" - "networkmanager" - "video" - "wheel" - ]; # Enable ‘sudo’ for the user. - shell = pkgs.fish; - }; - - autologin.username = "jal"; - - networking.wg-quick.interfaces.tbcore = { - address = [ - "172.27.27.16/32" - ]; - privateKeyFile = "/root/wireguard-keys/tradebyte-core"; - listenPort = 51930; - - peers = [ - { - publicKey = "K5vF/yTag6NnWjZsMug63DERdCFRfHoqxVkgKH55oFE="; - endpoint = "194.33.184.175:51930"; - #endpoint = "ccs-emergency-vpn.core.tradebyte.com:51930"; - persistentKeepalive = 25; - allowedIPs = [ - "10.18.0.0/16" - "10.158.128.0/23" - "10.158.224.0/20" - ]; - } - ]; - }; - - services.dnsmasq = { - enable = true; - resolveLocalQueries = true; - servers = [ - "194.150.168.168" # dns.as250.net Berlin/Frankfurt - "195.160.173.53" # dnscache.berlin.ccc.de - "46.182.19.48" # digitalcourage - "/sv.tb/192.168.99.17" - "/abc.tb/192.168.99.44" - "/sys.tradebyte.com/10.10.7.64" - "/core.tradebyte.com/10.170.254.30" - "/instance.tradebyte.com/10.170.254.30" - "/corp.ad.zalando.net/10.160.19.100" - "/7.10.10.in-addr.arpa/10.10.7.64" - "/develop.sys.tradebyte.com/10.0.3.1" - "/internal.production.core.tradebyte.com/10.158.224.2" - ]; - extraConfig = '' - no-resolv - interface=lo - listen-address=::1 - listen-address=127.0.0.1 - bind-interfaces - dns-loop-detect - neg-ttl=5 - ''; - }; - - # 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 = "20.03"; # Did you read the comment? - -} diff --git a/machines/t470s/hardware-configuration.nix b/machines/t470s/hardware-configuration.nix deleted file mode 100644 index 20d6904..0000000 --- a/machines/t470s/hardware-configuration.nix +++ /dev/null @@ -1,37 +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.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/11ad51ac-32f6-45e5-8420-0b1295a5f645"; - fsType = "btrfs"; - options = [ - "discard=async" - "noatime" - "subvol=/nixos" - "compress=zstd:12" - ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/AFAC-E399"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - nix.maxJobs = lib.mkDefault 4; - #powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; -}