From 6ccc57f95e505c412f170ecadabd260c2fb034d4 Mon Sep 17 00:00:00 2001 From: pagedmov Date: Mon, 4 Nov 2024 01:37:49 -0500 Subject: [PATCH] trimmed a lot of fat that had been accruing in my system and user package lists --- modules/home/environment/userpkgs.nix | 30 ++++--------------- modules/sys/environment/stylix.nix | 1 + modules/sys/software/packages.nix | 42 ++------------------------- 3 files changed, 9 insertions(+), 64 deletions(-) diff --git a/modules/home/environment/userpkgs.nix b/modules/home/environment/userpkgs.nix index 0f1ccef..8345405 100755 --- a/modules/home/environment/userpkgs.nix +++ b/modules/home/environment/userpkgs.nix @@ -1,5 +1,6 @@ -{lib, config, pkgs, host, ... }: let - desktop = host == "oganesson"; +{lib, config, pkgs, ... }: + +let extraFigletFonts = pkgs.fetchFromGitHub { owner = "xero"; repo = "figlet-fonts"; @@ -15,39 +16,21 @@ cp -r ${extraFigletFonts}/* $out/share/figlet ''; }); - - desktop_pkgs = - if desktop - then - with pkgs; [ - uhk-agent - zathura - handbrake - snes9x-gtk - obs-studio - ] - else []; -in { +in +{ options = { userPkgs.enable = lib.mkEnableOption "enables my default user packages"; }; config = lib.mkIf config.userPkgs.enable { home.packages = with pkgs; [ - chafa nemo - flavours - nicotine-plus - ags - sassc gtk3 sqlite gimp imagemagick - yt-dlp vlc lolcat - speedtest-cli vesktop qbittorrent neovide @@ -62,7 +45,6 @@ in { ripgrep toilet-extrafonts python3 - ] - ++ desktop_pkgs; + ]; }; } diff --git a/modules/sys/environment/stylix.nix b/modules/sys/environment/stylix.nix index afdd364..d22a6fd 100755 --- a/modules/sys/environment/stylix.nix +++ b/modules/sys/environment/stylix.nix @@ -17,6 +17,7 @@ in stylix = { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/${scheme}.yaml"; + override.base00 = "030303"; image = "${self}/assets/wallpapers/sleeping-blackmetal.png"; homeManagerIntegration = { autoImport = true; diff --git a/modules/sys/software/packages.nix b/modules/sys/software/packages.nix index 293f1b3..f56b3bb 100755 --- a/modules/sys/software/packages.nix +++ b/modules/sys/software/packages.nix @@ -4,39 +4,19 @@ }; config = lib.mkIf config.sysPkgs.enable { environment.systemPackages = with pkgs; [ - alejandra alsa-lib alsa-utils bc - cava - cabal-install - clang - clang-tools cliphist - cmake fail2ban - feh - ffmpeg-full - fuse git - gnumake - gst_all_1.gstreamer - htop hyprland-workspaces hyprpicker - imagemagick inetutils kitty - libclang - libcxx lolcat lsof - lua-language-server - luarocks - mesa mpd - mullvad - mesa neofetch nh nix-index @@ -45,36 +25,18 @@ nixos-option nix-search-cli nix-template - mkdocs - python3Packages.mkdocs-material sshfs nvd - openssl - p7zip - jq pamixer - parted pavucontrol - pkg-config playerctl - protonmail-bridge - protontricks - pyright - socat - sox - stress tor - tree - unrar - unzip usbutils vim - vscode-langservers-extracted - vulkan-loader - wget wine + uhk-agent + obs-studio wl-clipboard - xpad libnotify file libvirt-glib