Compare commits
8 Commits
b0fe816465
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
05b237f49c
|
|||
|
daee9c3246
|
|||
|
70ca2d3323
|
|||
|
86ac120d54
|
|||
|
201436ef28
|
|||
|
d453bc1bdd
|
|||
|
b8be06a8c7
|
|||
|
d85434dff2
|
71
flake.lock
generated
71
flake.lock
generated
@@ -6,7 +6,7 @@
|
||||
"llm-agents",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2"
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771437256,
|
||||
@@ -153,7 +153,25 @@
|
||||
},
|
||||
"flake-utils": {
|
||||
"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": {
|
||||
"lastModified": 1731533236,
|
||||
@@ -242,20 +260,41 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771990646,
|
||||
"narHash": "sha256-39FItSah91qXFKj1Zac4vQ+afdMOFOZkrQ6IyUs1eiU=",
|
||||
"lastModified": 1772169624,
|
||||
"narHash": "sha256-YHaTNllFu90LdXqiNNoeDFnKwioa6lT+gXGGBOAvlfo=",
|
||||
"owner": "Titaniumtown",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "dd265e7a1e6ae1d6b1fd06c120ef40cac287ec57",
|
||||
"rev": "68f2a686a27f0b6899b085fd6e653fffa59db444",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Titaniumtown",
|
||||
"ref": "fix/steamos-manager-desktop-switch",
|
||||
"ref": "pr/fix-sddm-switch-to-desktop",
|
||||
"repo": "Jovian-NixOS",
|
||||
"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": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
@@ -372,7 +411,7 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771663801,
|
||||
@@ -479,7 +518,7 @@
|
||||
},
|
||||
"oh-my-opencode": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
@@ -530,6 +569,7 @@
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
"jovian-nixos": "jovian-nixos",
|
||||
"json2steamshortcut": "json2steamshortcut",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"llm-agents": "llm-agents",
|
||||
"niri": "niri",
|
||||
@@ -623,6 +663,21 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
|
||||
@@ -84,6 +84,11 @@
|
||||
url = "github:yebei199/oh-my-opencode/nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
json2steamshortcut = {
|
||||
url = "github:ChrisOboe/json2steamshortcut";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
imports = [
|
||||
./gui.nix
|
||||
./desktop.nix
|
||||
inputs.json2steamshortcut.homeModules.default
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
@@ -26,4 +27,18 @@
|
||||
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" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -230,6 +230,8 @@ in
|
||||
|
||||
lfs.enable = true;
|
||||
|
||||
ignores = [ ".sisyphus" ];
|
||||
|
||||
settings = {
|
||||
init = {
|
||||
# master -> main
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
}:
|
||||
let
|
||||
# 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 = {
|
||||
"$schema" =
|
||||
@@ -17,28 +17,19 @@ let
|
||||
agents = {
|
||||
sisyphus.model = opus-model;
|
||||
sisyphus-junior.model = opus-model;
|
||||
oracle = {
|
||||
model = "openrouter/openai/gpt-5.2-codex";
|
||||
variant = "high";
|
||||
};
|
||||
oracle = opus-model;
|
||||
librarian.model = haiku-model;
|
||||
explore.model = haiku-model;
|
||||
multimodal-looker.model = "openrouter/qwen/qwen3-vl-30b-a3b-thinking";
|
||||
|
||||
prometheus.model = opus-model;
|
||||
metis.model = opus-model;
|
||||
momus = {
|
||||
model = "openrouter/openai/gpt-5.2";
|
||||
variant = "medium";
|
||||
};
|
||||
momus = opus-model;
|
||||
atlas.model = opus-model;
|
||||
};
|
||||
categories = {
|
||||
visual-engineering.model = "openrouter/google/gemini-3-pro";
|
||||
ultrabrain = {
|
||||
model = "openrouter/openai/gpt-5.2-codex";
|
||||
variant = "xhigh";
|
||||
};
|
||||
ultrabrain = opus-model;
|
||||
artistry = {
|
||||
model = "openrouter/google/gemini-3-pro";
|
||||
variant = "max";
|
||||
@@ -203,10 +194,6 @@ in
|
||||
openrouter = {
|
||||
models = {
|
||||
"openai/gpt-oss-20b:free" = { };
|
||||
"minimax/minimax-m2.1" = { };
|
||||
"openai/gpt-5.2-codex" = {
|
||||
variant = "xhigh";
|
||||
};
|
||||
};
|
||||
options = {
|
||||
# TODO! use agenix here instead
|
||||
|
||||
BIN
home-manager/secrets/steam-user-id
Normal file
BIN
home-manager/secrets/steam-user-id
Normal file
Binary file not shown.
@@ -206,7 +206,8 @@
|
||||
|
||||
# Enable sound with pipewire.
|
||||
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 = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
|
||||
@@ -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
|
||||
programs.gamescope.enable = lib.mkForce false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user