From 44ece1a06c96ae556e8f691d754dcf5a559db9ff Mon Sep 17 00:00:00 2001 From: Kalle Struik Date: Tue, 4 Feb 2025 05:59:05 +0100 Subject: [PATCH] Make template a full-ish system again, since otherwise there are issues --- systems/template/configuration.nix | 73 ++---------------------------- 1 file changed, 3 insertions(+), 70 deletions(-) diff --git a/systems/template/configuration.nix b/systems/template/configuration.nix index 76cf1ed..982ac98 100644 --- a/systems/template/configuration.nix +++ b/systems/template/configuration.nix @@ -1,50 +1,19 @@ { inputs, - modulesPath, ... }: { nixpkgs.hostPlatform = "x86_64-linux"; imports = [ - (modulesPath + "/profiles/qemu-guest.nix") + ./../base/configuration.nix + inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence ]; - time.timeZone = "Europe/Amsterdam"; - i18n.defaultLocale = "en_US.UTF-8"; networking.hostName = "nixos-template"; networking.dhcpcd.enable = false; networking.useNetworkd = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - services.qemuGuest.enable = true; - - nix.settings.trusted-users = [ - "root" - "@wheel" - ]; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - users.users."maintenance" = { - isNormalUser = true; - group = "maintenance"; - extraGroups = [ "wheel" ]; - password = "1234"; - openssh.authorizedKeys.keyFiles = [ ../../authorized_keys ]; - }; - users.groups."maintenance" = { }; - security.sudo.wheelNeedsPassword = false; - services.openssh = { - enable = true; - settings.PasswordAuthentication = false; - settings.KbdInteractiveAuthentication = false; - }; - programs.ssh.startAgent = true; - services.cloud-init = { enable = true; network.enable = true; @@ -70,41 +39,5 @@ - btrfs filesystem resize max /nix ''; }; - - boot.supportedFilesystems = [ "btrfs" ]; - fileSystems = { - "/" = { - device = "none"; - fsType = "tmpfs"; - options = [ - "defaults" - "mode=755" - ]; - }; - "/boot" = { - device = "/dev/disk/by-label/boot"; - fsType = "vfat"; - }; - "/nix" = { - device = "/dev/disk/by-label/btrfs"; - fsType = "btrfs"; - options = [ - "compress=zstd" - "subvol=nix" - "noatime" - ]; - }; - "/persistent" = { - device = "/dev/disk/by-label/btrfs"; - fsType = "btrfs"; - options = [ - "compress=zstd" - "subvol=persistent" - "noatime" - ]; - autoResize = true; - neededForBoot = true; - }; - }; - + system.stateVersion = "24.05"; }