diff --git a/flake.nix b/flake.nix index a7da813..af3d5f9 100644 --- a/flake.nix +++ b/flake.nix @@ -111,12 +111,6 @@ inputs.pvv-nettsiden.nixosModules.default ]; }; - bob = stableNixosConfig "bob" { - modules = [ - disko.nixosModules.disko - { disko.devices.disk.disk1.device = "/dev/vda"; } - ]; - }; ildkule = stableNixosConfig "ildkule" { }; #ildkule-unstable = unstableNixosConfig "ildkule" { }; shark = stableNixosConfig "shark" { }; diff --git a/hosts/bob/configuration.nix b/hosts/bob/configuration.nix deleted file mode 100644 index 8b36198..0000000 --- a/hosts/bob/configuration.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, fp, pkgs, values, ... }: -{ - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - (fp /base) - (fp /misc/metrics-exporters.nix) - ./disks.nix - - (fp /misc/builder.nix) - ]; - - sops.defaultSopsFile = fp /secrets/bob/bob.yaml; - sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - sops.age.keyFile = "/var/lib/sops-nix/key.txt"; - sops.age.generateKey = true; - - boot.loader.grub = { - enable = true; - efiSupport = true; - efiInstallAsRemovable = true; - }; - - networking.hostName = "bob"; # Define your hostname. - - systemd.network.networks."30-all" = values.defaultNetworkConfig // { - matchConfig.Name = "en*"; - DHCP = "yes"; - gateway = [ ]; - }; - - # List packages installed in system profile - environment.systemPackages = with pkgs; [ - ]; - - # List services that you want to enable: - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? - -} diff --git a/hosts/bob/disks.nix b/hosts/bob/disks.nix deleted file mode 100644 index b2271dd..0000000 --- a/hosts/bob/disks.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Example to create a bios compatible gpt partition -{ lib, ... }: -{ - disko.devices = { - disk.disk1 = { - device = lib.mkDefault "/dev/sda"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - }; - esp = { - name = "ESP"; - size = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/bob/hardware-configuration.nix b/hosts/bob/hardware-configuration.nix deleted file mode 100644 index a97a3c3..0000000 --- a/hosts/bob/hardware-configuration.nix +++ /dev/null @@ -1,24 +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 + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_blk" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - # 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.ens3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/values.nix b/values.nix index 0aef80a..9eab664 100644 --- a/values.nix +++ b/values.nix @@ -41,10 +41,6 @@ in rec { ipv4 = pvv-ipv4 209; ipv6 = pvv-ipv6 209; }; - bob = { - ipv4 = "129.241.152.254"; - # ipv6 = ; - }; knutsen = { ipv4 = pvv-ipv4 191; };