cleanup

systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix

@@ -1,59 +1,69 @@
 # 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, ... }:
+{
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [
+    "usb_storage"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "none";
-      fsType = "tmpfs";
-      options = [ "mode=755" ];
-    };
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [ "mode=755" ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E66E-1A03";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/E66E-1A03";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
-  fileSystems."/root" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
+  fileSystems."/root" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=root" ];
+  };
 
-  fileSystems."/etc" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=etc" ];
-    };
+  fileSystems."/etc" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=etc" ];
+  };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=nix" ];
+  };
 
-  fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=log" ];
-    };
+  fileSystems."/var/log" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=log" ];
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=home" ];
+  };
 
   swapDevices = [ ];
 

systems/aarch64-linux/pi4/default.nix

@@ -3,7 +3,6 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  config,
   lib,
   pkgs,
   namespace,
@@ -26,19 +25,6 @@ in
     hardware.disko.enable = true;
   };
 
-  nix = {
-    settings = {
-      substituters = [
-        "https://nixos-raspberrypi.cachix.org"
-        "https://cache.mjallen.dev"
-      ];
-      trusted-public-keys = [
-        "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
-        "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
-      ];
-    };
-  };
-
   # Configure nixpkgs
   nixpkgs = {
     overlays = lib.mkAfter [
@@ -53,20 +39,8 @@ in
       })
     ];
   };
-
-  programs.zsh.enable = true;
   hardware.i2c.enable = true;
 
-  services = {
-    openssh = {
-      enable = true;
-      authorizedKeysFiles = [
-        config.sops.secrets."ssh-keys-public/pi5".path
-      ];
-      hostKeys = [ ];
-    };
-  };
-
   systemd.services.btattach = {
     before = [ "bluetooth.service" ];
     after = [ "dev-ttyAMA0.device" ];

systems/aarch64-linux/pi5/default.nix

@@ -11,7 +11,7 @@
 }:
 let
   user = "matt";
-  password = config.sops.secrets."pi5/matt-password".path;
+  # password = config.sops.secrets."pi5/matt-password".path;
   kernelBundle = pkgs.linuxAndFirmware.latest;
 in
 {
@@ -30,20 +30,6 @@ in
     };
   };
 
-  # Enable nix flakes and nix-command tools
-  nix = {
-    settings = {
-      substituters = [
-        "https://nixos-raspberrypi.cachix.org"
-        # "https://cache.mjallen.dev"
-      ];
-      trusted-public-keys = [
-        "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
-        # "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
-      ];
-    };
-  };
-
   # Configure nixpkgs
   nixpkgs = {
     overlays = lib.mkAfter [
@@ -119,5 +105,9 @@ in
     users.root.shell = pkgs.zsh;
   };
 
+  programs = {
+    kdeconnect.enable = false;
+  };
+
   zramSwap.enable = true;
 }