diff --git a/home/programs/coding/R.nix b/home/programs/coding/R.nix index 8293a79..01f40ad 100644 --- a/home/programs/coding/R.nix +++ b/home/programs/coding/R.nix @@ -7,27 +7,52 @@ let pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}; colors = config.lib.stylix.colors.withHashtag; - rPkgs = with pkgs-stable.rPackages; [ - ggplot2 - dplyr - tidyverse - bruceR - afex - ggpubr - reshape2 - rmdformats - see - languageserver - styler - openxlsx - ez - multcomp - rsdmx - MuMIn - ggforce - brms - bayestestR - ]; + rPkgs = + with pkgs-stable.rPackages; + with pkgs-stable; + [ + ggplot2 + dplyr + tidyverse + bruceR + afex + ggpubr + reshape2 + rmdformats + see + languageserver + styler + openxlsx + ez + multcomp + rsdmx + MuMIn + ggforce + brms + bayestestR + BayesFactor + ggrounded + bain + (buildRPackage { + name = "cmdstanr"; + src = pkgs.fetchFromGitHub { + owner = "stan-dev"; + repo = "cmdstanr"; + rev = "edccf2d2f6449e7d80626a3ee6cc93845e82915b"; + sha256 = "0nvqjv35l6qrrdg325kj1f01h9awsp1vgdaz6ylasckphqpcqln3"; + }; + propagatedBuildInputs = with rPackages; [ + posterior + checkmate + jsonlite + processx + R6 + withr + rlang + data_table + ]; + }) + ]; myR = pkgs-stable.rWrapper.override { packages = rPkgs; }; diff --git a/home/programs/desktop/niri/autostart.nix b/home/programs/desktop/niri/autostart.nix index 331dad8..1bf3f2e 100644 --- a/home/programs/desktop/niri/autostart.nix +++ b/home/programs/desktop/niri/autostart.nix @@ -37,9 +37,9 @@ let + ( builtins.attrNames config.monitors |> map (monitor: [ - "swww img --namespace background -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/.cache/swww/${monitor}-file)\"" + "swww img --namespace background -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${monitor}-file)\"" "sleep 0.2" - "swww img --namespace backdrop -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/.cache/swww/${monitor}-blurred-file)\"" + "swww img --namespace backdrop -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${monitor}-blurred-file)\"" "sleep 0.2" ]) |> builtins.concatLists @@ -50,7 +50,7 @@ let if config.desktopShell == "caelestia" then # bash '' - caelestia wallpaper -f "/home/${user}/Pictures/Wallpapers/generated/$(cat ~/.cache/swww/${config.lib.monitors.mainMonitorName}-file)" + caelestia wallpaper -f "/home/${user}/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${config.lib.monitors.mainMonitorName}-file)" caelestia scheme set -n dynamic -m dark '' else diff --git a/home/programs/desktop/niri/default.nix b/home/programs/desktop/niri/default.nix index 99a19de..ae7e531 100644 --- a/home/programs/desktop/niri/default.nix +++ b/home/programs/desktop/niri/default.nix @@ -106,6 +106,12 @@ ]; opacity = 0.85; } + { + matches = [ + { app-id = "MATLAB R2022b - academic use"; } + ]; + open-floating = true; + } ]; layer-rules = [ { diff --git a/home/programs/desktop/niri/swhkd.nix b/home/programs/desktop/niri/swhkd.nix index f1eac30..5340bb6 100644 --- a/home/programs/desktop/niri/swhkd.nix +++ b/home/programs/desktop/niri/swhkd.nix @@ -16,7 +16,7 @@ in key = "super + shift + w"; command = if config.desktopShell == "caelestia" then - "/home/${user}/scripts/change-wal-niri && caelestia wallpaper -f ~/Pictures/Wallpapers/generated/$(cat ~/.cache/swww/${config.lib.monitors.mainMonitorName}-file) && caelestia scheme set -n dynamic -m dark" + "/home/${user}/scripts/change-wal-niri && caelestia wallpaper -f ~/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${config.lib.monitors.mainMonitorName}-file) && caelestia scheme set -n dynamic -m dark" else "/home/${user}/scripts/change-wal-niri"; } diff --git a/home/programs/desktop/scripts/change-wal-niri b/home/programs/desktop/scripts/change-wal-niri index 807f7d9..95f377c 100755 --- a/home/programs/desktop/scripts/change-wal-niri +++ b/home/programs/desktop/scripts/change-wal-niri @@ -9,5 +9,5 @@ output=$(niri msg -j focused-output | jq -r .name) swww img -o $output $wallpapers_dir/$wall --transition-type random --transition-duration 1 --namespace background blurwall=$(echo $wall | sed 's/\.jpg$/-blurred.jpg/') swww img -o $output $wallpapers_dir/$blurwall --transition-type fade --namespace backdrop -echo $wall > $HOME/.cache/swww/"$output"-file -echo $blurwall > $HOME/.cache/swww/"$output"-blurred-file +echo $wall > $HOME/Pictures/Wallpapers/"$output"-file +echo $blurwall > $HOME/Pictures/Wallpapers/"$output"-blurred-file diff --git a/home/tweaks/default.nix b/home/tweaks/default.nix index 363df64..1afb122 100644 --- a/home/tweaks/default.nix +++ b/home/tweaks/default.nix @@ -7,5 +7,5 @@ ./wallpaper.nix ./colorscheme.nix ]; - desktopShell = "caelestia"; + desktopShell = "noctalia-shell"; } diff --git a/os/programs/misc.nix b/os/programs/misc.nix index c3d824e..80cdebf 100644 --- a/os/programs/misc.nix +++ b/os/programs/misc.nix @@ -1,3 +1,4 @@ { services.todesk.enable = true; + programs.zoom-us.enable = true; } diff --git a/os/system/configuration.nix b/os/system/configuration.nix index 8aa98c9..7446e39 100644 --- a/os/system/configuration.nix +++ b/os/system/configuration.nix @@ -67,6 +67,8 @@ enable = true; configFile = "/home/${user}/.config/dae/config.dae"; }; + + flatpak.enable = true; }; security = {