Go back to using Plasma stable since building Plasma beta is annoying

This commit is contained in:
SIPB 2025-09-29 11:33:39 -04:00
parent 7d7375d9e0
commit e29fc378aa
3 changed files with 17 additions and 44 deletions

View file

@ -6,7 +6,6 @@
config, config,
lib, lib,
pkgs, pkgs,
pkgs-plasma-beta,
... ...
}: }:
@ -16,31 +15,26 @@
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
nixpkgs.overlays = [
(self: super: {
kdePackages = pkgs-plasma-beta.kdePackages;
})
];
nix = { nix = {
# Uncomment those lines to use BOSS-BABY for remote builds
settings = { settings = {
experimental-features = [ experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
builders-use-substitutes = true; # builders-use-substitutes = true;
max-jobs = 0; # max-jobs = 0;
}; };
distributedBuilds = true; # distributedBuilds = true;
buildMachines = [ # buildMachines = [
{ # {
hostName = "boss-baby"; # hostName = "boss-baby";
sshUser = "root"; # sshUser = "root";
protocol = "ssh-ng"; # protocol = "ssh-ng";
system = pkgs.stdenv.hostPlatform.system; # system = pkgs.stdenv.hostPlatform.system;
maxJobs = 4; # maxJobs = 4;
} # }
]; # ];
}; };
boot = { boot = {

25
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1758690382, "lastModified": 1759036355,
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e643668fd71b949c53f8626614b21ff71a07379d", "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -16,26 +16,9 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-plasma-beta": {
"locked": {
"lastModified": 1758387133,
"narHash": "sha256-Jr/ncxq/IaLkTsTvsqtYFIG5Qe3z8iLqoNKA66PnNas=",
"owner": "K900",
"repo": "nixpkgs",
"rev": "34c691bb97106f5236160b1a163025fcc78f6670",
"type": "github"
},
"original": {
"owner": "K900",
"ref": "plasma-6.5",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nixpkgs-plasma-beta": "nixpkgs-plasma-beta"
} }
} }
}, },

View file

@ -5,24 +5,20 @@
# i.e. nixos-24.11 # i.e. nixos-24.11
# Use `nix flake update` to update the flake to the latest revision of the chosen release channel. # Use `nix flake update` to update the flake to the latest revision of the chosen release channel.
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-plasma-beta.url = "github:K900/nixpkgs/plasma-6.5";
}; };
outputs = outputs =
inputs@{ inputs@{
self, self,
nixpkgs, nixpkgs,
nixpkgs-plasma-beta,
... ...
}: }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
pkgs-plasma-beta = import nixpkgs-plasma-beta { inherit system; };
in in
{ {
nixosConfigurations.chromatic-aberration = nixpkgs.lib.nixosSystem { nixosConfigurations.chromatic-aberration = nixpkgs.lib.nixosSystem {
modules = [ ./configuration.nix ]; modules = [ ./configuration.nix ];
specialArgs.pkgs-plasma-beta = pkgs-plasma-beta;
}; };
formatter.${system} = pkgs.nixfmt-tree; formatter.${system} = pkgs.nixfmt-tree;
}; };