Go back to using Plasma stable since building Plasma beta is annoying
This commit is contained in:
parent
7d7375d9e0
commit
e29fc378aa
3 changed files with 17 additions and 44 deletions
|
@ -6,7 +6,6 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
pkgs-plasma-beta,
|
||||
...
|
||||
}:
|
||||
|
||||
|
@ -16,31 +15,26 @@
|
|||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
kdePackages = pkgs-plasma-beta.kdePackages;
|
||||
})
|
||||
];
|
||||
|
||||
nix = {
|
||||
# Uncomment those lines to use BOSS-BABY for remote builds
|
||||
settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
builders-use-substitutes = true;
|
||||
max-jobs = 0;
|
||||
# builders-use-substitutes = true;
|
||||
# max-jobs = 0;
|
||||
};
|
||||
distributedBuilds = true;
|
||||
buildMachines = [
|
||||
{
|
||||
hostName = "boss-baby";
|
||||
sshUser = "root";
|
||||
protocol = "ssh-ng";
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
maxJobs = 4;
|
||||
}
|
||||
];
|
||||
# distributedBuilds = true;
|
||||
# buildMachines = [
|
||||
# {
|
||||
# hostName = "boss-baby";
|
||||
# sshUser = "root";
|
||||
# protocol = "ssh-ng";
|
||||
# system = pkgs.stdenv.hostPlatform.system;
|
||||
# maxJobs = 4;
|
||||
# }
|
||||
# ];
|
||||
};
|
||||
|
||||
boot = {
|
||||
|
|
25
flake.lock
generated
25
flake.lock
generated
|
@ -2,11 +2,11 @@
|
|||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1758690382,
|
||||
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
|
||||
"lastModified": 1759036355,
|
||||
"narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
|
||||
"rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -16,26 +16,9 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-plasma-beta": "nixpkgs-plasma-beta"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -5,24 +5,20 @@
|
|||
# i.e. nixos-24.11
|
||||
# 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-plasma-beta.url = "github:K900/nixpkgs/plasma-6.5";
|
||||
};
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-plasma-beta,
|
||||
...
|
||||
}:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
pkgs-plasma-beta = import nixpkgs-plasma-beta { inherit system; };
|
||||
in
|
||||
{
|
||||
nixosConfigurations.chromatic-aberration = nixpkgs.lib.nixosSystem {
|
||||
modules = [ ./configuration.nix ];
|
||||
specialArgs.pkgs-plasma-beta = pkgs-plasma-beta;
|
||||
};
|
||||
formatter.${system} = pkgs.nixfmt-tree;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue