diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index 361199ce..abcfda88 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -41,6 +41,7 @@ import System.Taffybar.Information.X11DesktopInfo import System.Taffybar.SimpleConfig import System.Taffybar.Util import System.Taffybar.Widget +import System.Taffybar.Widget.Generic.Icon import System.Taffybar.Widget.Generic.PollingGraph import System.Taffybar.Widget.Generic.PollingLabel import System.Taffybar.Widget.Util @@ -54,7 +55,10 @@ getDaysCandles productString = do CB.run CB.Production (candles CB.userAgent) coinbaseProductLabel productString = - pollingLabelNew 60.0 $ Data.Text.pack . ((productString ++ ": ") ++) . show . CB.unPrice . CB.close . head <$> getDaysCandles (Data.Text.pack productString) + pollingLabelNew 60.0 $ Data.Text.pack . show . CB.unPrice . CB.close . head <$> + getDaysCandles (Data.Text.pack productString) + + mkRGBA (r, g, b, a) = (r/256, g/256, b/256, a/256) blue = mkRGBA (42, 99, 140, 256) diff --git a/nixos/machines/adele.nix b/nixos/machines/adele.nix index 71962e88..41af0cc2 100644 --- a/nixos/machines/adele.nix +++ b/nixos/machines/adele.nix @@ -9,21 +9,11 @@ ../base.nix ]; - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes ca-references - ''; - }; - hardware.enableRedistributableFirmware = true; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_5_12; - - hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; - hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ soundwire-dkms ];