From c37edb347c5dabd8b929b4230346d595db47890c Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Wed, 6 Nov 2024 16:49:58 +0100
Subject: [PATCH] treewide: minor cleanups

---
 home/programs/default.nix                  | 6 +-----
 home/programs/editors/helix.nix            | 4 +---
 home/services/udiskie.nix                  | 2 +-
 home/terminal/emulators/konsole.nix        | 1 -
 home/terminal/emulators/wezterm.nix        | 2 +-
 home/terminal/programs/direnv.nix          | 2 +-
 home/terminal/programs/zellij.nix          | 2 +-
 home/terminal/shell/starship.nix           | 2 +-
 home/terminal/shell/zoxide.nix             | 2 +-
 hosts/anastacia/hardware-configuration.nix | 8 +++++---
 system/nix/nixpkgs.nix                     | 2 +-
 system/programs/games.nix                  | 2 +-
 system/services/default.nix                | 8 ++------
 system/services/kanata.nix                 | 2 +-
 system/services/pipewire.nix               | 2 +-
 15 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/home/programs/default.nix b/home/programs/default.nix
index cc3940e..6113a58 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./browsers
     ./media
diff --git a/home/programs/editors/helix.nix b/home/programs/editors/helix.nix
index 59d2fba..b8f9887 100644
--- a/home/programs/editors/helix.nix
+++ b/home/programs/editors/helix.nix
@@ -2,9 +2,7 @@
   lib,
   pkgs,
   ...
-}: let
-  inherit (lib) getExe;
-in {
+}: {
   programs.helix = {
     enable = true;
     settings = {
diff --git a/home/services/udiskie.nix b/home/services/udiskie.nix
index 08a5850..f3ea3b8 100644
--- a/home/services/udiskie.nix
+++ b/home/services/udiskie.nix
@@ -1,3 +1,3 @@
-_: {
+{
   services.udiskie.enable = true;
 }
diff --git a/home/terminal/emulators/konsole.nix b/home/terminal/emulators/konsole.nix
index 6847b16..cbe8d8e 100644
--- a/home/terminal/emulators/konsole.nix
+++ b/home/terminal/emulators/konsole.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   config,
   inputs,
   pkgs,
diff --git a/home/terminal/emulators/wezterm.nix b/home/terminal/emulators/wezterm.nix
index 1617433..70631f1 100644
--- a/home/terminal/emulators/wezterm.nix
+++ b/home/terminal/emulators/wezterm.nix
@@ -1,4 +1,4 @@
-_: {
+{
   programs.wezterm = {
     enable = true;
     # package = inputs.wezterm.packages.${pkgs.system}.default;
diff --git a/home/terminal/programs/direnv.nix b/home/terminal/programs/direnv.nix
index eb5f442..bf4e94e 100644
--- a/home/terminal/programs/direnv.nix
+++ b/home/terminal/programs/direnv.nix
@@ -1,4 +1,4 @@
-_: {
+{
   programs = {
     direnv = {
       enable = true;
diff --git a/home/terminal/programs/zellij.nix b/home/terminal/programs/zellij.nix
index 5e264ef..c2199c3 100644
--- a/home/terminal/programs/zellij.nix
+++ b/home/terminal/programs/zellij.nix
@@ -1,4 +1,4 @@
-_: {
+{
   programs.zellij = {
     enable = true;
     settings = {
diff --git a/home/terminal/shell/starship.nix b/home/terminal/shell/starship.nix
index b8a543e..fc95e4e 100644
--- a/home/terminal/shell/starship.nix
+++ b/home/terminal/shell/starship.nix
@@ -1,4 +1,4 @@
-_: {
+{
   programs.starship = {
     enable = true;
     enableTransience = true;
diff --git a/home/terminal/shell/zoxide.nix b/home/terminal/shell/zoxide.nix
index d083624..6317ebe 100644
--- a/home/terminal/shell/zoxide.nix
+++ b/home/terminal/shell/zoxide.nix
@@ -1,4 +1,4 @@
-_: {
+{
   programs.zoxide = {
     enable = true;
     enableBashIntegration = false;
diff --git a/hosts/anastacia/hardware-configuration.nix b/hosts/anastacia/hardware-configuration.nix
index 329ed8a..702b3d0 100644
--- a/hosts/anastacia/hardware-configuration.nix
+++ b/hosts/anastacia/hardware-configuration.nix
@@ -1,8 +1,10 @@
 {modulesPath, ...}: {
   imports = [(modulesPath + "/profiles/qemu-guest.nix")];
-  boot.loader.grub.device = "/dev/sda";
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
-  boot.initrd.kernelModules = ["nvme"];
+  boot = {
+    loader.grub.device = "/dev/sda";
+    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
+    initrd.kernelModules = ["nvme"];
+  };
   fileSystems."/" = {
     device = "/dev/sda1";
     fsType = "ext4";
diff --git a/system/nix/nixpkgs.nix b/system/nix/nixpkgs.nix
index e47634f..25a9f7a 100644
--- a/system/nix/nixpkgs.nix
+++ b/system/nix/nixpkgs.nix
@@ -1,4 +1,4 @@
-_: {
+{
   nixpkgs = {
     config = {
       allowUnfree = true;
diff --git a/system/programs/games.nix b/system/programs/games.nix
index 9610082..a5010fc 100644
--- a/system/programs/games.nix
+++ b/system/programs/games.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   programs = {
     steam.enable = true;
     gamemode.enable = true;
diff --git a/system/services/default.nix b/system/services/default.nix
index 9c1bc5f..b12c274 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -1,13 +1,9 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{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];
 }
diff --git a/system/services/kanata.nix b/system/services/kanata.nix
index c8a42d9..35b84e2 100644
--- a/system/services/kanata.nix
+++ b/system/services/kanata.nix
@@ -1,4 +1,4 @@
-_: {
+{
   services.kanata = {
     enable = true;
     keyboards.default = {
diff --git a/system/services/pipewire.nix b/system/services/pipewire.nix
index 9a9a78d..fa42d5a 100644
--- a/system/services/pipewire.nix
+++ b/system/services/pipewire.nix
@@ -1,4 +1,4 @@
-_: {
+{
   hardware.pulseaudio.enable = false;
   # rtkit is optional but recommended
   security.rtkit.enable = true;