From e8a2007a297ad328083be9f62d45ada6e4cf2587 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Fri, 3 Nov 2023 20:23:05 +0100 Subject: [PATCH] Rip out Matlab Signed-off-by: magic_rb --- flake.nix | 5 +---- home-manager/modules/profiles/workstation.nix | 14 -------------- nixos/systems/omen/impermenance.nix | 3 --- nixos/systems/omen/nixpkgs.nix | 6 +----- 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index ff5950d..1bb7f9d 100644 --- a/flake.nix +++ b/flake.nix @@ -32,9 +32,6 @@ tuxedo-nixos.url = "github:blitz/tuxedo-nixos"; tuxedo-nixos.inputs.nixpkgs.follows = "nixpkgs"; - nix-matlab.url = "gitlab:doronbehar/nix-matlab"; - nix-matlab.inputs.nixpkgs.follows = "nixpkgs"; - emacs.url = "sourcehut:~magic_rb/emacs"; emacs.flake = false; @@ -201,7 +198,7 @@ udp-over-tcp itp ds3os - matlab; + rolling_datasets; }; devShells.default = diff --git a/home-manager/modules/profiles/workstation.nix b/home-manager/modules/profiles/workstation.nix index 6dc870a..d39ec1b 100644 --- a/home-manager/modules/profiles/workstation.nix +++ b/home-manager/modules/profiles/workstation.nix @@ -109,20 +109,6 @@ in emacs-rofi libnotify playerctl - - (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 5dcd80d..6cc5411 100644 --- a/nixos/systems/omen/impermenance.nix +++ b/nixos/systems/omen/impermenance.nix @@ -48,9 +48,6 @@ in ".local/share/direnv" "repos" ".config/SchildiChat" - ".config/matlab" - ".matlab" - "MATLAB" ".stack" ".cache/nix" ".cache/fontconfig" diff --git a/nixos/systems/omen/nixpkgs.nix b/nixos/systems/omen/nixpkgs.nix index 3cf3542..c5341b8 100644 --- a/nixos/systems/omen/nixpkgs.nix +++ b/nixos/systems/omen/nixpkgs.nix @@ -19,9 +19,5 @@ ++ (with inputs'.nixng.overlays; [ default - ]) - ++ - [ - inputs'.nix-matlab.overlay - ]; + ]); }