Compare commits

...

8 Commits

8 changed files with 97 additions and 28 deletions

71
flake.lock generated
View File

@@ -6,7 +6,7 @@
"llm-agents", "llm-agents",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1771437256, "lastModified": 1771437256,
@@ -153,7 +153,25 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -242,20 +260,41 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771990646, "lastModified": 1772169624,
"narHash": "sha256-39FItSah91qXFKj1Zac4vQ+afdMOFOZkrQ6IyUs1eiU=", "narHash": "sha256-YHaTNllFu90LdXqiNNoeDFnKwioa6lT+gXGGBOAvlfo=",
"owner": "Titaniumtown", "owner": "Titaniumtown",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "dd265e7a1e6ae1d6b1fd06c120ef40cac287ec57", "rev": "68f2a686a27f0b6899b085fd6e653fffa59db444",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Titaniumtown", "owner": "Titaniumtown",
"ref": "fix/steamos-manager-desktop-switch", "ref": "pr/fix-sddm-switch-to-desktop",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"type": "github" "type": "github"
} }
}, },
"json2steamshortcut": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1763116114,
"narHash": "sha256-0gI7PnQUDZTFjhHgg0eP1SCJOvW5gw3sQ2UAMspipnQ=",
"owner": "ChrisOboe",
"repo": "json2steamshortcut",
"rev": "b829fe2871fd1736d2406724e4abbb492527cb08",
"type": "github"
},
"original": {
"owner": "ChrisOboe",
"repo": "json2steamshortcut",
"type": "github"
}
},
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
@@ -372,7 +411,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1771663801, "lastModified": 1771663801,
@@ -479,7 +518,7 @@
}, },
"oh-my-opencode": { "oh-my-opencode": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@@ -530,6 +569,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"jovian-nixos": "jovian-nixos", "jovian-nixos": "jovian-nixos",
"json2steamshortcut": "json2steamshortcut",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"llm-agents": "llm-agents", "llm-agents": "llm-agents",
"niri": "niri", "niri": "niri",
@@ -623,6 +663,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@@ -65,7 +65,7 @@
}; };
jovian-nixos = { jovian-nixos = {
url = "github:Titaniumtown/Jovian-NixOS/fix/steamos-manager-desktop-switch"; url = "github:Titaniumtown/Jovian-NixOS/pr/fix-sddm-switch-to-desktop";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -84,6 +84,11 @@
url = "github:yebei199/oh-my-opencode/nix"; url = "github:yebei199/oh-my-opencode/nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
json2steamshortcut = {
url = "github:ChrisOboe/json2steamshortcut";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =

View File

@@ -9,6 +9,7 @@
imports = [ imports = [
./gui.nix ./gui.nix
./desktop.nix ./desktop.nix
inputs.json2steamshortcut.homeModules.default
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
@@ -26,4 +27,18 @@
obs-pipewire-audio-capture obs-pipewire-audio-capture
]; ];
}; };
services.steam-shortcuts = {
enable = true;
overwriteExisting = true;
steamUserId = lib.strings.toInt (lib.strings.trim (builtins.readFile ./secrets/steam-user-id));
shortcuts = [
{
AppName = "Prism Launcher";
Exe = "${pkgs.prismlauncher}/bin/prismlauncher";
Icon = "${pkgs.prismlauncher}/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg";
Tags = [ "Game" ];
}
];
};
} }

View File

@@ -230,6 +230,8 @@ in
lfs.enable = true; lfs.enable = true;
ignores = [ ".sisyphus" ];
settings = { settings = {
init = { init = {
# master -> main # master -> main

View File

@@ -7,9 +7,9 @@
}: }:
let let
# what model should be used in place of haiku? # what model should be used in place of haiku?
haiku-model = "zai-coding-plan/glm-4.7"; haiku-model = "zai-coding-plan/glm-5";
opus-model = "zai-coding-plan/glm-4.7"; opus-model = "zai-coding-plan/glm-5";
ohMyOpencodeConfig = { ohMyOpencodeConfig = {
"$schema" = "$schema" =
@@ -17,28 +17,19 @@ let
agents = { agents = {
sisyphus.model = opus-model; sisyphus.model = opus-model;
sisyphus-junior.model = opus-model; sisyphus-junior.model = opus-model;
oracle = { oracle = opus-model;
model = "openrouter/openai/gpt-5.2-codex";
variant = "high";
};
librarian.model = haiku-model; librarian.model = haiku-model;
explore.model = haiku-model; explore.model = haiku-model;
multimodal-looker.model = "openrouter/qwen/qwen3-vl-30b-a3b-thinking"; multimodal-looker.model = "openrouter/qwen/qwen3-vl-30b-a3b-thinking";
prometheus.model = opus-model; prometheus.model = opus-model;
metis.model = opus-model; metis.model = opus-model;
momus = { momus = opus-model;
model = "openrouter/openai/gpt-5.2";
variant = "medium";
};
atlas.model = opus-model; atlas.model = opus-model;
}; };
categories = { categories = {
visual-engineering.model = "openrouter/google/gemini-3-pro"; visual-engineering.model = "openrouter/google/gemini-3-pro";
ultrabrain = { ultrabrain = opus-model;
model = "openrouter/openai/gpt-5.2-codex";
variant = "xhigh";
};
artistry = { artistry = {
model = "openrouter/google/gemini-3-pro"; model = "openrouter/google/gemini-3-pro";
variant = "max"; variant = "max";
@@ -203,10 +194,6 @@ in
openrouter = { openrouter = {
models = { models = {
"openai/gpt-oss-20b:free" = { }; "openai/gpt-oss-20b:free" = { };
"minimax/minimax-m2.1" = { };
"openai/gpt-5.2-codex" = {
variant = "xhigh";
};
}; };
options = { options = {
# TODO! use agenix here instead # TODO! use agenix here instead

Binary file not shown.

View File

@@ -206,7 +206,8 @@
# Enable sound with pipewire. # Enable sound with pipewire.
services.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio services.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio
security.rtkit.enable = true; # BUG! disable rtkit in order to fix mumble: https://github.com/NixOS/nixpkgs/issues/392992#issuecomment-2799867278
security.rtkit.enable = false;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;

View File

@@ -166,6 +166,10 @@
}; };
}; };
# Jovian-NixOS requires sddm
# https://github.com/Jovian-Experiments/Jovian-NixOS/commit/52f140c07493f8bb6cd0773c7e1afe3e1fd1d1fa
services.displayManager.sddm.wayland.enable = true;
# Disable gamescope from common.nix to avoid conflict with jovian-nixos # Disable gamescope from common.nix to avoid conflict with jovian-nixos
programs.gamescope.enable = lib.mkForce false; programs.gamescope.enable = lib.mkForce false;
} }