configurations: update

This commit is contained in:
2023-09-17 13:00:37 +02:00
parent e70cb83ce8
commit 96c425a05e
13 changed files with 218 additions and 162 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ in
config.nixpkgs.config = lib.mkIf cfg.enable{
allowUnfree = lib.mkDefault true;
joypixels.acceptLicense = lib.mkDefault true;
firefox.enablePlasmaBrowserIntegration = lib.mkDefault true;
firefox.enablePlasmaBrowserIntegration = lib.mkDefault config.services.xserver.desktopManager.plasma5.enable;
};
config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [inputs.emacs-overlay.overlay];
}
@@ -31,7 +31,7 @@ with materusPkgs.lib;
tdesktop
mpv
ani-cli
(pkgs.obsidian.override {electron = pkgs.electron;})
(pkgs.obsidian)
spotify
thunderbird
keepassxc
+3 -2
View File
@@ -4,11 +4,12 @@ let
in
{
options.materus.profile.editor.code.enable = materusPkgs.lib.mkBoolOpt config.materus.profile.enableDesktop "Enable VSCodium with materus cfg";
options.materus.profile.editor.code.fhs.enable = materusPkgs.lib.mkBoolOpt false "Use fhs vscodium";
options.materus.profile.editor.code.fhs.packages = lib.mkOption { default = (ps: []);};
config = lib.mkIf cfg.enable {
programs.vscode = {
enable = lib.mkDefault true;
package = lib.mkDefault pkgs.vscodium;
package = lib.mkDefault (if (cfg.fhs.enable) then (pkgs.vscodium.fhsWithPackages cfg.fhs.packages) else pkgs.vscodium);
mutableExtensionsDir = lib.mkDefault true;
};
materus.profile.fonts.enable = lib.mkDefault true;
+21 -1
View File
@@ -1,10 +1,30 @@
{ config, pkgs, lib, materusPkgs, inputs, ... }:
let
optHip = pkgs.stdenv.mkDerivation rec {
pname = "optHip";
version = pkgs.hip.version;
dontFixup = true;
dontBuild = true;
dontPatchELF = true;
dontUnpack = true;
sourceRoot = ".";
buildInputs = [
pkgs.hip
];
installPhase = ''
mkdir -p $out/opt/rocm
ln -s ${pkgs.hip} $out/opt/rocm/hip
'';
};
steamPkg = pkgs.steam.override {
extraPkgs = pkgs: [
config.materus.profile.packages.firefox
optHip #for blender
pkgs.steamcmd
pkgs.nss_latest
pkgs.libstrangle