Compare commits

...

4 Commits

Author SHA1 Message Date
Ethan Simmons
a60f8e3412 Add citrix to alpheratz 2025-09-02 11:51:55 -05:00
Ethan Simmons
170fe3a1dc Update alpheratz 2025-09-02 11:44:22 -05:00
Ethan Simmons
bf25d47f15 Add matlab 2025-09-02 11:44:22 -05:00
Ethan Simmons
f14771fe14 Update alpheratz 2025-09-02 11:44:22 -05:00
6 changed files with 85 additions and 14 deletions

70
flake.lock generated
View File

@@ -1,5 +1,21 @@
{ {
"nodes": { "nodes": {
"flake-compat": {
"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-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
@@ -64,11 +80,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755442500, "lastModified": 1756022458,
"narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=", "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3", "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -83,11 +99,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1755446937, "lastModified": 1756239278,
"narHash": "sha256-nQyj7NS2R979/BqDtscfSesmY5UOTM/JpTTZ/i8p8H8=", "narHash": "sha256-fG4z/fAq39VNqBWyNc+OeUzLXf8XOIuLIjLvPtwZ1gE=",
"owner": "ggerganov", "owner": "ggerganov",
"repo": "llama.cpp", "repo": "llama.cpp",
"rev": "21c17b5befc5f6be5992bc87fc1ba99d388561df", "rev": "bcbddcd54f0d5c22eab180831fdea6484107112f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -96,6 +112,25 @@
"type": "github" "type": "github"
} }
}, },
"nix-matlab": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1754476755,
"narHash": "sha256-vSF0VMEmPMzwNkrXIZwkhOSYmKES9BaDK/LlEe7/q8E=",
"owner": "doronbehar",
"repo": "nix-matlab",
"rev": "0e9c9fb660f9e1a1e4d59fd083e0212a15b513e2",
"type": "gitlab"
},
"original": {
"owner": "doronbehar",
"repo": "nix-matlab",
"type": "gitlab"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732014248,
@@ -142,11 +177,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1755186698, "lastModified": 1756125398,
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -157,6 +192,20 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1754340878,
"narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cab778239e705082fe97bb4990e0d24c50924c04",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1744868846, "lastModified": 1744868846,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
@@ -178,6 +227,7 @@
"home-manager-stable": "home-manager-stable", "home-manager-stable": "home-manager-stable",
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"llama-cpp": "llama-cpp", "llama-cpp": "llama-cpp",
"nix-matlab": "nix-matlab",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@@ -185,7 +235,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1754988908,

View File

@@ -18,6 +18,8 @@
llama-cpp.url = "github:ggerganov/llama.cpp"; llama-cpp.url = "github:ggerganov/llama.cpp";
nix-matlab.url = "gitlab:doronbehar/nix-matlab";
}; };
outputs = inputs@{ self outputs = inputs@{ self
@@ -28,6 +30,7 @@
, flake-utils , flake-utils
, sops-nix , sops-nix
, llama-cpp , llama-cpp
, nix-matlab
, ... , ...
}: }:
let let
@@ -165,7 +168,7 @@
school = { school = {
enable = true; enable = true;
citrix = false; citrix = true;
}; };
games = { games = {
@@ -234,7 +237,7 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = with overlays; [ printrun shadps4 ]; overlays = with overlays; [ printrun shadps4 nix-matlab.overlay ];
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [

View File

@@ -65,9 +65,10 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
localPackages.x86_64-linux.jhelioviewer localPackages.x86_64-linux.jhelioviewer
bottles bottles
quartus-prime-lite matlab
discord discord
wine wine
matlab-language-server
]; ];
services.printing.enable = false; services.printing.enable = false;

View File

@@ -14,6 +14,14 @@ iron.setup {
python = { python = {
command = { "python3" }, -- or { "ipython", "--no-autoindent" } command = { "python3" }, -- or { "ipython", "--no-autoindent" }
format = require("iron.fts.common").bracketed_paste_python format = require("iron.fts.common").bracketed_paste_python
},
matlab = {
command = {
"matlab",
"-nosplash",
"-nodesktop"
},
} }
}, },
-- How the repl window will be displayed -- How the repl window will be displayed

View File

@@ -24,6 +24,16 @@ lspconfig.rust_analyzer.setup {
}, },
} }
lspconfig.matlab_ls.setup {
capabilities = capabilities,
settings = {
MATLAB = {
indexWorkspace = false,
installPath = "",
},
},
}
lspconfig.omnisharp.setup { lspconfig.omnisharp.setup {
cmd = { "dotnet", "/usr/lib/omnisharp-roslyn/OmniSharp.dll"} cmd = { "dotnet", "/usr/lib/omnisharp-roslyn/OmniSharp.dll"}
} }

View File

@@ -16,7 +16,6 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
xournalpp xournalpp
libreoffice libreoffice
anki
] ]
++ optional cfg.citrix citrix ++ optional cfg.citrix citrix
++ optional cfg.kicad kicad ++ optional cfg.kicad kicad