From 228939c6edd17052090c237ff12ad068a4a36b69 Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Fri, 9 Feb 2024 22:24:01 -0600 Subject: [PATCH] Fix shuf not working right in wallsetter --- config/scripts/wallsetter.nix | 2 +- config/system/packages.nix | 9 ++------- config/system/python.nix | 4 ++++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/scripts/wallsetter.nix b/config/scripts/wallsetter.nix index 2cecd95..ad11338 100644 --- a/config/scripts/wallsetter.nix +++ b/config/scripts/wallsetter.nix @@ -23,7 +23,7 @@ pkgs.writeShellScriptBin "wallsetter" '' WALLPAPER=$(find ${wallpaperDir} -name '*' | awk '!/.git/' | tail -n +2 | shuf -n 1) else PREVIOUS=$WALLPAPER - NUM=$(shuf -i 1-5 -n 1) + NUM=$(shuf -e 1 2 3 4 5 -n 1) case $NUM in 1) TRANSITION=$TRANSITION1 diff --git a/config/system/packages.nix b/config/system/packages.nix index ce389b2..de3df89 100644 --- a/config/system/packages.nix +++ b/config/system/packages.nix @@ -1,11 +1,6 @@ { pkgs, config, inputs, ... }: -let - my-python-packages = ps: with ps; [ - pandas - requests - ]; -in { +{ # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -17,7 +12,7 @@ in { pkg-config meson hugo gnumake ninja go nodejs symbola noto-fonts-color-emoji material-icons brightnessctl toybox virt-viewer swappy ripgrep appimage-run - networkmanagerapplet + networkmanagerapplet yadm ]; programs.steam.gamescopeSession.enable = true; diff --git a/config/system/python.nix b/config/system/python.nix index deb4f28..cd33362 100644 --- a/config/system/python.nix +++ b/config/system/python.nix @@ -2,6 +2,10 @@ let inherit (import ../../options.nix) python; + my-python-packages = ps: with ps; [ + pandas + requests + ]; in lib.mkIf (python == true) { environment.systemPackages = with pkgs; [ jetbrains.pycharm-community-bin