Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,238 changes: 1,238 additions & 0 deletions assets/hardware/gabi.json

Large diffs are not rendered by default.

47 changes: 43 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

nixos-facter-detection-modules.url = "github:haras-unicorn/nixos-facter-detection-modules/refs/tags/v1.0.0";
nixos-facter-detection-modules.url = "github:haras-unicorn/nixos-facter-detection-modules/refs/tags/v1.1.0";
nixos-facter-detection-modules.inputs.nixpkgs.follows = "nixpkgs";

nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";

home-manager.url = "github:nix-community/home-manager/release-26.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";

Expand Down Expand Up @@ -59,7 +62,7 @@
"https://haras.cachix.org"
"https://cache.nixos.org"
"https://nix-community.cachix.org"
"https://cuda-maintainers.cachix.org"
"https://cache.nixos-cuda.org"
"https://comfyui.cachix.org"
"https://cache.numtide.com"
"https://noctalia.cachix.org"
Expand All @@ -69,7 +72,7 @@
"haras.cachix.org-1:/HIo1JYqOIH1Nwk1EGXhuPPvDW0WekxIbY5CiXUZbYw="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
"cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
"comfyui.cachix.org-1:33mf9VzoIjzVbp0zwj+fT51HG0y31ZTK3nzYZAX0rec="
"niks3.numtide.com-1:DTx8wZduET09hRmMtKdQDxNNthLQETkc/yaX7M4qK0g="
"noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
Expand Down
1 change: 1 addition & 0 deletions src/cspell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -554,3 +554,4 @@ ignoreWords:
- wrapup
- multimodal
- omarchy
- gabi
4 changes: 2 additions & 2 deletions src/deprecated/comfyui.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
...
}:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = osConfig.dot.hardware.cuda;

chromium = osConfig.dot.programs.chromium.package;

package = if config.nixpkgs.config.cudaSupport then pkgs.comfy-ui-cuda else pkgs.comfy-ui;
package = if cuda then pkgs.comfy-ui-cuda else pkgs.comfy-ui;

mkComfyuiInstance = instanceName: rec {
comfyui = pkgs.writeShellApplication {
Expand Down
5 changes: 3 additions & 2 deletions src/deprecated/mistral-rs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ in
...
}:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = config.dot.hardware.cuda;

models = makeModels pkgs;
in
Expand All @@ -44,11 +44,12 @@ in
{
pkgs,
config,
osConfig,
lib,
...
}:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = osConfig.dot.hardware.cuda;

package = pkgs.mistral-rs;

Expand Down
4 changes: 2 additions & 2 deletions src/deprecated/ollama-openwebui.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
self.lib.deprecated.nixosModules.ollama-openwebui =
{ lib, config, ... }:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = config.dot.hardware.cuda;
in
lib.mkIf cuda {
dot.nixpkgs.allowUnfreePredicates = [
Expand All @@ -27,7 +27,7 @@
...
}:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = osConfig.dot.hardware.cuda;

chromium = osConfig.dot.programs.chromium.package;

Expand Down
4 changes: 4 additions & 0 deletions src/dev/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
helix
opencode
fd
ripgrep
fastmod
lazygit
git

prettier
yaml-language-server
Expand Down
11 changes: 11 additions & 0 deletions src/machines/gabi.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
machines.machines.gabi = {
dot.hardware.deviceType = "wsl";

dot.location.latitude = 45.815010;
dot.location.longitude = 15.981919;
dot.location.altitude = 125;
dot.location.accuracy = 30000;
dot.location.address = "Zagreb, Croatia";
};
}
12 changes: 6 additions & 6 deletions src/modules/ai/llama-cpp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

let
makePackage =
pkgs:
pkgs: cuda:
let
cuda = pkgs.config.cudaSupport;

system = pkgs.stdenv.hostPlatform.system;

Expand Down Expand Up @@ -101,9 +100,9 @@ in
}:
let
models = makeModels pkgs;
package = makePackage pkgs;
package = makePackage pkgs config.dot.hardware.cuda;
in
lib.mkIf config.nixpkgs.config.cudaSupport {
lib.mkIf config.dot.hardware.cuda {
environment.systemPackages = [
package
];
Expand Down Expand Up @@ -311,11 +310,12 @@ in
lib,
config,
pkgs,
osConfig,
...
}:
let
models = makeModels pkgs;
package = makePackage pkgs;
package = makePackage pkgs osConfig.dot.hardware.cuda;

imagePrompt = ''
You are an image captioner.
Expand Down Expand Up @@ -455,7 +455,7 @@ in
'';
};
in
lib.mkIf config.nixpkgs.config.cudaSupport {
lib.mkIf osConfig.dot.hardware.cuda {
dot.processing.nodes = {
llama-cpp-describe-image = {
note = "Describe an image into text";
Expand Down
4 changes: 2 additions & 2 deletions src/modules/ai/stable-diffusion-cpp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ in
...
}:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = config.dot.hardware.cuda;

models = makeModels pkgs;
in
Expand All @@ -62,7 +62,7 @@ in
...
}:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = osConfig.dot.hardware.cuda;

models = makeModels pkgs;

Expand Down
4 changes: 2 additions & 2 deletions src/modules/ai/whisper-cpp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ in
...
}:
let
cuda = config.nixpkgs.config.cudaSupport;
cuda = config.dot.hardware.cuda;

models = makeModels pkgs;
in
Expand All @@ -48,7 +48,7 @@ in
let
hardware = osConfig.dot.hardware;

cuda = config.nixpkgs.config.cudaSupport;
cuda = hardware.cuda;

models = makeModels pkgs;

Expand Down
60 changes: 33 additions & 27 deletions src/modules/desktop/toolbelt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

dmenu = lib.getExe config.dot.commands.dmenu;

kandoCmd = config.dot.commands.kando;
kando = lib.getExe config.dot.commands.kando;

ui =
if hardware.graphics then
Expand All @@ -110,7 +110,7 @@
common = ''
$env.DOT_TOOLBELT_TOOLS = r#'${tools}'# | from json
$env.DOT_TOOLBELT_DMENU = "${dmenu}"
$env.DOT_TOOLBELT_KANDO = "${if kandoCmd != null then lib.getExe kandoCmd else ""}"
$env.DOT_TOOLBELT_KANDO = "${kando}"
$env.PATH ++= [ ${path} ]

${builtins.readFile ./log.nu}
Expand Down Expand Up @@ -150,29 +150,35 @@
}
'';
in
lib.mkIf (hardware.editor || hardware.graphics) {
home.packages = [
toolbelt
pipeline
]
++ packages;

dot.desktop.keybinds = [
{
mods = [
"super"
];
key = "q";
command = lib.getExe pipeline;
}
{
mods = [
"super"
"ctrl"
];
key = "q";
command = lib.getExe toolbelt;
}
];
};
lib.mkIf
(
(hardware.editor || hardware.graphics)
&& config.dot.commands.dmenu != null
&& config.dot.commands.kando != null
)
{
home.packages = [
toolbelt
pipeline
]
++ packages;

dot.desktop.keybinds = [
{
mods = [
"super"
];
key = "q";
command = lib.getExe pipeline;
}
{
mods = [
"super"
"ctrl"
];
key = "q";
command = lib.getExe toolbelt;
}
];
};
}
Loading
Loading