diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 4dfde72..16c4b23 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -34,8 +34,6 @@ "100.64.0.1" = [ "elnu" ]; "100.64.0.2" = [ "elnuhub" ]; "100.64.0.3" = [ "elnudrop" ]; - "100.64.0.4" = [ "pang13" ]; - "100.64.0.5" = [ "elnucentre" ]; }; }; diff --git a/hosts/default.nix b/hosts/default.nix index 77425f8..bacc4f3 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -167,28 +167,4 @@ in } ]; }; - - elnucentre = lib.nixosSystem { - inherit system; - specialArgs = { - inherit user; - }; - modules = configImports ++ [ - ./elnucentre - { - networking.hostName = "elnucentre"; - } - home-manager.nixosModules.home-manager { - home-manager = { - useUserPackages = true; - extraSpecialArgs = { inherit user; }; - users.${user} = { - imports = hmImports ++ [ - (import ./elnucentre/home.nix) - ]; - }; - }; - } - ]; - }; } diff --git a/hosts/elnucentre/default.nix b/hosts/elnucentre/default.nix deleted file mode 100644 index 790f5cc..0000000 --- a/hosts/elnucentre/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, ... }: - -{ - imports = [ - ./hardware-configuration.nix - ./modules/ssh.nix - ]; - - services.tailscale.enable = true; - networking.firewall = { - checkReversePath = "loose"; - trustedInterfaces = [ "tailscale0" ]; - allowedUDPPorts = [ config.services.tailscale.port ]; - }; - - boot.loader = { - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - grub = { - efiSupport = true; - device = "nodev"; - }; - }; -} diff --git a/hosts/elnucentre/hardware-configuration.nix b/hosts/elnucentre/hardware-configuration.nix deleted file mode 100644 index 74d369c..0000000 --- a/hosts/elnucentre/hardware-configuration.nix +++ /dev/null @@ -1,38 +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" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-label/boot"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - # 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.eno1.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/elnucentre/home.nix b/hosts/elnucentre/home.nix deleted file mode 100644 index 77b08f8..0000000 --- a/hosts/elnucentre/home.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../../modules/bash - ../../modules/neovim - ]; - # Disable greeter, which is getting run twice somehow - programs.bash = with import ../../modules/bash/bashrc.nix; { - bashrcExtra = lib.mkForce bashrcExtra; - profileExtra = greeter; - }; -} diff --git a/hosts/elnucentre/modules/ssh.nix b/hosts/elnucentre/modules/ssh.nix deleted file mode 100644 index 834319e..0000000 --- a/hosts/elnucentre/modules/ssh.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ user, ... }: - -let keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEQNlGt62dBMojVCX7EUIia+wfSDfLzV4YCPi8SZ2xrp elnu@elnu.com" # elnu - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH62YpVC8GaZXE8CHfyl1yAXXdlUSGNkyE95whYdUpct elnu@elnu.com" # pang13 -]; in -{ - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = keys; - users.users.${user}.openssh.authorizedKeys.keys = keys; -} \ No newline at end of file diff --git a/hosts/home-desktop.nix b/hosts/home-desktop.nix index 35c9b48..5171238 100644 --- a/hosts/home-desktop.nix +++ b/hosts/home-desktop.nix @@ -10,6 +10,7 @@ in #../modules/emacs ../modules/fcitx5 ../modules/firefox + ../modules/git ../modules/i3 ../modules/neovim ../modules/picom diff --git a/hosts/home.nix b/hosts/home.nix index 64ab75a..4090a4b 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -1,10 +1,6 @@ { user, ... }: { - imports = [ - ../modules/git - ]; - home = { username = "${user}"; homeDirectory = "/home/${user}"; @@ -14,4 +10,4 @@ stateVersion = "22.05"; }; -} +} \ No newline at end of file