Add jitsi to allowed pkgs
This commit is contained in:
parent
9cef7c614b
commit
86238b157c
3 changed files with 31 additions and 21 deletions
|
|
@ -91,7 +91,8 @@ in
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
hardware = {
|
hardware = {
|
||||||
pulseaudio.enable = false;
|
pulseaudio.enable = false;
|
||||||
cpu.${config.conf.cpu}.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
cpu.${config.conf.cpu}.updateMicrocode =
|
||||||
|
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
};
|
};
|
||||||
|
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
|
|
||||||
44
flake.nix
44
flake.nix
|
|
@ -54,10 +54,28 @@
|
||||||
outputs =
|
outputs =
|
||||||
{ self, ... }@inputs:
|
{ self, ... }@inputs:
|
||||||
let
|
let
|
||||||
|
permittedPackages = [
|
||||||
|
"olm-3.2.16"
|
||||||
|
# well done dotnet...
|
||||||
|
# this is just for omnisharp
|
||||||
|
"dotnet-core-combined"
|
||||||
|
"dotnet-wrapped-combined"
|
||||||
|
"dotnet-combined"
|
||||||
|
"dotnet-sdk-6.0.428"
|
||||||
|
"dotnet-sdk-wrapped-6.0.428"
|
||||||
|
"dotnet-sdk-6.0.136"
|
||||||
|
"dotnet-sdk-wrapped-6.0.136"
|
||||||
|
"dotnet-sdk-7.0.120"
|
||||||
|
"dotnet-sdk-wrapped-7.0.120"
|
||||||
|
"dotnet-sdk-7.0.410"
|
||||||
|
"dotnet-sdk-wrapped-7.0.410"
|
||||||
|
"jitsi-meet-1.0.8043"
|
||||||
|
];
|
||||||
stable = import inputs.stable {
|
stable = import inputs.stable {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
|
permittedInsecurePackages = permittedPackages;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
pkgs = import inputs.nixpkgs {
|
pkgs = import inputs.nixpkgs {
|
||||||
|
|
@ -65,33 +83,23 @@
|
||||||
overlays = [ inputs.nur.overlays.default ];
|
overlays = [ inputs.nur.overlays.default ];
|
||||||
config = {
|
config = {
|
||||||
allowUnsupportedSystem = true;
|
allowUnsupportedSystem = true;
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = permittedPackages;
|
||||||
"olm-3.2.16"
|
|
||||||
# well done dotnet...
|
|
||||||
# this is just for omnisharp
|
|
||||||
"dotnet-core-combined"
|
|
||||||
"dotnet-wrapped-combined"
|
|
||||||
"dotnet-combined"
|
|
||||||
"dotnet-sdk-6.0.428"
|
|
||||||
"dotnet-sdk-wrapped-6.0.428"
|
|
||||||
"dotnet-sdk-6.0.136"
|
|
||||||
"dotnet-sdk-wrapped-6.0.136"
|
|
||||||
"dotnet-sdk-7.0.120"
|
|
||||||
"dotnet-sdk-wrapped-7.0.120"
|
|
||||||
"dotnet-sdk-7.0.410"
|
|
||||||
"dotnet-sdk-wrapped-7.0.410"
|
|
||||||
];
|
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
dashNixLib = import ./lib {
|
dashNixLib = import ./lib {
|
||||||
inherit self inputs pkgs;
|
inherit
|
||||||
|
self
|
||||||
|
inputs
|
||||||
|
pkgs
|
||||||
|
stable
|
||||||
|
;
|
||||||
lib = inputs.nixpkgs.lib;
|
lib = inputs.nixpkgs.lib;
|
||||||
};
|
};
|
||||||
docs = import ./docs {
|
docs = import ./docs {
|
||||||
inherit inputs pkgs;
|
inherit inputs pkgs stable;
|
||||||
lib = inputs.nixpkgs.lib;
|
lib = inputs.nixpkgs.lib;
|
||||||
build_systems = dashNixLib.build_systems;
|
build_systems = dashNixLib.build_systems;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
self,
|
self,
|
||||||
|
stable,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
@ -68,7 +69,6 @@
|
||||||
},
|
},
|
||||||
additionalInputs ? { },
|
additionalInputs ? { },
|
||||||
overridePkgs ? false,
|
overridePkgs ? false,
|
||||||
pkgOverrides ? pkgs,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
builtins.listToAttrs (
|
builtins.listToAttrs (
|
||||||
|
|
@ -90,7 +90,8 @@
|
||||||
additionalHomeConfig
|
additionalHomeConfig
|
||||||
root
|
root
|
||||||
;
|
;
|
||||||
pkgs = if overridePkgs then pkgs else pkgOverrides;
|
pkgs = if overridePkgs then pkgs else stable;
|
||||||
|
alternativePkgs = if overridePkgs then stable else pkgs;
|
||||||
hostName = name;
|
hostName = name;
|
||||||
homeMods = mods.home;
|
homeMods = mods.home;
|
||||||
additionalHomeMods = additionalMods.home;
|
additionalHomeMods = additionalMods.home;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue