chore: update dependencies, add basecamp secrets, improve desktop environment
- Update opencode to v1.1.34 - Add new opencode agents (Prometheus, Metis, Momus, Atlas) and categories - Switch m3ta-nixpkgs back to local path - Add basecamp client credentials for m3-ares and m3-kratos - Set NIXOS_OZONE_WL=1 for better Wayland app support in Hyprland - Remove redundant wrl.enable from flatpak portal config
This commit is contained in:
18
flake.lock
generated
18
flake.lock
generated
@@ -244,8 +244,8 @@
|
|||||||
"opencode": "opencode"
|
"opencode": "opencode"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768931358,
|
"lastModified": 1769186400,
|
||||||
"narHash": "sha256-IXEV3D4xK4SxhcwFQVjObdAeKkuJy+e54mFgpfuTLK8=",
|
"narHash": "sha256-9e9yvKJPufg0mTroH+vUUzxp+eX1tvy5QLSzKSw6uLI=",
|
||||||
"path": "/home/m3tam3re/p/NIX/nixpkgs",
|
"path": "/home/m3tam3re/p/NIX/nixpkgs",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
@@ -452,11 +452,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768569498,
|
"lastModified": 1768393167,
|
||||||
"narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=",
|
"narHash": "sha256-n2063BRjHde6DqAz2zavhOOiLUwA3qXt7jQYHyETjX8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114",
|
"rev": "2f594d5af95d4fdac67fba60376ec11e482041cb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -540,16 +540,16 @@
|
|||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768911228,
|
"lastModified": 1769153255,
|
||||||
"narHash": "sha256-iJ4WLNyP9i8baxp1FJJLv2VBD3XcE8nCruwO3GmSmK4=",
|
"narHash": "sha256-ardM8zEJWvTvsFMQZWivjGPB2uIqFw6QPAzrRjAHQKY=",
|
||||||
"owner": "anomalyco",
|
"owner": "anomalyco",
|
||||||
"repo": "opencode",
|
"repo": "opencode",
|
||||||
"rev": "e521fee0023a604bb6d5ef39b4b892cbf1a0f9d4",
|
"rev": "c130dd425a32fe1c1cd3747ea6565b0e6bf50100",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "anomalyco",
|
"owner": "anomalyco",
|
||||||
"ref": "v1.1.27",
|
"ref": "v1.1.34",
|
||||||
"repo": "opencode",
|
"repo": "opencode",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,8 +22,8 @@
|
|||||||
nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0";
|
nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0";
|
||||||
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
||||||
|
|
||||||
# m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs";
|
m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs";
|
||||||
m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs";
|
# m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs";
|
||||||
#
|
#
|
||||||
nur = {
|
nur = {
|
||||||
url = "github:nix-community/NUR";
|
url = "github:nix-community/NUR";
|
||||||
|
|||||||
@@ -319,6 +319,57 @@
|
|||||||
bash = "deny";
|
bash = "deny";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"Prometheus (Planner)" = {
|
||||||
|
model = "zai-coding-plan/glm-4.7";
|
||||||
|
permission = {
|
||||||
|
edit = "deny";
|
||||||
|
bash = "allow";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"Metis (Plan Consultant)" = {
|
||||||
|
model = "zai-coding-plan/glm-4.7";
|
||||||
|
permission = {
|
||||||
|
edit = "deny";
|
||||||
|
bash = "allow";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"Momus (Plan Reviewer)" = {
|
||||||
|
model = "zai-coding-plan/glm-4.7";
|
||||||
|
permission = {
|
||||||
|
edit = "deny";
|
||||||
|
bash = "allow";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"Atlas" = {
|
||||||
|
model = "zai-coding-plan/glm-4.7";
|
||||||
|
permission = {
|
||||||
|
edit = "deny";
|
||||||
|
bash = "allow";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"categories" = {
|
||||||
|
"visual-engineering" = {
|
||||||
|
"model" = "zai-coding-plan/glm-4.7";
|
||||||
|
};
|
||||||
|
"ultrabrain" = {
|
||||||
|
"model" = "zai-coding-plan/glm-4.7";
|
||||||
|
};
|
||||||
|
"artistry" = {
|
||||||
|
"model" = "zai-coding-plan/glm-4.7";
|
||||||
|
};
|
||||||
|
"quick" = {
|
||||||
|
"model" = "zai-coding-plan/glm-4.5-ai";
|
||||||
|
};
|
||||||
|
"unspecified-low" = {
|
||||||
|
"model" = "zai-coding-plan/glm-4.7";
|
||||||
|
};
|
||||||
|
"unspecified-high" = {
|
||||||
|
"model" = "zai-coding-plan/glm-4.7";
|
||||||
|
};
|
||||||
|
"writing" = {
|
||||||
|
"model" = "zai-coding-plan/glm-4.7";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
disabled_mcps = ["context7" "websearch"];
|
disabled_mcps = ["context7" "websearch"];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ in {
|
|||||||
"XDG_CURRENT_DESKTOP,Hyprland"
|
"XDG_CURRENT_DESKTOP,Hyprland"
|
||||||
"XDG_SESSION_TYPE,wayland"
|
"XDG_SESSION_TYPE,wayland"
|
||||||
"XDG_SESSION_DESKTOP,Hyprland"
|
"XDG_SESSION_DESKTOP,Hyprland"
|
||||||
|
"NIXOS_OZONE_WL,1"
|
||||||
];
|
];
|
||||||
|
|
||||||
input = {
|
input = {
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ in {
|
|||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
# xdg desktop intergration (required for flatpak)
|
# xdg desktop intergration (required for flatpak)
|
||||||
enable = true;
|
enable = true;
|
||||||
wlr.enable = true;
|
|
||||||
extraPortals = with pkgs; [
|
extraPortals = with pkgs; [
|
||||||
xdg-desktop-portal-hyprland
|
xdg-desktop-portal-hyprland
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -33,6 +33,14 @@
|
|||||||
file = ../../secrets/exa-key.age;
|
file = ../../secrets/exa-key.age;
|
||||||
owner = "m3tam3re";
|
owner = "m3tam3re";
|
||||||
};
|
};
|
||||||
|
basecamp-client-id = {
|
||||||
|
file = ../../secrets/basecamp-client-id.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
basecamp-client-secret = {
|
||||||
|
file = ../../secrets/basecamp-client-secret.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
tailscale-key.file = ../../secrets/tailscale-key.age;
|
tailscale-key.file = ../../secrets/tailscale-key.age;
|
||||||
m3tam3re-secrets = {
|
m3tam3re-secrets = {
|
||||||
file = ../../secrets/m3tam3re-secrets.age;
|
file = ../../secrets/m3tam3re-secrets.age;
|
||||||
|
|||||||
@@ -5,9 +5,7 @@
|
|||||||
file = ../../secrets/anytype-key.age;
|
file = ../../secrets/anytype-key.age;
|
||||||
owner = "m3tam3re";
|
owner = "m3tam3re";
|
||||||
};
|
};
|
||||||
tailscale-key = {
|
tailscale-key = { file = ../../secrets/tailscale-key.age; };
|
||||||
file = ../../secrets/tailscale-key.age;
|
|
||||||
};
|
|
||||||
wg-DE = {
|
wg-DE = {
|
||||||
file = ../../secrets/wg-DE.age;
|
file = ../../secrets/wg-DE.age;
|
||||||
path = "/etc/wireguard/DE.conf";
|
path = "/etc/wireguard/DE.conf";
|
||||||
@@ -40,6 +38,14 @@
|
|||||||
file = ../../secrets/exa-key.age;
|
file = ../../secrets/exa-key.age;
|
||||||
owner = "m3tam3re";
|
owner = "m3tam3re";
|
||||||
};
|
};
|
||||||
|
basecamp-client-id = {
|
||||||
|
file = ../../secrets/basecamp-client-id.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
basecamp-client-secret = {
|
||||||
|
file = ../../secrets/basecamp-client-secret.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ in {
|
|||||||
"secrets/paperless-key.age".publicKeys = systems ++ users;
|
"secrets/paperless-key.age".publicKeys = systems ++ users;
|
||||||
"secrets/ref-key.age".publicKeys = systems ++ users;
|
"secrets/ref-key.age".publicKeys = systems ++ users;
|
||||||
"secrets/exa-key.age".publicKeys = systems ++ users;
|
"secrets/exa-key.age".publicKeys = systems ++ users;
|
||||||
|
"secrets/basecamp-client-id.age".publicKeys = systems ++ users;
|
||||||
|
"secrets/basecamp-client-secret.age".publicKeys = systems ++ users;
|
||||||
"secrets/gitea-runner-token.age".publicKeys = systems ++ users;
|
"secrets/gitea-runner-token.age".publicKeys = systems ++ users;
|
||||||
"secrets/restreamer-env.age".publicKeys = systems ++ users;
|
"secrets/restreamer-env.age".publicKeys = systems ++ users;
|
||||||
"secrets/searx.age".publicKeys = systems ++ users;
|
"secrets/searx.age".publicKeys = systems ++ users;
|
||||||
|
|||||||
BIN
secrets/basecamp-client-id.age
Normal file
BIN
secrets/basecamp-client-id.age
Normal file
Binary file not shown.
21
secrets/basecamp-client-secret.age
Normal file
21
secrets/basecamp-client-secret.age
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 4NLKrw eqiq6a9Ht012v9ryAt2uZwpCU5/DFbiMZIkH0A/ovhc
|
||||||
|
c2ubOjYEc6RjhrZUCyKvB7chJwlCBv1KeIXdXlYcyNA
|
||||||
|
-> ssh-ed25519 5kwcsA R+KKgXolqFgs3sPFKLWBj8CYMHvsE0vcoPYjqgaYSDc
|
||||||
|
jdl1BcHDXY3lvAfFKeHl8lNgbjbxLPOL+5OaPBsJC5o
|
||||||
|
-> ssh-ed25519 9d4YIQ KYeIi3u2JB3efI5pSlc4up2wgAvR+X1xsHuRSZmr5RY
|
||||||
|
Qy6wagBuOXuy5b23stKEc/zfMpN53/56LKMgPFd5fwo
|
||||||
|
-> ssh-ed25519 3Bcr1w yYclbDnxBkGQF+MmcqNDG2VHZDcXK01Orl2c0L4auy4
|
||||||
|
wbC9r7P4hnJT+V0Ic3Pk9nQ5ZUoPL+/qR9Ab5OHv3d0
|
||||||
|
-> ssh-rsa DQlE7w
|
||||||
|
CQBYcl5SvyoDAm5n1QWE9o2er5GxYZvG2zrBtOPs+S7gnm6yHL2rtKDfxf+tpp/E
|
||||||
|
8xJHSi6t9zTWYwZ+udU8gjmawe8GcaWGYOHqjCd4H6Ic5c1aMMfUQsPR2aWlJ7R5
|
||||||
|
4B1D83pZ/PHp1Qqb/AJKoiw3DNo4KrvYS+nX4FXuDD8o9JRuY5KjbY+9E2UcHx0s
|
||||||
|
8XGZq26TY8I2hVA8519bZeI4FTqoBx0yUBuE3VjTlrd/XtgpvNk0YswyMBiqpdhG
|
||||||
|
PY+KZAnEPw3TbFtfmqbLk5QXrm4pn/TE/z4kzN9+3CkT2zbBBPGwaBAtQsOQ6yKL
|
||||||
|
ZQRtnEm9FJzOBu3fFodeBfea8vEzEmuro+zbw/94tk0zjpMzfSehRfLE8tusgO+S
|
||||||
|
/W/7yzlMVeutlWbzwpMZ4mALjz/PAYq8O3Kh88dbu9XEh0i/oWPBJiHlUdYND2YJ
|
||||||
|
5WOSlXDnotRmwB8vGmyPWS72jBfgPZLVfA7y73RzOhc6vwo4jU5Nh6ee+3LPOjfW
|
||||||
|
|
||||||
|
--- 6X7pxwraQpXikkDgLrY3ay7zcwdk9U9LHx/MP8jEgcw
|
||||||
|
<3‘jÂ<6A>ö¼uWÙF“’DæÙŸ™$Hð¹Ç†s)àSÚˆ›/ïÂëº pí3üA‰Sö^ùïóïVß‹u@9‡»µ´rš+L2
|
||||||
Reference in New Issue
Block a user