From 2411c0b496867674edf95b62fc1cbc73a6788134 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Tue, 8 Jul 2025 13:57:04 +0200 Subject: [PATCH] chore: apply lints --- hosts/default.nix | 2 +- hosts/hermit/configuration.nix | 18 ++++++++++-------- hosts/temperance/hardware-configuration.nix | 10 ++++++---- hosts/temperance/kernel/xanmod.nix | 2 +- hosts/tower/hardware-configuration.nix | 10 ++++++---- modules/packages/hardware.nix | 3 +-- modules/programs/gui/fuzzel/module.nix | 3 +-- modules/programs/gui/ghostty/module.nix | 2 +- modules/services/grafana/module.nix | 2 +- modules/services/kanata/module.nix | 19 ++++++------------- modules/system/boot/module.nix | 4 ++-- modules/system/hardware/cpu/amd.nix | 0 modules/system/hardware/wifi.nix | 0 modules/system/os/networking/firewall.nix | 3 +-- modules/wms/wayland/sway/module.nix | 3 +-- packages/fish/fishinit.nix | 8 ++++---- 16 files changed, 42 insertions(+), 47 deletions(-) delete mode 100644 modules/system/hardware/cpu/amd.nix delete mode 100644 modules/system/hardware/wifi.nix diff --git a/hosts/default.nix b/hosts/default.nix index 3a02583..001e1b0 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -23,7 +23,7 @@ inputs: let inherit inputs; inherit self; } - (args.specialArgs or {}); + args.specialArgs or {}; modules = concatLists [ # This is used to pre-emptively set the hostPlatform for nixpkgs. # Also, we set the system hostname here. diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 02918a5..a311672 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -9,21 +9,23 @@ i18n.defaultLocale = "en_US.UTF-8"; console.keyMap = "uk"; security.polkit.enable = true; - programs.nix-ld.enable = false; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; services = { fstrim.enable = lib.mkDefault true; thermald.enable = true; }; - programs.zsh = { - enable = true; - enableBashCompletion = true; + programs = { + nix-ld.enable = false; + zsh = { + enable = true; + enableBashCompletion = true; + }; + gnupg.agent = { + enable = true; + pinentryPackage = pkgs.pinentry-qt; + }; }; - programs.gnupg.agent = { - enable = true; - pinentryPackage = pkgs.pinentry-qt; - }; modules = { wms.wayland.enable = true; desktops.hyprland.enable = false; diff --git a/hosts/temperance/hardware-configuration.nix b/hosts/temperance/hardware-configuration.nix index e30e94e..0720ed8 100644 --- a/hosts/temperance/hardware-configuration.nix +++ b/hosts/temperance/hardware-configuration.nix @@ -6,10 +6,12 @@ }: { imports = [(modulesPath + "/installer/scan/not-detected.nix")]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot = { + initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"]; + initrd.kernelModules = []; + kernelModules = []; + extraModulePackages = []; + }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/temperance/kernel/xanmod.nix b/hosts/temperance/kernel/xanmod.nix index d366252..68954d5 100644 --- a/hosts/temperance/kernel/xanmod.nix +++ b/hosts/temperance/kernel/xanmod.nix @@ -60,7 +60,7 @@ # 1:1 taken from raf's custom kernel, check out his config for this. .overrideAttrs (oa: { prePatch = - (oa.prePatch or "") + oa.prePatch or "" + '' # bragging rights echo "Replacing localversion with custom suffix" diff --git a/hosts/tower/hardware-configuration.nix b/hosts/tower/hardware-configuration.nix index 2b2927f..b9d7981 100644 --- a/hosts/tower/hardware-configuration.nix +++ b/hosts/tower/hardware-configuration.nix @@ -7,10 +7,12 @@ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "virtio_scsi" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot = { + initrd.availableKernelModules = ["xhci_pci" "virtio_scsi" "sr_mod"]; + initrd.kernelModules = []; + kernelModules = []; + extraModulePackages = []; + }; swapDevices = []; diff --git a/modules/packages/hardware.nix b/modules/packages/hardware.nix index 1a85c49..cbaa95b 100644 --- a/modules/packages/hardware.nix +++ b/modules/packages/hardware.nix @@ -3,6 +3,5 @@ lib, pkgs, ... -}: let -in { +}: { } diff --git a/modules/programs/gui/fuzzel/module.nix b/modules/programs/gui/fuzzel/module.nix index 7bb939e..0eb6402 100644 --- a/modules/programs/gui/fuzzel/module.nix +++ b/modules/programs/gui/fuzzel/module.nix @@ -3,8 +3,7 @@ lib, pkgs, ... -}: let -in { +}: { environment.systemPackages = builtins.attrValues { inherit (pkgs) fuzzel; }; diff --git a/modules/programs/gui/ghostty/module.nix b/modules/programs/gui/ghostty/module.nix index 254f074..47c74ca 100644 --- a/modules/programs/gui/ghostty/module.nix +++ b/modules/programs/gui/ghostty/module.nix @@ -53,7 +53,7 @@ # The value clipboard will always copy text to the selection clipboard as well as the system clipboard. copy-on-select = "clipboard"; - shell-integration = shell-integration; + inherit shell-integration; command = getExe package; }; diff --git a/modules/services/grafana/module.nix b/modules/services/grafana/module.nix index 1a73e5a..e52e7e1 100644 --- a/modules/services/grafana/module.nix +++ b/modules/services/grafana/module.nix @@ -29,7 +29,7 @@ in { http_port = port; root_url = "https://${domain}"; - domain = domain; + inherit domain; enforce_domain = true; }; database = { diff --git a/modules/services/kanata/module.nix b/modules/services/kanata/module.nix index e79947d..c39dd6d 100644 --- a/modules/services/kanata/module.nix +++ b/modules/services/kanata/module.nix @@ -12,19 +12,12 @@ in { config = mkIf cfg.enable { services.kanata = { enable = true; - - keyboards.daskeyboard = { - devices = ["/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd"]; - config = builtins.readFile (./. + "/main.kbd"); - }; - - keyboards.laptop = { - devices = ["/dev/input/by-path/platform-i8042-serio-0-event-kbd"]; - config = builtins.readFile (./. + "/main.kbd"); - }; - - keyboards.dell-keyboard = { - devices = ["/dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd"]; + keyboards.main = { + devices = [ + "/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd" + "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + "/dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd" + ]; config = builtins.readFile (./. + "/main.kbd"); }; }; diff --git a/modules/system/boot/module.nix b/modules/system/boot/module.nix index 2da4a6b..2aeeb1a 100644 --- a/modules/system/boot/module.nix +++ b/modules/system/boot/module.nix @@ -54,7 +54,7 @@ in { efi.canTouchEfiVariables = true; timeout = mkDefault cfg.timeout; systemd-boot = { - enable = cfg.systemd-boot.enable; + inherit (cfg.systemd-boot) enable; # INFO: Leaving this enabled is a security vulneratibility, # since we can just start /bin/sh from there and get root access. # Since I have FDE, this isn't _as_ critical, but it would still be @@ -64,7 +64,7 @@ in { configurationLimit = 5; }; grub = { - enable = cfg.grub.enable; + inherit (cfg.grub) enable; efiSupport = true; device = "nodev"; configurationLimit = 5; diff --git a/modules/system/hardware/cpu/amd.nix b/modules/system/hardware/cpu/amd.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/system/hardware/wifi.nix b/modules/system/hardware/wifi.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/system/os/networking/firewall.nix b/modules/system/os/networking/firewall.nix index 263bd6d..a3e1182 100644 --- a/modules/system/os/networking/firewall.nix +++ b/modules/system/os/networking/firewall.nix @@ -3,8 +3,7 @@ lib, pkgs, ... -}: let -in { +}: { networking = { # use nftables over iptables nftables.enable = true; diff --git a/modules/wms/wayland/sway/module.nix b/modules/wms/wayland/sway/module.nix index 1a85c49..cbaa95b 100644 --- a/modules/wms/wayland/sway/module.nix +++ b/modules/wms/wayland/sway/module.nix @@ -3,6 +3,5 @@ lib, pkgs, ... -}: let -in { +}: { } diff --git a/packages/fish/fishinit.nix b/packages/fish/fishinit.nix index 2ec5749..760a08a 100644 --- a/packages/fish/fishinit.nix +++ b/packages/fish/fishinit.nix @@ -9,15 +9,15 @@ pkgs.writeTextDir "${vendorConf}/blox_config.fish" # source ${pkgs.fishPlugins.sponge}/share/zsh-defer/zsh-defer.plugin.zsh ${pkgs.atuin}/bin/atuin init fish | source bind up _atuin_bind_up - + ${pkgs.zoxide}/bin/zoxide init fish | source # abbr --erase cd &>/dev/null # alias cd=__zoxide_z - + # abbr --erase ci &>/dev/null # alias ci=__zoxide_zi - - + + ${pkgs.starship}/bin/starship init fish | source ${pkgs.direnv}/bin/direnv hook fish | source ${pkgs.pay-respects}/bin/pay-respects fish --alias f --nocnf | source