Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Desktop things to Desktop.nix

Browse Source
This commit is contained in:
David Crompton
2024-05-04 16:20:05 -04:00
parent 683f19d596
commit b9fbcb5864
2 changed files with 31 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
machines/universedesktop/configuration.nix
View File

@@ -82,71 +82,6 @@
users.users.brltty.isSystemUser = true;
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the GNOME Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
programs.xwayland.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
# services.xserver.xkbOptions = "grp:switch";
# services.xserver.extraLayouts = {
# bqn = {
# description = "BQN Symbol Modifiers";
# languages = ["eng"];
# symbolsFile = pkgs.fetchurl {
# url = "https://raw.githubusercontent.com/mlochbaum/BQN/master/editors/bqn";
# sha256 = "F2fgLlWghcOrMu0BXGiyNHa0qh9YUyQE80GK0BWU2EY=";
# };
# };
# };
# # services.xserver.xkbOptions = {
# };
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
#sound.enable = true;
#hardware.pulseaudio.enable = true;
# rtkit is optional but recommended
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
# jack.enable = true;
};
# services.pipewire.extraConfig.pipewire."92-low-latency" = {
# context.properties = {
# default.clock.rate = 48000;
# default.clock.quantum = 32;
# default.clock.min-quantum = 32;
# default.clock.max-quantum = 32;
# };
# context.modules = [
# {
# name = "libpipewire-module-protocol-pulse";
# args = {
# pulse.min.req = "32/48000";
# pulse.default.req = "32/48000";
# pulse.max.req = "32/48000";
# pulse.min.quantum = "32/48000";
# pulse.max.quantum = "32/48000";
# };
# }
# ];
# stream.properties = {
# node.latency = "32/48000";
# resample.quality = 1;
# };
# };
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
users.groups.net = {};
@@ -172,20 +107,7 @@
nixpkgs.config.allowUnfree = true;
services.xserver.videoDrivers = [ "nvidia" ];
# Wayland support
hardware = {
opengl.enable = true;
opengl.driSupport = true;
opengl.driSupport32Bit = true;
nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
open = false;
};
};
services.fwupd.enable = true;
programs.adb.enable = true;

30
machines/universedesktop/programs/desktop.nix
View File

@@ -9,6 +9,36 @@
};
})];
# Wayland support
hardware = {
opengl.enable = true;
opengl.driSupport = true;
opengl.driSupport32Bit = true;
nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
open = false;
};
};
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
programs.xwayland.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
# Enable sound.
# rtkit is optional but recommended
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
# jack.enable = true;
};
# Bitwarden Outdaed Nodejs
nixpkgs.config.permittedInsecurePackages = [
"openssl-1.1.1v"