diff --git a/flake.nix b/flake.nix index 484a850..1a9088b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,6 @@ hosts.url = "github:StevenBlack/hosts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; - onelink.url = "github:Sigmanificient/1l.is"; - nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -25,7 +23,6 @@ , nix-index-database , nixos-hardware , home-manager - , onelink , hosts , ecsls , ... @@ -82,34 +79,6 @@ nixos-hardware.nixosModules.common-pc-ssd ]; }; - - Sigmachine = nixpkgs.lib.nixosSystem { - inherit system; - - specialArgs = { - inherit username; - hostname = "Sigmachine"; - }; - - modules = default_modules ++ [ - ./hardware/sigmachine.nix - ./config/sigmachine.nix - ]; - }; - - Server = nixpkgs.lib.nixosSystem { - inherit system; - - modules = [ - onelink.nixosModules.${system}.default - { - services.onelink.enable = true; - } - - ./server/configuration.nix - ./server/hardware-configuration.nix - ]; - }; }; }; } diff --git a/hardware/sigmachine.nix b/hardware/sigmachine.nix deleted file mode 100644 index c1b9835..0000000 --- a/hardware/sigmachine.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, lib, modulesPath, ... }: -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - initrd = { - kernelModules = [ ]; - availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - }; - - extraModulePackages = [ ]; - kernelModules = [ "kvm-intel" ]; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/2c4e0428-4dbb-4e7d-a2ba-27dfc7f72762"; - fsType = "ext4"; - }; - - "/data" = { - device = "/dev/disk/by-uuid/58799c4d-2c8c-4f26-8ee4-1c8ceb796705"; - fsType = "ext4"; - }; - - "/boot" = { - device = "/dev/disk/by-uuid/6838-4F6B"; - fsType = "vfat"; - }; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/41b9c6d5-5ac9-4549-b510-8249ec7c3be8"; } - ]; - - networking.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/server/configuration.nix b/server/configuration.nix deleted file mode 100644 index a6f641e..0000000 --- a/server/configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ... }: { - imports = [ - ./hardware-configuration.nix - ]; - - boot.cleanTmpDir = true; - zramSwap.enable = true; - networking.hostName = "SigServer"; - - networking.domain = ""; - - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKVVrEl8ssTf4GcObE4MVlKRlzI3Ok7NX3unSv+TPrLG edhyjox@gmail.com'' - ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMEIMRXQMnaP08FgRGXEpgX9oDADom5h+xjAnEgLNCXF clement2104.boillot@gmail.com'' - ]; -} - diff --git a/server/hardware-configuration.nix b/server/hardware-configuration.nix deleted file mode 100644 index 09ef69f..0000000 --- a/server/hardware-configuration.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ modulesPath, ... }: -{ - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; - boot.initrd.kernelModules = [ "nvme" ]; - - fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; -}