From b5796b3c2383b55dae18786e319b5c53ce5e5e53 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 23 Jan 2025 18:06:38 -0500 Subject: [PATCH] try to fix everything --- flake.nix | 1 - hosts/common.nix | 2 -- hosts/pancake/default.nix | 3 +-- hosts/pancake/disk-config.nix | 33 --------------------------------- 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 hosts/pancake/disk-config.nix diff --git a/flake.nix b/flake.nix index e76442f..d36eb5c 100644 --- a/flake.nix +++ b/flake.nix @@ -210,7 +210,6 @@ { nixpkgs.pkgs = pkgsFor "aarch64-linux"; } - disko.nixosModules.disko inputs.nixos-hardware.nixosModules.raspberry-pi-3 ./hosts/pancake ./modules diff --git a/hosts/common.nix b/hosts/common.nix index 2e8b31a..5303739 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -9,8 +9,6 @@ "root" "@wheel" ]; - trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" ]; - substituters = [ "https://cache.cything.io/central" ]; }; channel.enable = false; optimise = { diff --git a/hosts/pancake/default.nix b/hosts/pancake/default.nix index ae3145e..628d171 100644 --- a/hosts/pancake/default.nix +++ b/hosts/pancake/default.nix @@ -8,8 +8,8 @@ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/profiles/qemu-guest.nix") ../common.nix - ./disk-config.nix ./hardware-configuration.nix + ../zsh.nix ]; services.openssh = { @@ -31,7 +31,6 @@ # network stuff networking.hostName = "pancake"; - networking.networkmanager.enable = true; networking.firewall = { enable = true; allowedTCPPorts = [ diff --git a/hosts/pancake/disk-config.nix b/hosts/pancake/disk-config.nix deleted file mode 100644 index 1d3855b..0000000 --- a/hosts/pancake/disk-config.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - disko.devices = { - disk = { - main = { - device = "/dev/mmcblk0"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "500M"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -}