From f4e15b7e9045909760d04c50694abecd611f6751 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Thu, 6 Mar 2025 09:39:25 -0600 Subject: [PATCH] update soft-serve and disable stats server vscode --> master. update extensions. --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + nixos/configuration.nix | 0 nixos/hosts/shadowfax/config/soft-serve.nix | 4 ++-- nixos/hosts/shadowfax/default.nix | 7 +++++-- nixos/modules/nixos/editor/vscode.nix | 14 +++++++------- nixos/overlays/default.nix | 7 +++++++ nixos/profiles/role-dev.nix | 2 +- 8 files changed, 40 insertions(+), 12 deletions(-) delete mode 100644 nixos/configuration.nix diff --git a/flake.lock b/flake.lock index ac9b85a..3c3a517 100644 --- a/flake.lock +++ b/flake.lock @@ -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", diff --git a/flake.nix b/flake.nix index 63807fb..0253c38 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/nixos/configuration.nix b/nixos/configuration.nix deleted file mode 100644 index e69de29..0000000 diff --git a/nixos/hosts/shadowfax/config/soft-serve.nix b/nixos/hosts/shadowfax/config/soft-serve.nix index a096ed9..f0bf00a 100644 --- a/nixos/hosts/shadowfax/config/soft-serve.nix +++ b/nixos/hosts/shadowfax/config/soft-serve.nix @@ -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 = { diff --git a/nixos/hosts/shadowfax/default.nix b/nixos/hosts/shadowfax/default.nix index 1f1b983..09c8189 100644 --- a/nixos/hosts/shadowfax/default.nix +++ b/nixos/hosts/shadowfax/default.nix @@ -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 = { diff --git a/nixos/modules/nixos/editor/vscode.nix b/nixos/modules/nixos/editor/vscode.nix index f4aa558..2c6814a 100644 --- a/nixos/modules/nixos/editor/vscode.nix +++ b/nixos/modules/nixos/editor/vscode.nix @@ -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; diff --git a/nixos/overlays/default.nix b/nixos/overlays/default.nix index 3d58402..d0677a0 100644 --- a/nixos/overlays/default.nix +++ b/nixos/overlays/default.nix @@ -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; + }; + }; } diff --git a/nixos/profiles/role-dev.nix b/nixos/profiles/role-dev.nix index fd1c50f..a6777e4 100644 --- a/nixos/profiles/role-dev.nix +++ b/nixos/profiles/role-dev.nix @@ -63,9 +63,9 @@ myPkgs.mods gum skate - soft-serve unstable.glow vhs + unstable.soft-serve ]; programs = {