remove mainUser alias
je suis définitevement pas la patate la plus croustillante du four
This commit is contained in:
parent
879bd46295
commit
725257485f
5 changed files with 148 additions and 144 deletions
|
@ -1,25 +1,25 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, wrapQtAppsHook
|
||||
, SDL2
|
||||
, frei0r
|
||||
, ladspaPlugins
|
||||
, gettext
|
||||
, mlt
|
||||
, jack1
|
||||
, pkg-config
|
||||
, fftw
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtmultimedia
|
||||
, qtcharts
|
||||
, cmake
|
||||
, gitUpdater
|
||||
,
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
wrapQtAppsHook,
|
||||
SDL2,
|
||||
frei0r,
|
||||
ladspaPlugins,
|
||||
gettext,
|
||||
mlt,
|
||||
jack1,
|
||||
pkg-config,
|
||||
fftw,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtmultimedia,
|
||||
qtcharts,
|
||||
cmake,
|
||||
gitUpdater,
|
||||
}:
|
||||
assert lib.versionAtLeast mlt.version "7.18.0";
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shotcut";
|
||||
version = "23.11.04";
|
||||
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-0T/0gqW86enTO2OkmxiDF/kWPHILjRSNU2rufNJdVOg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
|
||||
nativeBuildInputs = [pkg-config cmake wrapQtAppsHook];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
frei0r
|
||||
|
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://shotcut.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ goibhniu woffs peti ];
|
||||
maintainers = with maintainers; [goibhniu woffs peti];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{pkgs, ...}: {
|
||||
mainUser.packages = with pkgs; [vscode];
|
||||
hm = {
|
||||
home.packages = with pkgs; [vscode];
|
||||
|
||||
hm.programs.vscode = {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
enableUpdateCheck = false;
|
||||
|
||||
|
@ -62,4 +63,5 @@
|
|||
"window.titleBarStyle" = "custom";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
config,
|
||||
getchvim,
|
||||
agenix,
|
||||
nixpkgs-stable,
|
||||
...
|
||||
}: let
|
||||
username = "leo";
|
||||
|
@ -12,7 +11,6 @@ in {
|
|||
imports = [
|
||||
../programs
|
||||
(lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
|
||||
(lib.mkAliasOptionModule ["mainUser"] ["users" "users" username])
|
||||
];
|
||||
|
||||
boot = {
|
||||
|
@ -188,7 +186,7 @@ in {
|
|||
|
||||
virtualisation.libvirtd.enable = true;
|
||||
|
||||
mainUser = {
|
||||
users.users."${username}" = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.fish;
|
||||
extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
|
||||
|
|
|
@ -7,7 +7,9 @@
|
|||
|
||||
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;
|
||||
|
||||
mainUser.packages = with pkgs; [
|
||||
hm = {
|
||||
home.packages = with pkgs; [
|
||||
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' blueman "blueman-applet"}"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue