treewide: minor cleanups

home/programs/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   imports = [
     ./browsers
     ./media

home/programs/editors/helix.nix

@@ -2,9 +2,7 @@
   lib,
   pkgs,
   ...
-}: let
+}: {
-  inherit (lib) getExe;
-in {
   programs.helix = {
     enable = true;
     settings = {

home/services/udiskie.nix

@@ -1,3 +1,3 @@
-_: {
+{
   services.udiskie.enable = true;
 }

home/terminal/emulators/konsole.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   config,
   inputs,
   pkgs,

home/terminal/emulators/wezterm.nix

@@ -1,4 +1,4 @@
-_: {
+{
   programs.wezterm = {
     enable = true;
     # package = inputs.wezterm.packages.${pkgs.system}.default;

home/terminal/programs/direnv.nix

@@ -1,4 +1,4 @@
-_: {
+{
   programs = {
     direnv = {
       enable = true;

home/terminal/programs/zellij.nix

@@ -1,4 +1,4 @@
-_: {
+{
   programs.zellij = {
     enable = true;
     settings = {

home/terminal/shell/starship.nix

@@ -1,4 +1,4 @@
-_: {
+{
   programs.starship = {
     enable = true;
     enableTransience = true;

home/terminal/shell/zoxide.nix

@@ -1,4 +1,4 @@
-_: {
+{
   programs.zoxide = {
     enable = true;
     enableBashIntegration = false;

hosts/anastacia/hardware-configuration.nix

@@ -1,8 +1,10 @@
 {modulesPath, ...}: {
   imports = [(modulesPath + "/profiles/qemu-guest.nix")];
-  boot.loader.grub.device = "/dev/sda";
+  boot = {
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
+    loader.grub.device = "/dev/sda";
-  boot.initrd.kernelModules = ["nvme"];
+    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
+    initrd.kernelModules = ["nvme"];
+  };
   fileSystems."/" = {
     device = "/dev/sda1";
     fsType = "ext4";

system/nix/nixpkgs.nix

@@ -1,4 +1,4 @@
-_: {
+{
   nixpkgs = {
     config = {
       allowUnfree = true;

system/programs/games.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   programs = {
     steam.enable = true;
     gamemode.enable = true;

system/services/default.nix

@@ -1,13 +1,9 @@
-{
+{pkgs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   imports = [
     ./docker.nix
     ./gnupg.nix
     ./pipewire.nix
     ./kmscon.nix
   ];
-  services.udev.packages = [pkgs.segger-jlink inputs.self.packages.${pkgs.system}.mcuxpresso.ide];
+  services.udev.packages = [pkgs.segger-jlink];
 }

system/services/kanata.nix

@@ -1,4 +1,4 @@
-_: {
+{
   services.kanata = {
     enable = true;
     keyboards.default = {

system/services/pipewire.nix

@@ -1,4 +1,4 @@
-_: {
+{
   hardware.pulseaudio.enable = false;
   # rtkit is optional but recommended
   security.rtkit.enable = true;