update soft-serve and disable stats server
Some checks failed
Build / nix-build (native-x86_64, gandalf) (push) Failing after 21s
Build / nix-build (native-x86_64, telperion) (push) Successful in 4m50s
Build / nix-build (native-x86_64, shadowfax) (push) Failing after 29m41s

vscode --> master. update extensions.
This commit is contained in:
Joseph Hanson 2025-03-06 09:39:25 -06:00
parent 638158ecc5
commit f4e15b7e90
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
8 changed files with 40 additions and 12 deletions

17
flake.lock generated
View file

@ -1031,6 +1031,22 @@
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1741273048,
"narHash": "sha256-Iwb7l9abMLuREi0XOULEzKm2sU2NUEhZQ93mwArlkjc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5a8afe6feb69907dde2006a1a784ab809088d751",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-ovmf": {
"locked": {
"lastModified": 1708984720,
@ -1329,6 +1345,7 @@
"nix-vscode-extensions": "nix-vscode-extensions",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvirt-git": "nixvirt-git",
"nur": "nur",

View file

@ -175,6 +175,7 @@
# Nixpkgs and unstable
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
# Lix - Substitution of the Nix package manager, focused on correctness, usability, and growth and committed to doing right by its community.
# https://git.lix.systems/lix-project/lix

View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
name = "Soft Serve";
log = {
format = "text";
@ -27,6 +26,7 @@
public_url = "http://10.1.1.61:23232";
};
stats = {
enabled = false;
listen_addr = "10.1.1.61:23233";
};
db = {

View file

@ -117,8 +117,10 @@ in {
# Minio
9000 # console web interface
9001 # api interface
# Beszel-agent
45876
# Soft-serve
23231 # SSH
23232 # HTTP
9418 # Git
# scrypted
45005
];
@ -180,6 +182,7 @@ in {
soft-serve = {
enable = true;
settings = import ./config/soft-serve.nix {};
package = pkgs.unstable.soft-serve;
};
sunshine = {

View file

@ -45,23 +45,23 @@ with lib; let
{
name = "copilot";
publisher = "github";
version = "1.261.0";
sha256 = "sha256-8IElcnSmngget8gduhdJUMx++PslOg58zcLwhRZCNyk=";
version = "1.277.0";
sha256 = "sha256-cRz5gby2VOk4QS+Z67Sm/rb5heBANJFitkn+s06yVv0=";
}
{
# Apparently there's no insiders build for copilot-chat so the latest isn't what we want.
# The latest generally targets insiders build of vs code right now and it won't load on stable.
name = "copilot-chat";
publisher = "github";
version = "0.23.2";
sha256 = "sha256-OT+ynCA+z8TvDE02hkOEQcJ1mBNz6geLxLOFtgIgKZE=";
version = "0.25.0";
sha256 = "sha256-rureag8PaZwEME41EdaDMIVnYN17CqBhu9Pa5SuWRKU=";
}
{
# Same issue as the above -- auto pulling nightly builds not compatible with vscode stable.
name = "python";
publisher = "ms-python";
version = "2024.22.2";
sha256 = "sha256-uVv4kpTf0W82Gvoju0Q/HKf6SpN2mwuYO7NItlRoezI=";
version = "2025.2.0";
sha256 = "sha256-f573A/7s8jVfH1f3ZYZSTftrfBs6iyMWewhorX4Z0Nc=";
}
];
# Extract extension strings and coerce them to a list of valid attribute paths.
@ -82,7 +82,7 @@ in {
# Enable vscode & addons
environment.systemPackages = with pkgs; [
(vscode-with-extensions.override {
inherit (unstable) vscode;
inherit (master) vscode;
# Merge all the extension packages together.
vscodeExtensions =
vscodeCommunityExtensionsPackages ++ nixpkgsExtensionsPackages ++ marketplaceExtensionsPackages;

View file

@ -39,4 +39,11 @@ in {
sonarr = final.unstable.callPackage ./arr/sonarr.nix {};
};
};
master-packages = final: prev: {
master = import inputs.nixpkgs-master {
inherit (final) system;
config.allowUnfree = true;
};
};
}

View file

@ -63,9 +63,9 @@
myPkgs.mods
gum
skate
soft-serve
unstable.glow
vhs
unstable.soft-serve
];
programs = {