From ac9aa9652264e027623b01ea237fdba4dfbba7c8 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 5 May 2024 23:07:06 -0400 Subject: [PATCH] refactor: make nixd happy --- common/modules/cachix.nix | 4 ++-- common/overlays/nix/patch | 12 ------------ common/vars/default.nix | 19 ++++++++++--------- devices/binto/modules/gpu-replay.nix | 10 +++++----- devices/binto/modules/nix-gaming.nix | 4 ++-- devices/nos/modules/subtitles/cleanup.nix | 9 +++++---- devices/nos/modules/subtitles/syncing.nix | 4 ++-- devices/wim/home/packages.nix | 2 +- home/firefox/default.nix | 10 +++++----- modules/android.nix | 6 +----- modules/borgbackup/module.nix | 23 +++++++++++------------ modules/dolphin.nix | 4 ++-- modules/hyprland/default.nix | 4 +++- modules/hyprland/security.nix | 4 ++-- modules/nvidia.nix | 13 +++++++------ modules/ratbag-mice.nix | 4 ++-- 16 files changed, 60 insertions(+), 72 deletions(-) delete mode 100644 common/overlays/nix/patch diff --git a/common/modules/cachix.nix b/common/modules/cachix.nix index 4f1e0ef..3fbcb6a 100644 --- a/common/modules/cachix.nix +++ b/common/modules/cachix.nix @@ -3,8 +3,8 @@ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - (writeShellApplication { + environment.systemPackages = [ + (pkgs.writeShellApplication { name = "rebuild-no-cache"; runtimeInputs = [config.programs.nh.package]; text = '' diff --git a/common/overlays/nix/patch b/common/overlays/nix/patch deleted file mode 100644 index 4b4bc05..0000000 --- a/common/overlays/nix/patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/libstore/path.cc b/src/libstore/path.cc -index e642abcd5..0e584ef33 100644 ---- a/src/libstore/path.cc -+++ b/src/libstore/path.cc -@@ -12,7 +12,7 @@ static void checkName(std::string_view path, std::string_view name) - if (!((c >= '0' && c <= '9') - || (c >= 'a' && c <= 'z') - || (c >= 'A' && c <= 'Z') -- || c == '+' || c == '-' || c == '.' || c == '_' || c == '?' || c == '=')) -+ || c == '+' || c == '-' || c == '.' || c == '_' || c == '?' || c == '=' || c == '!')) - throw BadStorePath("store path '%s' contains illegal character '%s'", path, c); - } diff --git a/common/vars/default.nix b/common/vars/default.nix index 7a72415..43d160f 100644 --- a/common/vars/default.nix +++ b/common/vars/default.nix @@ -35,16 +35,17 @@ in { default = import ./prompt-schemes.nix cfg.promptMainColor; readOnly = true; - type = with types; - submodule { - options = { - textColor = mkOption {type = str;}; - firstColor = mkOption {type = str;}; - secondColor = mkOption {type = str;}; - thirdColor = mkOption {type = str;}; - fourthColor = mkOption {type = str;}; - }; + type = types.submodule { + options = let + inherit (types) str; + in { + textColor = mkOption {type = str;}; + firstColor = mkOption {type = str;}; + secondColor = mkOption {type = str;}; + thirdColor = mkOption {type = str;}; + fourthColor = mkOption {type = str;}; }; + }; }; configDir = mkOption { diff --git a/devices/binto/modules/gpu-replay.nix b/devices/binto/modules/gpu-replay.nix index 01be48b..2f5bac4 100644 --- a/devices/binto/modules/gpu-replay.nix +++ b/devices/binto/modules/gpu-replay.nix @@ -66,20 +66,20 @@ in { }; home-manager.users.${mainUser} = { - home.packages = with pkgs; [ + home.packages = [ gsr - (writeShellApplication { + (pkgs.writeShellApplication { name = "gpu-save-replay"; - runtimeInputs = [procps]; + runtimeInputs = [pkgs.procps]; text = '' pkill --signal SIGUSR1 -f gpu-screen-recorder ''; }) - (writeShellApplication { + (pkgs.writeShellApplication { name = "gsr-start"; - runtimeInputs = [pulseaudio hyprPkgs xorg.xrandr]; + runtimeInputs = [pkgs.pulseaudio hyprPkgs pkgs.xorg.xrandr]; text = '' main="${removePrefix "desc:" mainMonitor}" WINDOW=$(hyprctl -j monitors | jq '.[] |= (.description |= gsub(","; ""))' | jq -r ".[] | select(.description | test(\"$main\")) | .name") diff --git a/devices/binto/modules/nix-gaming.nix b/devices/binto/modules/nix-gaming.nix index 3704401..702f300 100644 --- a/devices/binto/modules/nix-gaming.nix +++ b/devices/binto/modules/nix-gaming.nix @@ -15,8 +15,8 @@ }; }; - environment.systemPackages = with pkgs; [ - (lutris.override { + environment.systemPackages = [ + (pkgs.lutris.override { extraLibraries = pkgs: [ # List library dependencies here ]; diff --git a/devices/nos/modules/subtitles/cleanup.nix b/devices/nos/modules/subtitles/cleanup.nix index 31862cf..470b408 100644 --- a/devices/nos/modules/subtitles/cleanup.nix +++ b/devices/nos/modules/subtitles/cleanup.nix @@ -26,11 +26,12 @@ in { Group = config.users.users.${mainUser}.group; }; - path = with pkgs; [ - findutils - (writeShellApplication { + path = [ + pkgs.findutils + + (pkgs.writeShellApplication { name = "sub-clean"; - runtimeInputs = [findutils gnugrep gawk]; + runtimeInputs = with pkgs; [findutils gnugrep gawk]; text = '' exec ${script} "$@" ''; diff --git a/devices/nos/modules/subtitles/syncing.nix b/devices/nos/modules/subtitles/syncing.nix index e6152b1..d4ca4bb 100644 --- a/devices/nos/modules/subtitles/syncing.nix +++ b/devices/nos/modules/subtitles/syncing.nix @@ -22,8 +22,8 @@ in { Group = config.users.users.${mainUser}.group; }; - path = with pkgs; [ - findutils + path = [ + pkgs.findutils node-syncsub ]; diff --git a/devices/wim/home/packages.nix b/devices/wim/home/packages.nix index 9a8f312..6c388a0 100644 --- a/devices/wim/home/packages.nix +++ b/devices/wim/home/packages.nix @@ -19,7 +19,7 @@ fi done ) & - exec env SUDO_ASKPASS=${pkgs.plasma5Packages.ksshaskpass}/bin/${pkgs.plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@" + exec env SUDO_ASKPASS=${plasma5Packages.ksshaskpass}/bin/${plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@" '') ]); diff --git a/home/firefox/default.nix b/home/firefox/default.nix index 89b1859..771488c 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -176,14 +176,14 @@ in { ]; }; - extensions = with config.nur.repos; - (with bandithedoge.firefoxAddons; [ + extensions = + (with config.nur.repos.bandithedoge.firefoxAddons; [ sponsorblock stylus #tridactyl ublock-origin ]) - ++ (with rycee.firefox-addons; [ + ++ (with config.nur.repos.rycee.firefox-addons; [ bitwarden darkreader istilldontcareaboutcookies @@ -193,13 +193,13 @@ in { ]) ++ (with firefox-addons; [ floccus - sound-volume google-container checkmarks-web-ext ttv-lol-pro seventv opera-gx-witchcraft-purple - ]); + ]) + ++ [sound-volume]; }; }; } diff --git a/modules/android.nix b/modules/android.nix index e99dddc..89e4a54 100644 --- a/modules/android.nix +++ b/modules/android.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: let +{config, ...}: let inherit (config.vars) mainUser; in { programs.adb.enable = true; diff --git a/modules/borgbackup/module.nix b/modules/borgbackup/module.nix index 849e01b..2cbb92b 100644 --- a/modules/borgbackup/module.nix +++ b/modules/borgbackup/module.nix @@ -26,7 +26,7 @@ in { }: { options = { paths = mkOption { - type = with types; nullOr (coercedTo str lib.singleton (listOf str)); + type = types.nullOr (types.coercedTo types.str lib.singleton (types.listOf types.str)); default = null; }; dumpCommand = mkOption { @@ -177,18 +177,17 @@ in { }; existingRepos = mkOption { - type = with types; - listOf (submodule { - options = { - name = mkOption { - type = str; - }; - authorizedKeys = mkOption { - type = listOf str; - default = []; - }; + type = types.listOf (types.submodule { + options = { + name = mkOption { + type = types.str; }; - }); + authorizedKeys = mkOption { + type = types.listOf types.str; + default = []; + }; + }; + }); default = []; }; }; diff --git a/modules/dolphin.nix b/modules/dolphin.nix index 7ea0b22..2f673dd 100644 --- a/modules/dolphin.nix +++ b/modules/dolphin.nix @@ -27,7 +27,7 @@ in { home-manager.users.${mainUser}.home.packages = with pkgs; [] - ++ (with pkgs.plasma5Packages; [ + ++ (with plasma5Packages; [ ark kcharselect kdenlive @@ -43,7 +43,7 @@ in { kio-extras kmime ]) - ++ (with pkgs.gnome; [ + ++ (with gnome; [ gnome-calculator ]); } diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index b8be16a..7bd8c8e 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -34,7 +34,9 @@ in { xserver.wacom.enable = isTouchscreen; }; - programs.hyprland = with hyprland.packages.${pkgs.system}; { + programs.hyprland = let + inherit (hyprland.packages.${pkgs.system}) default xdg-desktop-portal-hyprland; + in { enable = true; package = default; portalPackage = xdg-desktop-portal-hyprland; diff --git a/modules/hyprland/security.nix b/modules/hyprland/security.nix index 63e8412..6ec81db 100644 --- a/modules/hyprland/security.nix +++ b/modules/hyprland/security.nix @@ -33,8 +33,8 @@ in { hypridle.homeManagerModules.default ]; - home.packages = with pkgs; [ - gnome.seahorse + home.packages = [ + pkgs.gnome.seahorse lockPkg ]; diff --git a/modules/nvidia.nix b/modules/nvidia.nix index 4d79886..6763603 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -62,9 +62,9 @@ in { open = cfg.enableWayland; - package = with config.boot.kernelPackages.nvidiaPackages; + package = if !cfg.enableWayland - then stable + then config.boot.kernelPackages.nvidiaPackages.stable else let rcu_patch = pkgs.fetchpatch { url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; @@ -74,7 +74,7 @@ in { # Keep the driver version at 535.xx.xx for Wayland desktop # games stutter on more recent versions # https://github.com/NixOS/nixpkgs/blob/e256f39bec8e01808c0a3e411d961cbced3f4e09/pkgs/os-specific/linux/nvidia-x11/default.nix#L70 - mkDriver rec { + config.boot.kernelPackages.nvidiaPackages.mkDriver rec { version = "535.43.28"; persistencedVersion = "535.98"; settingsVersion = "535.98"; @@ -88,14 +88,15 @@ in { }; }; - environment.systemPackages = with pkgs; ([ + environment.systemPackages = + optionals cfg.enableCUDA [pkgs.cudaPackages.cudatoolkit] + ++ (with pkgs; [ libva-utils nvidia-vaapi-driver nvtopPackages.nvidia pciutils vdpauinfo - ] - ++ optionals cfg.enableCUDA [cudaPackages.cudatoolkit]); + ]); boot.kernelModules = optionals cfg.enableCUDA ["nvidia-uvm"]; }; diff --git a/modules/ratbag-mice.nix b/modules/ratbag-mice.nix index 42996cc..e9d119a 100644 --- a/modules/ratbag-mice.nix +++ b/modules/ratbag-mice.nix @@ -13,8 +13,8 @@ }; }; - environment.systemPackages = with pkgs; [ - (piper.overrideAttrs { + environment.systemPackages = [ + (pkgs.piper.overrideAttrs { name = "piper-${piper-src.shortRev}"; src = piper-src;