diff options
| -rw-r--r-- | ops/machines/all-systems.nix | 1 | ||||
| -rw-r--r-- | users/grfn/system/home/default.nix | 5 | ||||
| -rw-r--r-- | users/grfn/system/home/machines/chupacabra.nix | 54 | ||||
| -rw-r--r-- | users/grfn/system/system/default.nix | 8 | ||||
| -rw-r--r-- | users/grfn/system/system/machines/chupacabra.nix | 142 |
5 files changed, 0 insertions, 210 deletions
diff --git a/ops/machines/all-systems.nix b/ops/machines/all-systems.nix index 4b1d1457aa49..b80436a06c4a 100644 --- a/ops/machines/all-systems.nix +++ b/ops/machines/all-systems.nix @@ -11,6 +11,5 @@ ]) ++ (with depot.users.grfn.system.system; [ - chupacabra yeren ]) diff --git a/users/grfn/system/home/default.nix b/users/grfn/system/home/default.nix index 6221df95c3d3..f62704152b28 100644 --- a/users/grfn/system/home/default.nix +++ b/users/grfn/system/home/default.nix @@ -18,10 +18,6 @@ rec { }; }); - chupacabra = home ./machines/chupacabra.nix; - - chupacabraHome = chupacabra.activation-script; - dobharchu = home ./machines/dobharchu.nix; dobharchuHome = dobharchu.activation-script; @@ -31,7 +27,6 @@ rec { yerenHome = yeren.activation-script; meta.targets = [ - "chupacabraHome" "yerenHome" ]; } diff --git a/users/grfn/system/home/machines/chupacabra.nix b/users/grfn/system/home/machines/chupacabra.nix deleted file mode 100644 index 04f34ccbc4ae..000000000000 --- a/users/grfn/system/home/machines/chupacabra.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, lib, config, ... }: - -with lib; - -let - laptopKeyboardId = "25"; -in { - imports = [ - ../platforms/linux.nix - ../modules/common.nix - ../modules/games.nix - ../modules/rtlsdr.nix - ../modules/ptt.nix - ]; - - # for when hacking - programs.home-manager.path = "/home/grfn/code/home-manager"; - programs.home-manager.enable = true; - home.stateVersion = "19.09"; - - system.machine = { - wirelessInterface = "wlp59s0"; - i3FontSize = 9; - }; - - systemd.user.services.laptop-keyboard = { - Unit = { - Description = "Swap caps+escape and alt+super, but only on the built-in laptop keyboard"; - After = [ "graphical-session-pre.target" ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { WantedBy = [ "graphical-session.target" ]; }; - - Service = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = ( - "${pkgs.xorg.setxkbmap}/bin/setxkbmap " - + "-device ${laptopKeyboardId} " - + "-option caps:swapescape " - + "-option compose:ralt " - + "-option altwin:swap_alt_win" - ); - }; - }; - - home.packages = with pkgs; [ - steam - xorg.libxcb - ]; - - xsession.windowManager.i3.config.keybindings.F7 = "exec lock"; -} diff --git a/users/grfn/system/system/default.nix b/users/grfn/system/system/default.nix index bc8f7f8844c0..445d4ad2438d 100644 --- a/users/grfn/system/system/default.nix +++ b/users/grfn/system/system/default.nix @@ -1,12 +1,6 @@ args @ { depot, pkgs, ... }: rec { - chupacabra = import ./machines/chupacabra.nix; - - chupacabraSystem = (depot.third_party.nixos { - configuration = chupacabra; - }).system; - mugwump = import ./machines/mugwump.nix; mugwumpSystem = (depot.ops.nixos.nixosFor mugwump).system; @@ -34,9 +28,7 @@ rec { iso = import ./iso.nix args; - # Build chupacabra in CI meta.targets = [ - "chupacabraSystem" "mugwumpSystem" "roswellSystem" "yerenSystem" diff --git a/users/grfn/system/system/machines/chupacabra.nix b/users/grfn/system/system/machines/chupacabra.nix deleted file mode 100644 index 974e3c34e37b..000000000000 --- a/users/grfn/system/system/machines/chupacabra.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../modules/common.nix - ../modules/laptop.nix - ../modules/tvl.nix - ../modules/fcitx.nix - ../modules/rtlsdr.nix - ../../../../../ops/modules/v4l2loopback.nix - ../modules/desktop.nix - ../modules/development.nix - ]; - - hardware.enableRedistributableFirmware = true; - - networking.hostName = "chupacabra"; - - powerManagement = { - enable = true; - powertop.enable = true; - cpuFreqGovernor = "powersave"; - }; - - laptop.onLowBattery = { - enable = true; - action = "hibernate"; - thresholdPercentage = 5; - }; - - boot = { - blacklistedKernelModules = [ "nouveau" "intel" ]; - extraModulePackages = [ ]; - - initrd = { - availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - kernelModules = [ ]; - - luks.devices = { - "cryptroot".device = "/dev/disk/by-uuid/c2fc7ce7-a45e-48a1-8cde-be966ef601db"; - "cryptswap".device = "/dev/disk/by-uuid/3b6e2fd4-bfe9-4392-a6e0-4f3b3b76e019"; - }; - }; - - kernelModules = [ "kvm-intel" ]; - kernelParams = [ "acpi_rev_override" ]; - - kernel.sysctl = { - "kernel.perf_event_paranoid" = -1; - "vm.swappiness" = 1; - }; - }; - - services.thermald.enable = true; - - hardware.cpu.intel.updateMicrocode = true; - - # Intel-only graphics - hardware.nvidiaOptimus.disable = true; - services.xserver.videoDrivers = [ "intel" ]; - - # Nvidia Optimus (hybrid) - currently not working - # services.xserver.videoDrivers = [ "intel" "nvidia" ]; - # boot.blacklistedKernelModules = [ "nouveau" "bbswitch" ]; - # boot.extraModulePackages = [ pkgs.linuxPackages.nvidia_x11 ]; - # hardware.bumblebee.enable = true; - # hardware.bumblebee.pmMethod = "none"; - - systemd.services.disable-usb-autosuspend = { - description = "Disable USB autosuspend"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { Type = "oneshot"; }; - unitConfig.RequiresMountsFor = "/sys"; - script = '' - echo -1 > /sys/module/usbcore/parameters/autosuspend - ''; - }; - - # From hardware-configuration.nix - - fileSystems."/" = - { device = "/dev/mapper/cryptroot"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3492-9E3A"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/caa7e2ff-475b-4024-b29e-4f88f733fc4c"; } - ]; - - # High-DPI console - console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; - - # from nixos-hardware TODO sort this around - services.tlp.enable = true; - services.fstrim.enable = lib.mkDefault true; - - # Intel cpu stuff - hardware.opengl.extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-media-driver - ]; - - services.udev.extraRules = '' - # UDEV rules for Teensy USB devices - ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" - ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" - SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666" - KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666" - ''; - - # Necessary to get steam working - hardware.opengl.driSupport32Bit = true; - - nix = { - maxJobs = lib.mkDefault 12; - binaryCaches = [ "ssh://grfn@172.16.0.5" ]; - trustedBinaryCaches = [ "ssh://grfn@172.16.0.5" ]; - buildMachines = [ - { - hostName = "172.16.0.4"; - sshUser = "griffin"; - sshKey = "/home/grfn/.ssh/id_rsa"; - system = "x86_64-darwin"; - maxJobs = 8; # 16 cpus - } - { - hostName = "172.16.0.3"; - sshUser = "griffin"; - sshKey = "/home/grfn/.ssh/id_rsa"; - system = "x86_64-darwin"; - maxJobs = 4; - } - ]; - }; -} |