Updated system

This commit is contained in:
Emmet 2025-11-15 16:50:38 -06:00
parent ab7221fba9
commit 6f52c1d453
8 changed files with 312 additions and 264 deletions

View file

@ -1,8 +1,15 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
pkgs-stable,
...
}:
let
cfg = config.userSettings.art;
in {
in
{
options = {
userSettings.art = {
enable = lib.mkEnableOption "Enable art apps";
@ -10,7 +17,7 @@ in {
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
home.packages = with pkgs-stable; [
krita
pinta
inkscape
@ -22,7 +29,7 @@ in {
];
userSettings.blender.enable = true;
xdg.mimeApps.defaultApplications = lib.mkForce {
"image/svg+xml" = ["org.inkscape.Inkscape.desktop"];
"image/svg+xml" = [ "org.inkscape.Inkscape.desktop" ];
};
};
}

View file

@ -1,8 +1,15 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
pkgs-stable,
...
}:
let
cfg = config.userSettings.engineering;
in {
in
{
options = {
userSettings.engineering = {
enable = lib.mkEnableOption "Enable engineering programs";
@ -10,7 +17,7 @@ in {
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
home.packages = with pkgs-stable; [
freecad
openscad
kicad
@ -24,7 +31,23 @@ in {
genericName = "3D Printing Software";
icon = "cura-icon";
exec = "cura -platformtheme gtk3 %u";
mimeType = [ "model/stl" "application/vnd.ms-3mfdocument" "application/prs.wavefront-obj" "image/bmp" "image/gif" "image/jpeg" "image/png" "text/x-gcode" "application/x-amf" "application/x-ply" "application/x-ctm" "model/vnd.collada+xml" "model/gltf-binary" "model/gltf+json" "model/vnd.collada+xml+zip" ];
mimeType = [
"model/stl"
"application/vnd.ms-3mfdocument"
"application/prs.wavefront-obj"
"image/bmp"
"image/gif"
"image/jpeg"
"image/png"
"text/x-gcode"
"application/x-amf"
"application/x-ply"
"application/x-ctm"
"model/vnd.collada+xml"
"model/gltf-binary"
"model/gltf+json"
"model/vnd.collada+xml+zip"
];
terminal = false;
type = "Application";
prefersNonDefaultGPU = true;

View file

@ -391,7 +391,6 @@ in
"size 70% 70%,title:(Resource)"
"center,title:(Resource)"
"tile,title:(Godot)"
"suppressevent maximize,class:^(steam)$"
"float,title:^(Unlock Database - KeePassXC)$"
"size 80% 85%,title:^(Unlock Database - KeePassXC)$"
"center,title:^(Unlock Database - KeepassXC)$"

View file

@ -1,8 +1,14 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.userSettings.music;
in {
in
{
options = {
userSettings.music = {
enable = lib.mkEnableOption "Enable apps for making music";
@ -11,26 +17,24 @@ in {
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
ardour
rosegarden
tenacity
mediainfo
easytag
bottles
# The following requires 64-bit FL Studio (FL64) to be installed to a bottle
# With a bottle name of "FL Studio"
(pkgs.writeShellScriptBin "flstudio" ''
#!/bin/sh
if [ -z "$1" ]
then
bottles-cli run -b "FL Studio" -p FL64
#flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64
else
filepath=$(winepath --windows "$1")
echo \'"$filepath"\'
bottles-cli run -b "FL Studio" -p "FL64" --args \'"$filepath"\'
#flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 -args "$filepath"
fi
#!/bin/sh
if [ -z "$1" ]
then
bottles-cli run -b "FL Studio" -p FL64
#flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64
else
filepath=$(winepath --windows "$1")
echo \'"$filepath"\'
bottles-cli run -b "FL Studio" -p "FL64" --args \'"$filepath"\'
#flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 -args "$filepath"
fi
'')
(pkgs.makeDesktopItem {
name = "flstudio";
@ -39,7 +43,7 @@ in {
terminal = false;
type = "Application";
icon = "flstudio";
mimeTypes = ["application/octet-stream"];
mimeTypes = [ "application/octet-stream" ];
})
(stdenv.mkDerivation {
name = "flstudio-icon";

View file

@ -1,8 +1,15 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
pkgs-stable,
...
}:
let
cfg = config.userSettings.recording;
in {
in
{
options = {
userSettings.recording = {
enable = lib.mkEnableOption "Enable studio recording and editing programs";
@ -16,10 +23,9 @@ in {
obs-vaapi
obs-scale-to-sound
];
home.packages = with pkgs; [
home.packages = with pkgs-stable; [
kdePackages.kdenlive
tenacity
ardour
#tenacity
];
};
}