From fee23e5adb5195dccc6fc83ef008660957868dd2 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 12 Jun 2026 04:12:52 +0200 Subject: [PATCH] refactor: move away from with pkgs; --- modules/services/mpd.nix | 10 +++--- roles/desktop.nix | 8 ++--- roles/gui.nix | 74 ++++++++++++++++++++-------------------- roles/laptop.nix | 16 ++++----- roles/nvidia.nix | 8 ++--- roles/router.nix | 6 ++-- roles/server.nix | 10 +++--- roles/wine.nix | 24 ++++++++----- 8 files changed, 82 insertions(+), 74 deletions(-) diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index f0051b3..39ee64f 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -5,11 +5,11 @@ ... }: { - environment.systemPackages = with pkgs; [ - mpc - mpdris2 - ncmpcpp - rmpc + environment.systemPackages = [ + pkgs.mpc + pkgs.mpdris2 + pkgs.ncmpcpp + pkgs.rmpc ]; services.mpd = { diff --git a/roles/desktop.nix b/roles/desktop.nix index 7ddfc59..69b1d3c 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -16,13 +16,13 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ cifs-utils ]; + environment.systemPackages = [ pkgs.cifs-utils ]; home-manager = { users.${username} = { - home.packages = with pkgs; [ + home.packages = [ # Home packages - swaylock - lm_sensors + pkgs.swaylock + pkgs.lm_sensors ]; }; }; diff --git a/roles/gui.nix b/roles/gui.nix index f9683e5..548b6b5 100644 --- a/roles/gui.nix +++ b/roles/gui.nix @@ -65,48 +65,48 @@ in }; }; }; - home.packages = with pkgs; [ - dconf - element-desktop - dino - signal-desktop - mumble - anki - wdisplays - librewolf - ungoogled-chromium - nsxiv - imv - libreoffice - nautilus - spotify-player - thunderbird - lxqt.pavucontrol-qt - mpv - kdePackages.kdeconnect-kde - libgnome-keyring - foot - nautilus - tesseract - yubikey-touch-detector - wireguard-tools - openresolv - xdg-utils - killall - libnotify - openssl - pamixer - playerctl - wl-clipboard - cliphist - poweralertd + home.packages = [ + pkgs.dconf + pkgs.element-desktop + pkgs.dino + pkgs.signal-desktop + pkgs.mumble + pkgs.anki + pkgs.wdisplays + pkgs.librewolf + pkgs.ungoogled-chromium + pkgs.nsxiv + pkgs.imv + pkgs.libreoffice + pkgs.nautilus + pkgs.spotify-player + pkgs.thunderbird + pkgs.lxqt.pavucontrol-qt + pkgs.mpv + pkgs.kdePackages.kdeconnect-kde + pkgs.libgnome-keyring + pkgs.foot + pkgs.nautilus + pkgs.tesseract + pkgs.yubikey-touch-detector + pkgs.wireguard-tools + pkgs.openresolv + pkgs.xdg-utils + pkgs.killall + pkgs.libnotify + pkgs.openssl + pkgs.pamixer + pkgs.playerctl + pkgs.wl-clipboard + pkgs.cliphist + pkgs.poweralertd # Gaming # lunar-client # Not GUI but specific to GUI usage - sshuttle - sshfs + pkgs.sshuttle + pkgs.sshfs # pkgs.nerdfonts # (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) diff --git a/roles/laptop.nix b/roles/laptop.nix index 2ba6fb4..b7294f0 100644 --- a/roles/laptop.nix +++ b/roles/laptop.nix @@ -16,17 +16,17 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - cifs-utils - powertop + environment.systemPackages = [ + pkgs.cifs-utils + pkgs.powertop ]; home-manager = { users.${username} = { - home.packages = with pkgs; [ - acpi - brightnessctl - powertop - lm_sensors + home.packages = [ + pkgs.acpi + pkgs.brightnessctl + pkgs.powertop + pkgs.lm_sensors ]; }; }; diff --git a/roles/nvidia.nix b/roles/nvidia.nix index 25033d6..2fcf205 100644 --- a/roles/nvidia.nix +++ b/roles/nvidia.nix @@ -27,22 +27,22 @@ in enableRedistributableFirmware = true; graphics = { enable = true; - extraPackages = with pkgs; [ + extraPackages = [ # amdvlk would be the package that would be required for AMD on desktop, since none of the hosts use NVIDIA as a desktop GPU, this is open and uncertain. ]; # For 32 bit applications as well - extraPackages32 = with pkgs; [ + extraPackages32 = [ # driversi686Linux.amdvlk would be the package that would be required for AMD on desktop, since none of the hosts use NVIDIA as a desktop GPU, this is open and uncertain. ]; }; }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ # amdvlk #nvidia-x11 #nvidia-settings #nvidia-persistenced - nvtopPackages.nvidia + pkgs.nvtopPackages.nvidia ]; }; } diff --git a/roles/router.nix b/roles/router.nix index a762d7d..9211b8a 100644 --- a/roles/router.nix +++ b/roles/router.nix @@ -16,10 +16,10 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ pkgs.kitty.terminfo - powertop - bind + pkgs.powertop + pkgs.bind ]; services = { diff --git a/roles/server.nix b/roles/server.nix index 1133281..ed372f3 100644 --- a/roles/server.nix +++ b/roles/server.nix @@ -16,11 +16,11 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - kitty.terminfo - foot.terminfo - powertop - lm_sensors + environment.systemPackages = [ + pkgs.kitty.terminfo + pkgs.foot.terminfo + pkgs.powertop + pkgs.lm_sensors ]; services = { diff --git a/roles/wine.nix b/roles/wine.nix index 7e64822..e555eb3 100644 --- a/roles/wine.nix +++ b/roles/wine.nix @@ -1,19 +1,27 @@ -{ lib, pkgs, config, username, home-manager, ... }: +{ + lib, + pkgs, + config, + username, + home-manager, + ... +}: with lib; let cfg = config.liv.wine; -in { +in +{ options.liv.wine = { enable = mkEnableOption "Enable wine"; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - wineWowPackages.stable - wineWowPackages.waylandFull - winetricks - mono5 - mono + environment.systemPackages = [ + pkgs.wineWowPackages.stable + pkgs.wineWowPackages.waylandFull + pkgs.winetricks + pkgs.mono5 + pkgs.mono ]; }; }