aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-06-10 10:15:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Desktop/General] Refactor config for easier modularisation (minimal desktop)

Browse source
This commit is contained in:
Antoine Viallon 2023-10-31 23:35:49 +01:00
parent 0fa8b85066
commit 0c68b4cf87
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 78 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

83
desktop/general.nix
View file

@ -53,8 +53,8 @@ in {
(mkRemovedOptionModule [ "aviallon" "desktop" "graphics" "shaderCache" "path" ] "Now always relative to $XDG_CACHE_HOME" ) (mkRemovedOptionModule [ "aviallon" "desktop" "graphics" "shaderCache" "path" ] "Now always relative to $XDG_CACHE_HOME" )
]; ];
config = mkIf cfg.enable { config = mkIf cfg.enable (mkMerge [
{
aviallon.network.backend = mkDefault "NetworkManager"; aviallon.network.backend = mkDefault "NetworkManager";
aviallon.boot.kernel = pkgs.linuxKernel.kernels.linux_xanmod; aviallon.boot.kernel = pkgs.linuxKernel.kernels.linux_xanmod;
@ -71,7 +71,6 @@ in {
services.xserver.xkbOptions = "eurosign:e"; services.xserver.xkbOptions = "eurosign:e";
boot.plymouth.enable = mkDefault (!generalCfg.minimal);
aviallon.boot.cmdline = { aviallon.boot.cmdline = {
splash = mkIf (!generalCfg.debug) ""; splash = mkIf (!generalCfg.debug) "";
"udev.log_level" = mkIf (!generalCfg.debug) 3; "udev.log_level" = mkIf (!generalCfg.debug) 3;
@ -83,16 +82,6 @@ in {
boot.consoleLogLevel = mkIf (!generalCfg.debug) 1; boot.consoleLogLevel = mkIf (!generalCfg.debug) 1;
console.enable = mkDefault false; # Completly disable console by default console.enable = mkDefault false; # Completly disable console by default
fonts.enableDefaultFonts = mkIf (!generalCfg.minimal) true;
hardware.acpilight.enable = mkIf (!generalCfg.minimal) true;
hardware.opentabletdriver.enable = mkIf (!generalCfg.minimal) true;
hardware.bluetooth = mkIf (!generalCfg.minimal) {
enable = true;
package = pkgs.bluezFull;
};
security.polkit.enable = true; # Better interactive privilege prompts security.polkit.enable = true; # Better interactive privilege prompts
# Enable running X11 apps on Wayland # Enable running X11 apps on Wayland
@ -102,15 +91,42 @@ in {
services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
hardware.opengl.driSupport = true; hardware.opengl.driSupport = true;
# For 32 bit applications
hardware.opengl.driSupport32Bit = mkIf (!generalCfg.minimal) (mkDefault true);
environment.systemPackages = with pkgs; [] environment.systemPackages = with pkgs; [
++ [
p7zip p7zip
] ];
++ optionals (!generalCfg.minimal) [
security.sudo.extraConfig =
''
# Keep X and Wayland related variables for better GUI integration
Defaults:root,%wheel env_keep+=DISPLAY
Defaults:root,%wheel env_keep+=XAUTHORITY
Defaults:root,%wheel env_keep+=WAYLAND_DISPLAY
Defaults:root,%wheel env_keep+=WAYLAND_SOCKET
Defaults:root,%wheel env_keep+=XDG_RUNTIME_DIR
''
;
}
(mkIf (!generalCfg.minimal) {
boot.plymouth.enable = mkDefault true;
fonts.enableDefaultFonts = true;
hardware.acpilight.enable = true;
hardware.opentabletdriver.enable = true;
hardware.bluetooth = {
enable = true;
package = pkgs.bluezFull;
};
hardware.opengl.driSupport32Bit = mkDefault cfg.gaming.enable;
environment.systemPackages = with pkgs; [
glxinfo glxinfo
vdpauinfo vdpauinfo
libva-utils libva-utils
@ -127,9 +143,7 @@ in {
aspell aspell
aspellDicts.fr aspellDicts.fr
] ];
;
aviallon.programs.allowUnfreeList = [ aviallon.programs.allowUnfreeList = [
"spotify" "spotify-unwrapped" "spotify" "spotify-unwrapped"
@ -137,28 +151,15 @@ in {
"veracrypt" "veracrypt"
]; ];
aviallon.programs.libreoffice.enable = mkIf (!generalCfg.minimal) true;
services.packagekit.enable = mkDefault (!generalCfg.minimal); aviallon.programs.libreoffice.enable = true;
security.sudo.extraConfig =
''
# Keep X and Wayland related variables for better GUI integration
Defaults:root,%wheel env_keep+=DISPLAY
Defaults:root,%wheel env_keep+=XAUTHORITY
Defaults:root,%wheel env_keep+=WAYLAND_DISPLAY services.packagekit.enable = mkDefault true;
Defaults:root,%wheel env_keep+=WAYLAND_SOCKET
Defaults:root,%wheel env_keep+=XDG_RUNTIME_DIR
''
;
# SmartCards # SmartCards
services.pcscd.enable = mkDefault (!generalCfg.minimal); services.pcscd.enable = mkDefault true;
networking.networkmanager = { networking.networkmanager.plugins = [ pkgs.networkmanager-openvpn ];
plugins = [] })
++ optional (!generalCfg.minimal) pkgs.networkmanager-openvpn ]);
;
};
};
} }