diff --git a/flake.nix b/flake.nix index e67ce46b..6110be1b 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,6 @@ }; in { - azathoth = mkNixosConfiguration "azathoth" [ "${nixpkgs}/nixos/modules/installer/scan/not-detected.nix" ]; carcosa = mkNixosConfiguration "carcosa" [ "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix" ]; nyarlathotep = mkNixosConfiguration "nyarlathotep" [ "${nixpkgs}/nixos/modules/installer/scan/not-detected.nix" ]; }; diff --git a/hosts/azathoth/configuration.nix b/hosts/azathoth/configuration.nix deleted file mode 100644 index 2c85569c..00000000 --- a/hosts/azathoth/configuration.nix +++ /dev/null @@ -1,94 +0,0 @@ -# This is my desktop computer. -# -# It dual-boots Windows and NixOS. I don't bother backing up either OS: -# everything I care about is in Syncthing, on GitHub, or on some other cloud -# service (eg, Steam). -# -# **Alerting:** disabled -# -# **Backups:** disabled -# -# **Public hostname:** n/a -# -# **Role:** desktop -{ pkgs, ... }: -let - nfsShare = name: - { - device = "nyarlathotep:/${name}"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; -in -{ - # Bootloader - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # Enable memtest - boot.loader.systemd-boot.memtest86.enable = true; - - # Enable nvidia graphics - services.xserver.videoDrivers = [ "nvidia" ]; - hardware.opengl.driSupport32Bit = true; - - # Enable pulseaudio - hardware.pulseaudio.enable = true; - hardware.pulseaudio.support32Bit = true; - - # Nyarlathotep - fileSystems."/home/barrucadu/nfs/anime" = nfsShare "anime"; - fileSystems."/home/barrucadu/nfs/manga" = nfsShare "manga"; - fileSystems."/home/barrucadu/nfs/misc" = nfsShare "misc"; - fileSystems."/home/barrucadu/nfs/music" = nfsShare "music"; - fileSystems."/home/barrucadu/nfs/movies" = nfsShare "movies"; - fileSystems."/home/barrucadu/nfs/tv" = nfsShare "tv"; - fileSystems."/home/barrucadu/nfs/torrents" = nfsShare "torrents"; - - # Enable Xorg, to auto-login to herbstluftwm, with C-M-Bksp enabled. - services.xserver = { - enable = true; - enableCtrlAltBackspace = true; - displayManager.autoLogin.enable = true; - displayManager.autoLogin.user = "barrucadu"; - windowManager.herbstluftwm.enable = true; - }; - - # Sane font defaults - fonts = { - fontDir.enable = true; - enableGhostscriptFonts = true; - fontconfig.cache32Bit = true; - - packages = with pkgs; [ - terminus_font - source-code-pro - ]; - }; - - # Start the urxvtd user service - services.urxvtd.enable = true; - - # Extra packages - users.extraUsers.barrucadu.packages = with pkgs; [ - chromium - clementine - discord - emacs - evince - feh - firefox - gimp - gmrun - keepassxc - mpv - scrot - xclip - (texlive.combine { inherit (texlive) scheme-full; }) - ]; - - environment.systemPackages = with pkgs; [ - rxvt_unicode - rxvt_unicode.terminfo - ]; -} diff --git a/hosts/azathoth/hardware.nix b/hosts/azathoth/hardware.nix deleted file mode 100644 index e8260731..00000000 --- a/hosts/azathoth/hardware.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: - -{ - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/72914baa-abf0-4e3d-b8da-c8c3a3892d6c"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/DE82-191D"; - fsType = "vfat"; - }; - - swapDevices = [ ]; -} diff --git a/shared/default.nix b/shared/default.nix index e4668c18..5707ffca 100644 --- a/shared/default.nix +++ b/shared/default.nix @@ -297,7 +297,6 @@ in # Such pubkey! openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIP5QUiJZ9TX1/fNAAg4UdtSM4AnpIgdSp7FsH1s1mnz barrucadu@azathoth" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDGsbaoX0seFfMTXePyaQchxU3g58xFMUipZPvddCT8c azathoth-windows" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIWvwOx9opSKGomvq8C3u1SghmaGiv0yiMZUdql6nBDB barrucadu@nyarlathotep" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJVnNyKbBcHMY7Tcak07bL6svb/x8KXCL5WJRck9PaDI barrucadu@carcosa"