From 1bd9b02d8f77e9cc0474fe697be37df987878483 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 21 Oct 2023 08:46:28 +0100 Subject: [PATCH] Remove unused system configs --- flake.nix | 6 ---- hosts/Monarch/home.nix | 17 ---------- hosts/Scorch/configuration.nix | 20 ------------ hosts/Scorch/hardware-configuration.nix | 42 ------------------------- hosts/Scorch/home.nix | 19 ----------- services/syncthing/default.nix | 4 +-- 6 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 hosts/Monarch/home.nix delete mode 100644 hosts/Scorch/configuration.nix delete mode 100644 hosts/Scorch/hardware-configuration.nix delete mode 100644 hosts/Scorch/home.nix diff --git a/flake.nix b/flake.nix index cfc3052e..c9acef5d 100644 --- a/flake.nix +++ b/flake.nix @@ -259,12 +259,6 @@ system = "x86_64-linux"; in systemConfig { inherit hostName user system; }; - Scorch = let - hostName = "Scorch"; - user = "elitherl"; - system = "x86_64-linux"; - in systemConfig { inherit hostName user system; }; - Vanguard = let hostName = "Vanguard"; user = "xenia"; diff --git a/hosts/Monarch/home.nix b/hosts/Monarch/home.nix deleted file mode 100644 index 6b541bab..00000000 --- a/hosts/Monarch/home.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, pkgs, ... }: - -{ - home = { - homeDirectory = "/Users/${config.home.username}"; - packages = with pkgs; [ coreutils-prefixed ]; - }; - programs = { - zsh = { - sessionVariables.CC = "${pkgs.gcc}/bin/gcc"; - envExtra = '' - eval "$(/opt/homebrew/bin/brew shellenv)" - ''; - }; - emacs.package = pkgs.emacs29; - }; -} diff --git a/hosts/Scorch/configuration.nix b/hosts/Scorch/configuration.nix deleted file mode 100644 index e07b6562..00000000 --- a/hosts/Scorch/configuration.nix +++ /dev/null @@ -1,20 +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, ... }: - -{ - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - - # Setup keyfile - boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; - - # Enable swap on luks - boot.initrd.luks.devices."luks-47d34268-5100-4eba-b34d-220f4239c1cb".device = - "/dev/disk/by-uuid/47d34268-5100-4eba-b34d-220f4239c1cb"; - boot.initrd.luks.devices."luks-47d34268-5100-4eba-b34d-220f4239c1cb".keyFile = - "/crypto_keyfile.bin"; - - services.syncthing.settings.folders = { "Pictures".enable = false; }; -} diff --git a/hosts/Scorch/hardware-configuration.nix b/hosts/Scorch/hardware-configuration.nix deleted file mode 100644 index 49a4b082..00000000 --- a/hosts/Scorch/hardware-configuration.nix +++ /dev/null @@ -1,42 +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, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/0c6931d0-50c3-47b0-98c8-d295ddeb2004"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-08822b9c-e9d6-424c-bc75-373f8667526d".device = - "/dev/disk/by-uuid/08822b9c-e9d6-424c-bc75-373f8667526d"; - - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/6009-89FC"; - fsType = "vfat"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/ff9627a7-820c-4628-a040-2b665688b893"; }]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/Scorch/home.nix b/hosts/Scorch/home.nix deleted file mode 100644 index 691540ad..00000000 --- a/hosts/Scorch/home.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - programs = { - git.userEmail = "evie.litherland-smith@ukaea.uk"; - firefox.profiles.default.settings."browser.startup.homepage" = - "https://nucleus.ukaea.uk"; - }; - services.vdirsyncer.enable = lib.mkForce false; # TEMP until fixed - xdg.configFile."hypr/extra.conf".text = '' - misc { - disable_hyprland_logo = true - disable_splash_rendering = true - } - - monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x190,1 - monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1 - ''; -} diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix index 5996394d..b9134f96 100644 --- a/services/syncthing/default.nix +++ b/services/syncthing/default.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, user, ... }: -let devices = [ "Ion" "Legion" "Northstar" "Ronin" "Scorch" "Vanguard" ]; +let devices = [ "Ion" "Legion" "Northstar" "Ronin" "Vanguard" ]; in { services.syncthing = { inherit user; @@ -18,8 +18,6 @@ in { "HNK5Z72-757G3BP-I4PBWXY-FM5FWCM-ES4XP56-E5ULWB5-RGRCBUI-RHWRXQV"; "Ronin".id = "ZOL5YHK-ZZZULIE-UHGVKHW-H5E4BP7-S4CZBOX-OIZVUCV-RZUXOKA-QVBUBAJ"; - "Scorch".id = - "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF"; "Vanguard".id = "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK"; };