diff --git a/machines/configuration.nix b/machines/configuration.nix index 05d5c4ab..4509ea85 100644 --- a/machines/configuration.nix +++ b/machines/configuration.nix @@ -42,14 +42,6 @@ let defaultModules = baseModules; in { - moderatio = nixosSystem { - system = "x86_64-linux"; - specialArgs.inputs = inputs; - modules = defaultModules ++ [ - ./moderatio/configuration.nix - ]; - }; - louise = nixosSystem { system = "x86_64-linux"; specialArgs.inputs = inputs; diff --git a/machines/moderatio/configuration.nix b/machines/moderatio/configuration.nix deleted file mode 100644 index 47b9fe15..00000000 --- a/machines/moderatio/configuration.nix +++ /dev/null @@ -1,92 +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, ... }: - -{ - services.acpid.enable = true; - - boot.kernelPackages = pkgs.linuxPackages_5_4; - services.xserver.videoDrivers = [ "intel" ]; - services.xserver.deviceSection = '' - Option "DRI" "2" - Option "TearFree" "true" - ''; - - zramSwap.enable = true; - zramSwap.memoryPercent = 150; - - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./zfs.nix - - ../modules/xserver.nix - ../modules/malobeo_user.nix - ../modules/sshd.nix - ../modules/minimal_tools.nix - ]; - - users.users.malobeo = { - packages = with pkgs; [ - firefox - thunderbird - ]; - }; - - networking.hostName = "moderatio"; # Define your hostname. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkbOptions in tty. - # }; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # 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 = "22.05"; # Did you read the comment? - -} - diff --git a/machines/moderatio/hardware-configuration.nix b/machines/moderatio/hardware-configuration.nix deleted file mode 100644 index 5ca60753..00000000 --- a/machines/moderatio/hardware-configuration.nix +++ /dev/null @@ -1,53 +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 = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "ums_realtek" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "rpool/nixos/root"; - fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ]; - }; - - fileSystems."/home" = - { device = "rpool/nixos/home"; - fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ]; - }; - - fileSystems."/boot" = - { device = "bpool/nixos/root"; - fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ]; - }; - - fileSystems."/boot/efis/ata-ST250LT003-9YG14C_W041QXCA-part1" = - { device = "/dev/disk/by-uuid/A0D1-00C1"; - fsType = "vfat"; - }; - - fileSystems."/boot/efi" = - { device = "/boot/efis/ata-ST250LT003-9YG14C_W041QXCA-part1"; - fsType = "none"; - options = [ "bind" ]; - }; - - 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.enp1s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/machines/moderatio/zfs.nix b/machines/moderatio/zfs.nix deleted file mode 100644 index db62d0a4..00000000 --- a/machines/moderatio/zfs.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, pkgs, ... }: - -{ boot.supportedFilesystems = [ "zfs" ]; - networking.hostId = "ae749b82"; - #boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; -boot.loader.efi.efiSysMountPoint = "/boot/efi"; -boot.loader.efi.canTouchEfiVariables = false; -boot.loader.generationsDir.copyKernels = true; -boot.loader.grub.efiInstallAsRemovable = true; -boot.loader.grub.enable = true; -boot.loader.grub.copyKernels = true; -boot.loader.grub.efiSupport = true; -boot.loader.grub.zfsSupport = true; -boot.loader.grub.extraPrepareConfig = '' - mkdir -p /boot/efis - for i in /boot/efis/*; do mount $i ; done - - mkdir -p /boot/efi - mount /boot/efi -''; -boot.loader.grub.extraInstallCommands = '' -ESP_MIRROR=$(mktemp -d) -cp -r /boot/efi/EFI $ESP_MIRROR -for i in /boot/efis/*; do - cp -r $ESP_MIRROR/EFI $i -done -rm -rf $ESP_MIRROR -''; -boot.loader.grub.devices = [ - "/dev/disk/by-id/ata-ST250LT003-9YG14C_W041QXCA" - ]; -users.users.root.initialHashedPassword = "$6$PmoyhSlGGT6SI0t0$.cFsLyhtO1ks1LUDhLjG0vT44/NjuWCBrv5vUSXqwrU5WpaBvvthnLp0Dfwfyd6Zcdx/4izDcjQAgEWs4QdzW0"; -}