From c0f07e142eb45fe847f657eacbb4d05fcb64382b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 1 Jul 2020 14:13:54 +0100 Subject: chore(tazjin): Remove nugget system definition This host is deprecated. Change-Id: Ibbf1e300ae8b136bb3ce3669864045e6ea7eff23 Reviewed-on: https://cl.tvl.fyi/c/depot/+/826 Reviewed-by: BuildkiteCI Reviewed-by: tazjin Tested-by: BuildkiteCI --- users/tazjin/nixos/README.md | 2 +- users/tazjin/nixos/default.nix | 2 - users/tazjin/nixos/nugget/default.nix | 280 ---------------------------------- 3 files changed, 1 insertion(+), 283 deletions(-) delete mode 100644 users/tazjin/nixos/nugget/default.nix diff --git a/users/tazjin/nixos/README.md b/users/tazjin/nixos/README.md index fc90cb4b43..0093f4ac65 100644 --- a/users/tazjin/nixos/README.md +++ b/users/tazjin/nixos/README.md @@ -16,5 +16,5 @@ hostname. ## Configured hosts: * `frog` - weapon of mass computation at home -* `nugget` - desktop computer at home +* `camden` - NUC serving tazj.in, tvl.fyi & co * ~~`urdhva` - T470s~~ (currently with edef) diff --git a/users/tazjin/nixos/default.nix b/users/tazjin/nixos/default.nix index 4f8923af79..9747f5c00c 100644 --- a/users/tazjin/nixos/default.nix +++ b/users/tazjin/nixos/default.nix @@ -25,7 +25,6 @@ let fi case $HOSTNAME in - ${caseFor "nugget"} ${caseFor "camden"} ${caseFor "frog"} *) @@ -40,7 +39,6 @@ let in { inherit rebuilder; - nuggetSystem = systemFor [ depot.users.tazjin.nixos.nugget ]; camdenSystem = systemFor [ depot.users.tazjin.nixos.camden ]; frogSystem = systemFor [ depot.users.tazjin.nixos.frog ]; } diff --git a/users/tazjin/nixos/nugget/default.nix b/users/tazjin/nixos/nugget/default.nix deleted file mode 100644 index 7c9530072d..0000000000 --- a/users/tazjin/nixos/nugget/default.nix +++ /dev/null @@ -1,280 +0,0 @@ -# This file configures nugget, my home desktop machine. -{ depot, lib, ... }: - -config: let - nixpkgs = import depot.third_party.stableNixpkgsSrc { - config.allowUnfree = true; - }; - - unstable = import depot.third_party.nixpkgsSrc {}; - lieer = (depot.third_party.lieer {}); - - # google-c-style is installed only on nugget because other - # machines get it from, eh, elsewhere. - nuggetEmacs = (depot.tools.emacs.overrideEmacs(epkgs: epkgs ++ [ - depot.third_party.emacsPackages.google-c-style - ])); -in depot.lib.fix(self: { - imports = [ - ../modules/v4l2loopback.nix - ]; - - hardware = { - pulseaudio.enable = true; - cpu.intel.updateMicrocode = true; - u2f.enable = true; - }; - - boot = { - cleanTmpDir = true; - kernelModules = [ "kvm-intel" ]; - - loader = { - timeout = 3; - systemd-boot.enable = true; - efi.canTouchEfiVariables = false; - }; - - initrd = { - luks.devices.nugget-crypt.device = "/dev/disk/by-label/nugget-crypt"; - availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - kernelModules = [ "dm-snapshot" ]; - }; - - kernel.sysctl = { - "kernel.perf_event_paranoid" = 1; - }; - }; - - nix = { - package = depot.third_party.nix; - nixPath = [ - "depot=/home/tazjin/depot" - "nixpkgs=${depot.third_party.nixpkgsSrc}" - ]; - }; - - nixpkgs.pkgs = nixpkgs; - - networking = { - hostName = "nugget"; - useDHCP = false; - interfaces.eno1.useDHCP = true; - interfaces.wlp7s0.useDHCP = true; - - # Don't use ISP's DNS servers: - nameservers = [ - "8.8.8.8" - "8.8.4.4" - ]; - - # Open Chromecast-related ports & servedir - firewall.enable = false; - firewall.allowedTCPPorts = [ 4242 5556 5558 ]; - - # Connect to the WiFi to let the Chromecast work. - wireless.enable = true; - wireless.networks = { - "How do I computer?" = { - psk = "washyourface"; - }; - }; - }; - - # Generate an immutable /etc/resolv.conf from the nameserver settings - # above (otherwise DHCP overwrites it): - environment.etc."resolv.conf" = with lib; { - source = depot.third_party.writeText "resolv.conf" '' - ${concatStringsSep "\n" (map (ns: "nameserver ${ns}") self.networking.nameservers)} - options edns0 - ''; - }; - - time.timeZone = "Europe/London"; - - environment.systemPackages = - # programs from the depot - (with depot; [ - fun.idual.script - lieer - nuggetEmacs - ops.kontemplate - third_party.ffmpeg - third_party.git - ]) ++ - - # programs from nixpkgs - (with nixpkgs; [ - age - bat - cachix - chromium - clang-manpages - clang-tools - clang_10 - curl - direnv - dnsutils - exa - fd - gnupg - go - google-chrome - google-cloud-sdk - guile - htop - hyperfine - i3lock - imagemagick - jq - keybase-gui - kubectl - linuxPackages.perf - meson - miller - msmtp - nix-prefetch-github - notmuch - openssh - openssl - pass - pavucontrol - pinentry - pinentry-emacs - pwgen - ripgrep - rr - rustup - sbcl - scrot - spotify - steam - tokei - tree - unzip - vlc - xclip - yubico-piv-tool - yubikey-personalization - ]) ++ - - # programs from unstable nixpkgs - (with unstable; [ - zoxide - ]); - - fileSystems = { - "/".device = "/dev/disk/by-label/nugget-root"; - "/boot".device = "/dev/disk/by-label/EFI"; - "/home".device = "/dev/disk/by-label/nugget-home"; - }; - - # Configure user account - users.extraUsers.tazjin = { - extraGroups = [ "wheel" "audio" ]; - isNormalUser = true; - uid = 1000; - shell = nixpkgs.fish; - }; - - security.sudo = { - enable = true; - extraConfig = "wheel ALL=(ALL:ALL) SETENV: ALL"; - }; - - fonts = { - fonts = with nixpkgs; [ - corefonts - dejavu_fonts - jetbrains-mono - noto-fonts-cjk - noto-fonts-emoji - ]; - - fontconfig = { - hinting.enable = true; - subpixel.lcdfilter = "light"; - - defaultFonts = { - monospace = [ "JetBrains Mono" ]; - }; - }; - }; - - # Configure location (Vauxhall, London) for services that need it. - location = { - latitude = 51.4819109; - longitude = -0.1252998; - }; - - programs.fish.enable = true; - programs.ssh.startAgent = true; - - services.redshift.enable = true; - services.openssh.enable = true; - services.keybase.enable = true; - - # Required for Yubikey usage as smartcard - services.pcscd.enable = true; - services.udev.packages = [ - nixpkgs.yubikey-personalization - ]; - - services.xserver = { - enable = true; - layout = "us"; - xkbOptions = "caps:super"; - exportConfiguration = true; - videoDrivers = [ "nvidia" ]; - - displayManager = { - # Give EXWM permission to control the session. - sessionCommands = "${nixpkgs.xorg.xhost}/bin/xhost +SI:localuser:$USER"; - - lightdm.enable = true; - lightdm.greeters.gtk.clock-format = "%H·%M"; - }; - - windowManager.session = lib.singleton { - name = "exwm"; - start = "${nuggetEmacs}/bin/tazjins-emacs"; - }; - }; - - # Do not restart the display manager automatically - systemd.services.display-manager.restartIfChanged = lib.mkForce false; - - # Configure email setup - systemd.user.services.lieer-tazjin = { - description = "Synchronise mail@tazj.in via lieer"; - script = "${lieer}/bin/gmi sync"; - - serviceConfig = { - WorkingDirectory = "%h/mail/account.tazjin"; - Type = "oneshot"; - }; - }; - - systemd.user.timers.lieer-tazjin = { - wantedBy = [ "timers.target" ]; - - timerConfig = { - OnActiveSec = "1"; - OnUnitActiveSec = "180"; - }; - }; - - # Use Tailscale \o/ - services.tailscale.enable = true; - - # nugget has an SSD - services.fstrim.enable = true; - - # clangd needs more than ~2GB in the runtime directory to start up - services.logind.extraConfig = '' - RuntimeDirectorySize=4G - ''; - - # ... and other nonsense. - system.stateVersion = "19.09"; -}) -- cgit 1.4.1