From 245e6d891ba1cf9311ea88c44994186cec1bd6f1 Mon Sep 17 00:00:00 2001 From: MagicRB Date: Tue, 3 Oct 2023 23:49:04 +0200 Subject: [PATCH] Matlab, ew, stuff Signed-off-by: MagicRB --- home-manager/modules/profiles/workstation.nix | 16 ++++++++++++++-- nixos/systems/omen/impermenance.nix | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/home-manager/modules/profiles/workstation.nix b/home-manager/modules/profiles/workstation.nix index 2bcf540..956f815 100644 --- a/home-manager/modules/profiles/workstation.nix +++ b/home-manager/modules/profiles/workstation.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs', ... }: let inherit (lib) concatStringsSep @@ -110,7 +110,19 @@ in libnotify playerctl - matlab + (pkgs.buildFHSUserEnv { + name = "matlab"; + targetPkgs = ps: (inputs'.nix-matlab.targetPkgs ps ++ [ + pkgs.freetype + ]); + runScript = pkgs.writeScript "matlab" (inputs'.nix-matlab.shellHooksCommon + '' + export _JAVA_AWT_WM_NONREPARENTING=1 + exec $MATLAB_INSTALL_DIR/bin/matlab "$@" + ''); + meta = { + description = "MATLAB with freetype included in FHS environment"; + }; + }) ]; diff --git a/nixos/systems/omen/impermenance.nix b/nixos/systems/omen/impermenance.nix index 3e7d32d..d42632e 100644 --- a/nixos/systems/omen/impermenance.nix +++ b/nixos/systems/omen/impermenance.nix @@ -38,6 +38,9 @@ { directory = ".ssh"; mode = "0700"; } ".local/share/direnv" "repos" + ".config/matlab" + ".matlab" + "MATLAB" ]; files = [ { file = ".config/wallpaper"; method = "symlink"; }