remove mainUser alias

je suis définitevement pas la patate la plus croustillante du four
This commit is contained in:
uku 2023-11-25 14:20:19 +01:00
parent 879bd46295
commit 725257485f
Signed by: uku
GPG key ID: 7D01D7B105E77166
5 changed files with 148 additions and 144 deletions

View file

@ -1,22 +1,22 @@
{ 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 {

View file

@ -1,7 +1,8 @@
{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;
@ -62,4 +63,5 @@
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";
}; };
}; };
};
} }

View file

@ -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"];

View file

@ -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"];
};
} }

View file

@ -17,13 +17,15 @@
programs.light.enable = true; programs.light.enable = true;
mainUser.packages = with pkgs; [ hm = {
home.packages = with pkgs; [
networkmanagerapplet networkmanagerapplet
protonvpn-gui 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"}"
]; ];
};
} }