From 791db5bb18f0497bf656a4d3907e0200efb1543d Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Tue, 17 Jun 2025 16:22:07 +0800 Subject: [PATCH] add matlab --- flake.lock | 44 ++++++++++++++++++++++++-- flake.nix | 4 +++ home/programs/coding/distrobox.nix | 10 ------ home/programs/desktop/default.nix | 2 ++ home/programs/desktop/niri/default.nix | 7 +++- os/programs/default.nix | 1 + os/programs/matlab.nix | 4 +++ os/system/configuration.nix | 1 + overlays/default.nix | 1 + 9 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 os/programs/matlab.nix diff --git a/flake.lock b/flake.lock index 236cdaa..fb3bb80 100644 --- a/flake.lock +++ b/flake.lock @@ -142,6 +142,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1746162366, "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", @@ -156,7 +172,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "locked": { "lastModified": 1747046372, "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", @@ -764,6 +780,27 @@ "type": "github" } }, + "nix-matlab": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749999717, + "narHash": "sha256-0e90USJ7piAzjU1u0TRrzCsvI5Sv6H/Kn4Mc1IdMDlo=", + "owner": "doronbehar", + "repo": "nix-matlab", + "rev": "ac8d65aeb173a6b9a2bb6f0a05c490a732259e2f", + "type": "gitlab" + }, + "original": { + "owner": "doronbehar", + "repo": "nix-matlab", + "type": "gitlab" + } + }, "nixd": { "inputs": { "flake-parts": "flake-parts_4", @@ -956,7 +993,7 @@ }, "nixpkgs-wayland_2": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "lib-aggregate": "lib-aggregate_2", "nixpkgs": "nixpkgs_7" }, @@ -1220,6 +1257,7 @@ "nil": "nil", "niri": "niri", "niri-unstable": "niri-unstable", + "nix-matlab": "nix-matlab", "nixd": "nixd", "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", @@ -1256,7 +1294,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_7", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", diff --git a/flake.nix b/flake.nix index ae84455..7c80081 100644 --- a/flake.nix +++ b/flake.nix @@ -93,5 +93,9 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-matlab = { + url = "gitlab:doronbehar/nix-matlab"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/home/programs/coding/distrobox.nix b/home/programs/coding/distrobox.nix index c68cb92..f47c73d 100644 --- a/home/programs/coding/distrobox.nix +++ b/home/programs/coding/distrobox.nix @@ -1,15 +1,5 @@ { programs.distrobox = { enable = true; - containers = { - python-project = { - image = "fedora:latest"; - additional_packages = "python3 python3-pip git python3-numpy python3-scipy python3-matplotlib python3-pandas"; - init_hooks = [ - "ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/evince" - "ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/latexmk" - ]; - }; - }; }; } diff --git a/home/programs/desktop/default.nix b/home/programs/desktop/default.nix index dd2610c..5ccf463 100644 --- a/home/programs/desktop/default.nix +++ b/home/programs/desktop/default.nix @@ -14,6 +14,8 @@ kanshi wlsunset wayneko + xwayland-satellite + wmname ]; home.file."scripts" = { source = ./scripts; diff --git a/home/programs/desktop/niri/default.nix b/home/programs/desktop/niri/default.nix index c0c5b07..e302f9d 100644 --- a/home/programs/desktop/niri/default.nix +++ b/home/programs/desktop/niri/default.nix @@ -34,7 +34,12 @@ touchpad.natural-scroll = false; keyboard.xkb.options = "caps:escape"; }; - environment.DISPLAY = ":0"; + environment = { + DISPLAY = ":0"; + XIM = "fcitx"; + GTK_IM_MODULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + }; outputs = builtins.mapAttrs (name: value: { inherit (value) scale mode position; transform.rotation = value.rotation; diff --git a/os/programs/default.nix b/os/programs/default.nix index de268c0..b34d5ef 100644 --- a/os/programs/default.nix +++ b/os/programs/default.nix @@ -9,5 +9,6 @@ # ./hellwm.nix # ./miracle-wm.nix ./sway.nix + ./matlab.nix ]; } diff --git a/os/programs/matlab.nix b/os/programs/matlab.nix new file mode 100644 index 0000000..f30562c --- /dev/null +++ b/os/programs/matlab.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + environment.systemPackages = [ pkgs.matlab ]; +} diff --git a/os/system/configuration.nix b/os/system/configuration.nix index 7e4f157..cf58b58 100644 --- a/os/system/configuration.nix +++ b/os/system/configuration.nix @@ -121,6 +121,7 @@ "docker" "libvirtd" "video" + "kvm" ]; packages = with pkgs; [ nautilus diff --git a/overlays/default.nix b/overlays/default.nix index d94e8aa..2a60149 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -32,4 +32,5 @@ inherit (inputs.niri.overlays) niri; nur = inputs.nur.overlays.default; + nix-matlab = inputs.nix-matlab.overlay; }