Compare commits
4 Commits
ef753f2450
...
a60f8e3412
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a60f8e3412 | ||
|
|
170fe3a1dc | ||
|
|
bf25d47f15 | ||
|
|
f14771fe14 |
70
flake.lock
generated
70
flake.lock
generated
@@ -1,5 +1,21 @@
|
||||
{
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
@@ -64,11 +80,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755442500,
|
||||
"narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=",
|
||||
"lastModified": 1756022458,
|
||||
"narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3",
|
||||
"rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -83,11 +99,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755446937,
|
||||
"narHash": "sha256-nQyj7NS2R979/BqDtscfSesmY5UOTM/JpTTZ/i8p8H8=",
|
||||
"lastModified": 1756239278,
|
||||
"narHash": "sha256-fG4z/fAq39VNqBWyNc+OeUzLXf8XOIuLIjLvPtwZ1gE=",
|
||||
"owner": "ggerganov",
|
||||
"repo": "llama.cpp",
|
||||
"rev": "21c17b5befc5f6be5992bc87fc1ba99d388561df",
|
||||
"rev": "bcbddcd54f0d5c22eab180831fdea6484107112f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -96,6 +112,25 @@
|
||||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1732014248,
|
||||
@@ -142,11 +177,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1755186698,
|
||||
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||
"lastModified": 1756125398,
|
||||
"narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
||||
"rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -157,6 +192,20 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1754340878,
|
||||
"narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cab778239e705082fe97bb4990e0d24c50924c04",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1744868846,
|
||||
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
|
||||
@@ -178,6 +227,7 @@
|
||||
"home-manager-stable": "home-manager-stable",
|
||||
"home-manager-unstable": "home-manager-unstable",
|
||||
"llama-cpp": "llama-cpp",
|
||||
"nix-matlab": "nix-matlab",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"sops-nix": "sops-nix"
|
||||
@@ -185,7 +235,7 @@
|
||||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754988908,
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
llama-cpp.url = "github:ggerganov/llama.cpp";
|
||||
|
||||
nix-matlab.url = "gitlab:doronbehar/nix-matlab";
|
||||
|
||||
};
|
||||
|
||||
outputs = inputs@{ self
|
||||
@@ -28,6 +30,7 @@
|
||||
, flake-utils
|
||||
, sops-nix
|
||||
, llama-cpp
|
||||
, nix-matlab
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
@@ -165,7 +168,7 @@
|
||||
|
||||
school = {
|
||||
enable = true;
|
||||
citrix = false;
|
||||
citrix = true;
|
||||
};
|
||||
|
||||
games = {
|
||||
@@ -234,7 +237,7 @@
|
||||
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = with overlays; [ printrun shadps4 ];
|
||||
overlays = with overlays; [ printrun shadps4 nix-matlab.overlay ];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
|
||||
@@ -65,9 +65,10 @@
|
||||
environment.systemPackages = with pkgs; [
|
||||
localPackages.x86_64-linux.jhelioviewer
|
||||
bottles
|
||||
quartus-prime-lite
|
||||
matlab
|
||||
discord
|
||||
wine
|
||||
matlab-language-server
|
||||
];
|
||||
|
||||
services.printing.enable = false;
|
||||
|
||||
@@ -14,6 +14,14 @@ iron.setup {
|
||||
python = {
|
||||
command = { "python3" }, -- or { "ipython", "--no-autoindent" }
|
||||
format = require("iron.fts.common").bracketed_paste_python
|
||||
},
|
||||
matlab = {
|
||||
command = {
|
||||
"matlab",
|
||||
"-nosplash",
|
||||
"-nodesktop"
|
||||
},
|
||||
|
||||
}
|
||||
},
|
||||
-- How the repl window will be displayed
|
||||
|
||||
@@ -24,6 +24,16 @@ lspconfig.rust_analyzer.setup {
|
||||
},
|
||||
}
|
||||
|
||||
lspconfig.matlab_ls.setup {
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
MATLAB = {
|
||||
indexWorkspace = false,
|
||||
installPath = "",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
lspconfig.omnisharp.setup {
|
||||
cmd = { "dotnet", "/usr/lib/omnisharp-roslyn/OmniSharp.dll"}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@ in
|
||||
environment.systemPackages = with pkgs; [
|
||||
xournalpp
|
||||
libreoffice
|
||||
anki
|
||||
]
|
||||
++ optional cfg.citrix citrix
|
||||
++ optional cfg.kicad kicad
|
||||
|
||||
Reference in New Issue
Block a user