Fixed GUI after merge

This commit is contained in:
root 2020-07-16 14:41:06 -07:00
parent c4f7e22522
commit 8f3bfef11d
4 changed files with 31 additions and 34 deletions

View File

@ -52,5 +52,7 @@ with lib;
description = "Email for administrator of this system."; description = "Email for administrator of this system.";
default = "admin@fudo.org"; default = "admin@fudo.org";
}; };
enable-gui = mkEnableOption "Install desktop GUI software.";
}; };
} }

View File

@ -4,14 +4,22 @@ with lib;
let let
profile = config.fudo.common.profile; profile = config.fudo.common.profile;
in mkIf ((profile == "desktop") || (profile == "laptop")) { common-packages = with pkgs; [
environment.systemPackages = with pkgs; [ ffmpeg-full
libfixposix
mono
nomacs
python37Packages.youtube-dl
sqlite
system-config-printer
];
gui-packages = with pkgs; [
cool-retro-term cool-retro-term
corefonts corefonts
chrome-gnome-shell chrome-gnome-shell
chromium chromium
evince evince
ffmpeg-full
firefox firefox
gimp gimp
glxinfo glxinfo
@ -23,31 +31,13 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
gtk3 gtk3
gtkimageview gtkimageview
i3lock i3lock
libfixposix
#minecraft-current
mono
mplayer mplayer
mpv mpv
nomacs
openssl_1_1
pdftk pdftk
python37Packages.youtube-dl
redshift redshift
rhythmbox rhythmbox
shotwell shotwell
spotify spotify
sqlite
(steam.override {
nativeOnly = true;
extraPkgs = pkgs: [
mono
gtk3
gtk3-x11
libgdiplus
zlib
];
withJava = true;
})
(steam.override { (steam.override {
nativeOnly = true; nativeOnly = true;
extraPkgs = pkgs: [ extraPkgs = pkgs: [
@ -60,15 +50,18 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
]; ];
withJava = true; withJava = true;
}).run }).run
# steam-run
# steam-run-native
system-config-printer
virtmanager virtmanager
xorg.xev xorg.xev
xzgv xzgv
virtmanager-qt virtmanager-qt
]; ];
cfg = config.fudo.common;
in mkIf ((profile == "desktop") || (profile == "laptop")) {
environment.systemPackages =
common-packages ++ (if cfg.enable-gui then gui-packages else []);
nixpkgs.config.allowBroken = true; nixpkgs.config.allowBroken = true;
# Splash screen # Splash screen
@ -82,8 +75,8 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
services.xserver = { services.xserver = if cfg.enable-gui then {
# enable = true; enable = true;
layout = "us"; layout = "us";
xkbVariant = "dvp"; xkbVariant = "dvp";
@ -102,24 +95,24 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
waidPID=$! waidPID=$!
''; '';
}; };
} else {
layout = "us";
xkbVariant = "dvp";
xkbOptions = "ctrl:nocaps";
}; };
services.gnome3 = { services.gnome3 = mkIf cfg.enable-gui {
evolution-data-server.enable = pkgs.lib.mkForce false; evolution-data-server.enable = pkgs.lib.mkForce false;
gnome-user-share.enable = pkgs.lib.mkForce false; gnome-user-share.enable = pkgs.lib.mkForce false;
}; };
services.dbus.socketActivated = true; services.dbus.socketActivated = true;
#services.openssh.forwardX11 = true;
#programs.ssh.forwardX11 = true;
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = cfg.enable-gui;
fonts = { fonts = mkIf cfg.enable-gui {
enableFontDir = true; enableFontDir = true;
#fontconfig.antialias = true; #fontconfig.antialias = true;
fontconfig.enable = true; fontconfig.enable = true;

View File

@ -2,6 +2,7 @@
{ {
imports = [ imports = [
./common-ui.nix
./desktop.nix ./desktop.nix
./laptop.nix ./laptop.nix
./server.nix ./server.nix

View File

@ -29,6 +29,7 @@ in {
fudo.common = { fudo.common = {
profile = "desktop"; profile = "desktop";
site = "seattle"; site = "seattle";
enable-gui = true;
}; };
fudo.slynk = { fudo.slynk = {