remove mainUser alias
je suis définitevement pas la patate la plus croustillante du four
This commit is contained in:
parent
879bd46295
commit
725257485f
GPG key ID:
7D01D7B105E77166
5 changed files with 148 additions and 144 deletions
|
|
@ -1,87 +1,87 @@
|
||||||
{ lib
|
{
|
||||||
, fetchFromGitHub
|
lib,
|
||||||
, stdenv
|
fetchFromGitHub,
|
||||||
, wrapQtAppsHook
|
stdenv,
|
||||||
, SDL2
|
wrapQtAppsHook,
|
||||||
, frei0r
|
SDL2,
|
||||||
, ladspaPlugins
|
frei0r,
|
||||||
, gettext
|
ladspaPlugins,
|
||||||
, mlt
|
gettext,
|
||||||
, jack1
|
mlt,
|
||||||
, pkg-config
|
jack1,
|
||||||
, fftw
|
pkg-config,
|
||||||
, qtbase
|
fftw,
|
||||||
, qttools
|
qtbase,
|
||||||
, qtmultimedia
|
qttools,
|
||||||
, qtcharts
|
qtmultimedia,
|
||||||
, cmake
|
qtcharts,
|
||||||
, gitUpdater
|
cmake,
|
||||||
,
|
gitUpdater,
|
||||||
}:
|
}:
|
||||||
assert lib.versionAtLeast mlt.version "7.18.0";
|
assert lib.versionAtLeast mlt.version "7.18.0";
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "shotcut";
|
pname = "shotcut";
|
||||||
version = "23.11.04";
|
version = "23.11.04";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mltframework";
|
owner = "mltframework";
|
||||||
repo = "shotcut";
|
repo = "shotcut";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-0T/0gqW86enTO2OkmxiDF/kWPHILjRSNU2rufNJdVOg=";
|
hash = "sha256-0T/0gqW86enTO2OkmxiDF/kWPHILjRSNU2rufNJdVOg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
|
nativeBuildInputs = [pkg-config cmake wrapQtAppsHook];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL2
|
SDL2
|
||||||
frei0r
|
frei0r
|
||||||
ladspaPlugins
|
ladspaPlugins
|
||||||
gettext
|
gettext
|
||||||
mlt
|
mlt
|
||||||
fftw
|
fftw
|
||||||
qtbase
|
qtbase
|
||||||
qttools
|
qttools
|
||||||
qtmultimedia
|
qtmultimedia
|
||||||
qtcharts
|
qtcharts
|
||||||
];
|
];
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE";
|
env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE";
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DSHOTCUT_VERSION=${version}"
|
"-DSHOTCUT_VERSION=${version}"
|
||||||
];
|
];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
|
sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
|
||||||
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
|
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
|
||||||
sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
|
sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
|
||||||
NICE=$(type -P nice)
|
NICE=$(type -P nice)
|
||||||
sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
|
sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
|
||||||
'';
|
|
||||||
|
|
||||||
qtWrapperArgs = [
|
|
||||||
"--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
|
|
||||||
"--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
|
|
||||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [jack1 SDL2]}"
|
|
||||||
"--prefix PATH : ${mlt}/bin"
|
|
||||||
];
|
|
||||||
|
|
||||||
passthru.updateScript = gitUpdater {
|
|
||||||
rev-prefix = "v";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "A free, open source, cross-platform video editor";
|
|
||||||
longDescription = ''
|
|
||||||
An official binary for Shotcut, which includes all the
|
|
||||||
dependencies pinned to specific versions, is provided on
|
|
||||||
http://shotcut.org.
|
|
||||||
|
|
||||||
If you encounter problems with this version, please contact the
|
|
||||||
nixpkgs maintainer(s). If you wish to report any bugs upstream,
|
|
||||||
please use the official build from shotcut.org instead.
|
|
||||||
'';
|
'';
|
||||||
homepage = "https://shotcut.org";
|
|
||||||
license = licenses.gpl3Plus;
|
qtWrapperArgs = [
|
||||||
maintainers = with maintainers; [ goibhniu woffs peti ];
|
"--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
|
||||||
platforms = platforms.linux;
|
"--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
|
||||||
};
|
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [jack1 SDL2]}"
|
||||||
}
|
"--prefix PATH : ${mlt}/bin"
|
||||||
|
];
|
||||||
|
|
||||||
|
passthru.updateScript = gitUpdater {
|
||||||
|
rev-prefix = "v";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A free, open source, cross-platform video editor";
|
||||||
|
longDescription = ''
|
||||||
|
An official binary for Shotcut, which includes all the
|
||||||
|
dependencies pinned to specific versions, is provided on
|
||||||
|
http://shotcut.org.
|
||||||
|
|
||||||
|
If you encounter problems with this version, please contact the
|
||||||
|
nixpkgs maintainer(s). If you wish to report any bugs upstream,
|
||||||
|
please use the official build from shotcut.org instead.
|
||||||
|
'';
|
||||||
|
homepage = "https://shotcut.org";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [goibhniu woffs peti];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,65 +1,67 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
mainUser.packages = with pkgs; [vscode];
|
hm = {
|
||||||
|
home.packages = with pkgs; [vscode];
|
||||||
|
|
||||||
hm.programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableUpdateCheck = false;
|
enableUpdateCheck = false;
|
||||||
|
|
||||||
extensions = with pkgs.vscode-extensions; [
|
extensions = with pkgs.vscode-extensions; [
|
||||||
# style
|
# style
|
||||||
# bierner.markdown-preview-github-styles
|
# bierner.markdown-preview-github-styles
|
||||||
catppuccin.catppuccin-vsc
|
catppuccin.catppuccin-vsc
|
||||||
|
|
||||||
# git
|
# git
|
||||||
donjayamanne.githistory
|
donjayamanne.githistory
|
||||||
eamodio.gitlens
|
eamodio.gitlens
|
||||||
|
|
||||||
# misc
|
# misc
|
||||||
github.copilot
|
github.copilot
|
||||||
editorconfig.editorconfig
|
editorconfig.editorconfig
|
||||||
mkhl.direnv
|
mkhl.direnv
|
||||||
usernamehw.errorlens
|
usernamehw.errorlens
|
||||||
wakatime.vscode-wakatime
|
wakatime.vscode-wakatime
|
||||||
|
|
||||||
# rust
|
# rust
|
||||||
# dustypomerleau.rust-syntax
|
# dustypomerleau.rust-syntax
|
||||||
rust-lang.rust-analyzer
|
rust-lang.rust-analyzer
|
||||||
serayuzgur.crates
|
serayuzgur.crates
|
||||||
tamasfe.even-better-toml
|
tamasfe.even-better-toml
|
||||||
|
|
||||||
# nix
|
# nix
|
||||||
jnoortheen.nix-ide
|
jnoortheen.nix-ide
|
||||||
|
|
||||||
# cpp
|
# cpp
|
||||||
# mesonbuild.mesonbuild
|
# mesonbuild.mesonbuild
|
||||||
ms-vscode.cmake-tools
|
ms-vscode.cmake-tools
|
||||||
ms-vscode.cpptools
|
ms-vscode.cpptools
|
||||||
ms-vscode.makefile-tools
|
ms-vscode.makefile-tools
|
||||||
twxs.cmake
|
twxs.cmake
|
||||||
xaver.clang-format
|
xaver.clang-format
|
||||||
|
|
||||||
# python
|
# python
|
||||||
# donjayamanne.python-environment-manager
|
# donjayamanne.python-environment-manager
|
||||||
ms-python.python
|
ms-python.python
|
||||||
ms-python.vscode-pylance
|
ms-python.vscode-pylance
|
||||||
];
|
];
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"cmake.configureOnOpen" = true;
|
"cmake.configureOnOpen" = true;
|
||||||
"editor.fontFamily" = "'Iosevka Nerd Font', monospace";
|
"editor.fontFamily" = "'Iosevka Nerd Font', monospace";
|
||||||
"editor.fontSize" = 16;
|
"editor.fontSize" = 16;
|
||||||
"editor.formatOnSave" = true;
|
"editor.formatOnSave" = true;
|
||||||
"editor.inlineSuggest.enabled" = true;
|
"editor.inlineSuggest.enabled" = true;
|
||||||
"files.autoSave" = "afterDelay";
|
"files.autoSave" = "afterDelay";
|
||||||
"nix.enableLanguageServer" = true;
|
"nix.enableLanguageServer" = true;
|
||||||
"nix.serverPath" = "nil";
|
"nix.serverPath" = "nil";
|
||||||
"rust-analyzer.check.command" = "clippy";
|
"rust-analyzer.check.command" = "clippy";
|
||||||
"terminal.integrated.fontFamily" = "Iosevka Nerd Font";
|
"terminal.integrated.fontFamily" = "Iosevka Nerd Font";
|
||||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||||
"errorLens.messageBackgroundMode" = "message";
|
"errorLens.messageBackgroundMode" = "message";
|
||||||
|
|
||||||
# fix for segfault on hyprland
|
# fix for segfault on hyprland
|
||||||
"window.titleBarStyle" = "custom";
|
"window.titleBarStyle" = "custom";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
config,
|
config,
|
||||||
getchvim,
|
getchvim,
|
||||||
agenix,
|
agenix,
|
||||||
nixpkgs-stable,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
username = "leo";
|
username = "leo";
|
||||||
|
|
@ -12,7 +11,6 @@ in {
|
||||||
imports = [
|
imports = [
|
||||||
../programs
|
../programs
|
||||||
(lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
|
(lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
|
||||||
(lib.mkAliasOptionModule ["mainUser"] ["users" "users" username])
|
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
|
@ -188,7 +186,7 @@ in {
|
||||||
|
|
||||||
virtualisation.libvirtd.enable = true;
|
virtualisation.libvirtd.enable = true;
|
||||||
|
|
||||||
mainUser = {
|
users.users."${username}" = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
|
extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,9 @@
|
||||||
|
|
||||||
services.xserver.videoDrivers = ["amdgpu"];
|
services.xserver.videoDrivers = ["amdgpu"];
|
||||||
|
|
||||||
hm.wayland.windowManager.hyprland.settings.monitor = lib.mkForce ["DP-1,1920x1200@60,0x0,1" "HDMI-A-1,1440x900@60,1920x300,1"];
|
hm = {
|
||||||
|
home.packages = with pkgs; [ryujinx];
|
||||||
|
|
||||||
mainUser.packages = with pkgs; [ryujinx];
|
wayland.windowManager.hyprland.settings.monitor = lib.mkForce ["DP-1,1920x1200@60,0x0,1" "HDMI-A-1,1440x900@60,1920x300,1"];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,13 +17,15 @@
|
||||||
|
|
||||||
programs.light.enable = true;
|
programs.light.enable = true;
|
||||||
|
|
||||||
mainUser.packages = with pkgs; [
|
hm = {
|
||||||
networkmanagerapplet
|
home.packages = with pkgs; [
|
||||||
protonvpn-gui
|
networkmanagerapplet
|
||||||
];
|
protonvpn-gui
|
||||||
|
];
|
||||||
|
|
||||||
hm.wayland.windowManager.hyprland.settings.exec-once = with pkgs; [
|
wayland.windowManager.hyprland.settings.exec-once = with pkgs; [
|
||||||
"${lib.getExe networkmanagerapplet}"
|
"${lib.getExe networkmanagerapplet}"
|
||||||
"${lib.getExe' blueman "blueman-applet"}"
|
"${lib.getExe' blueman "blueman-applet"}"
|
||||||
];
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue