foot, vintage fonts, scope operator

hosts/adrift/boot.nix

@@ -1,6 +1,6 @@
-{ ... }:
-{
-  boot.kernelParams = [
+{ scope, ... }:
+scope "boot" {
+  kernelParams = [
     "mitigations=off"
     "quiet"
     "loglevel=3"
@@ -8,18 +8,18 @@
     "rd.udev.log_level=3"
     "vt.global_cursor_default=0"
   ];
-  boot.initrd.availableKernelModules = [
+  initrd.availableKernelModules = [
     "xhci_pci"
     "nvme"
     "usb_storage"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [
+  initrd.kernelModules = [ "dm-snapshot" ];
+  kernelModules = [
     "iwlwifi"
     "kvm-intel"
   ];
-  boot.loader.systemd-boot.configurationLimit = 2;
-  boot.loader.efi.canTouchEfiVariables = true;
+  loader.systemd-boot.configurationLimit = 2;
+  loader.efi.canTouchEfiVariables = true;
 }

hosts/adrift/fs.nix

@@ -1,18 +1,19 @@
-{ ... }:
-{
+_: {
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/1C5C-8FF4";
-    fsType = "vfat";
-  };
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/1C5C-8FF4";
+      fsType = "vfat";
+    };
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/26389642-cf51-4c58-98e9-1fe491a11bb9";
-    fsType = "ext4";
+    "/" = {
+      device = "/dev/disk/by-uuid/26389642-cf51-4c58-98e9-1fe491a11bb9";
+      fsType = "ext4";
+    };
   };
 
   swapDevices = [
     { device = "/dev/disk/by-uuid/a732641d-1233-45a7-8614-53caed60f11b"; }
   ];
-	
+
 }

hosts/quiver/boot.nix

@@ -1,19 +1,19 @@
-{ config, ... }:
-{
-  boot.initrd.availableKernelModules = [
+{ scope, ... }:
+scope "boot" {
+  initrd.availableKernelModules = [
     "xhci_pci"
     "ahci"
     "usbcore"
     "sd_mod"
   ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.verbose = false;
-  boot.kernelModules = [
+  initrd.kernelModules = [ ];
+  initrd.verbose = false;
+  kernelModules = [
     "kvm-amd"
     "i2c-dev"
   ];
-  boot.consoleLogLevel = 0;
-  boot.kernelParams = [
+  consoleLogLevel = 0;
+  kernelParams = [
     "mitigations=off"
     "preempt=full"
     "quiet"
@@ -22,18 +22,18 @@
     "rd.udev.log_level=3"
     "vt.global_cursor_default=0"
   ];
-  boot.supportedFilesystems = {
+  supportedFilesystems = {
     ntfs = true;
     btrfs = true;
   };
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.plymouth = {
+  loader.efi.canTouchEfiVariables = true;
+  plymouth = {
     enable = true;
     # theme needs fixing
     # inherit (config.rice.plymouth) theme themePackages font;
   };
 
-  boot.loader.limine.extraEntries = ''
+  loader.limine.extraEntries = ''
     /Windows
       protocol: efi
       path: boot():/EFI/Microsoft/Boot/bootmgfw.efi

hosts/quiver/fs.nix

@@ -1,5 +1,4 @@
-{ ... }:
-{
+_: {
 
   fileSystems = {
     "/" = {

hosts/quiver/llm.nix

@@ -1,11 +1,16 @@
-{ inputs, config, ... }:
 {
-  services.ollama = {
+  inputs,
+  config,
+  scope,
+  ...
+}:
+scope "services" {
+  ollama = {
     enable = true;
     user = "ollama";
   };
 
-  services.open-webui = {
+  open-webui = {
     package = inputs.nixpkgs-stable.legacyPackages.x86_64-linux.open-webui;
     enable = true;
     port = 8088;

hosts/quiver/outputs.nix

@@ -1,14 +1,11 @@
-{ ... }:
-{
-  hm.programs.niri.settings.outputs = {
-    "DP-1" = {
-      transform.rotation = 90;
-      scale = 1;
-    };
-    "DP-2" = {
-      variable-refresh-rate = true;
-      scale = 1;
-    };
+{ scope, ... }:
+scope "hm.programs.niri.settings.outputs" {
+  "DP-1" = {
+    transform.rotation = 90;
+    scale = 1;
+  };
+  "DP-2" = {
+    variable-refresh-rate = true;
+    scale = 1;
   };
-
 }