Compare commits

..

7 Commits

Author SHA1 Message Date
Ethan Simmons
c3f1f0bfb1 Update ankaa 2025-12-17 11:57:02 -06:00
Ethan Simmons
9eddcb81db Add anki and update 2025-10-30 18:47:55 -05:00
Ethan Simmons
f475232dd4 Add Vintage Story to games 2025-10-30 18:47:32 -05:00
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
11 changed files with 102 additions and 23 deletions

82
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": 1761845621,
"narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=", "narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3", "rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -83,11 +99,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1755446937, "lastModified": 1761867267,
"narHash": "sha256-nQyj7NS2R979/BqDtscfSesmY5UOTM/JpTTZ/i8p8H8=", "narHash": "sha256-b2vU6HzMR26JnHmnkvNZgefyfzAZOi9wLZdA+WOymHU=",
"owner": "ggerganov", "owner": "ggerganov",
"repo": "llama.cpp", "repo": "llama.cpp",
"rev": "21c17b5befc5f6be5992bc87fc1ba99d388561df", "rev": "6eb208d17ea29bb60295d9a2b5e7122dfb8f4b55",
"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": 1761672384,
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -158,11 +193,25 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1744868846, "lastModified": 1754340878,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1760596604,
"narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -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,14 +235,14 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1760998189,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
"type": "github" "type": "github"
}, },
"original": { "original": {

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
@@ -119,6 +122,7 @@
enable = true; enable = true;
lutris.enable = true; lutris.enable = true;
minecraft.enable = true; minecraft.enable = true;
vintagestory.enable = true;
}; };
common.nil.enable = true; common.nil.enable = true;
@@ -165,7 +169,7 @@
school = { school = {
enable = true; enable = true;
citrix = false; citrix = true;
}; };
games = { games = {
@@ -234,7 +238,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

@@ -57,6 +57,7 @@
orca-slicer orca-slicer
qemu qemu
protonvpn-gui protonvpn-gui
anki
]; ];
services.hardware.openrgb.enable = true; services.hardware.openrgb.enable = true;

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

@@ -110,7 +110,7 @@ in
"${modifier}+Shift+0" = "move container to workspace 10"; "${modifier}+Shift+0" = "move container to workspace 10";
"${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'"; "${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'";
"${modifier}+Shift+c" = "reload"; "${modifier}+Shift+c" = "reload";
"${modifier}+Shift+s" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"/home/eesim/Pictures/$(${pkgs.zenity}/bin/zenity --entry).png\""; "${modifier}+Shift+s" = "exec 'TMPFILE=\"$(mktemp)\"; ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"$TMPFILE\"; mv \"$TMPFILE\" \"/home/eesim/Pictures/$(${pkgs.zenity}/bin/zenity --entry).png\"'";
"${modifier}+Shift+o" = "exec '${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${localPackages.x86_64-linux.gazou}/bin/gazou | tail -n +2 | ${pkgs.wl-clipboard}/bin/wl-copy'"; "${modifier}+Shift+o" = "exec '${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${localPackages.x86_64-linux.gazou}/bin/gazou | tail -n +2 | ${pkgs.wl-clipboard}/bin/wl-copy'";
"${modifier}+Shift+q" = "kill"; "${modifier}+Shift+q" = "kill";
"${modifier}+p" = "focus mode_toggle"; "${modifier}+p" = "focus mode_toggle";

View File

@@ -14,6 +14,7 @@ in
++ optional cfg.gamescope.enable gamescope ++ optional cfg.gamescope.enable gamescope
++ optional cfg.discord.enable vesktop ++ optional cfg.discord.enable vesktop
++ optional cfg.minecraft.enable prismlauncher ++ optional cfg.minecraft.enable prismlauncher
++ optional cfg.vintagestory.enable vintagestory
++ optional cfg.ps4.enable localPackages.x86_64-linux.shadps4 ++ optional cfg.ps4.enable localPackages.x86_64-linux.shadps4
++ optionals cfg.lutris.enable [ lutris wine ]; ++ optionals cfg.lutris.enable [ lutris wine ];

View File

@@ -53,8 +53,7 @@ in
liberation_ttf liberation_ttf
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-extra ubuntu-classic
ubuntu_font_family
vazir-fonts vazir-fonts
font-awesome font-awesome
corefonts corefonts

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

View File

@@ -34,6 +34,12 @@ in
default = true; default = true;
}; };
vintagestory.enable = mkOption {
description = "Whether to install Vintage Story";
type = types.bool;
default = false;
};
minecraft.enable = mkOption { minecraft.enable = mkOption {
description = "Whether to install minecraft launcher"; description = "Whether to install minecraft launcher";
type = types.bool; type = types.bool;