Changes on atom

This commit is contained in:
root 2020-07-16 14:55:00 -07:00
parent e7d7e91456
commit 2a88e5e5db
5 changed files with 244 additions and 199 deletions

View File

@ -82,7 +82,7 @@
yubikey-manager yubikey-manager
]; ];
system.stateVersion = "19.09"; system.stateVersion = "20.03";
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
@ -92,7 +92,15 @@
krb5.libdefaults.default_realm = "FUDO.ORG"; krb5.libdefaults.default_realm = "FUDO.ORG";
krb5.kerberos = pkgs.heimdalFull; krb5.kerberos = pkgs.heimdalFull;
console.keyMap = "dvp"; services.xserver = {
layout = "us";
xkbVariant = "dvp";
xkbOptions = "ctrl:nocaps";
};
console = {
useXkbConfig = true;
};
i18n = { i18n = {
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";

View File

@ -4,8 +4,24 @@ with lib;
let let
profile = config.fudo.common.profile; profile = config.fudo.common.profile;
in mkIf ((profile == "desktop") || (profile == "laptop")) { in {
environment.systemPackages = with pkgs; [ options.fudo.ui = {
console-only = mkOption {
type = types.bool;
description = "Don't install X, only console stuff.";
default = false;
};
};
config = mkIf ((profile == "desktop") || (profile == "laptop")) {
environment.systemPackages = with pkgs;
[
libfixposix
python37Packages.youtube-dl
sqlite
virtmanager
xzgv
] ++ (if (config.fudo.ui.console-only) then [] else [
cool-retro-term cool-retro-term
corefonts corefonts
chrome-gnome-shell chrome-gnome-shell
@ -67,12 +83,13 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
xorg.xev xorg.xev
xzgv xzgv
virtmanager-qt virtmanager-qt
]; ]);
nixpkgs.config.allowBroken = true; nixpkgs.config.allowBroken = true;
# Splash screen # Splash screen
boot.plymouth.enable = true; boot.plymouth.enable =
if (config.fudo.ui.console-only) then false else true;
services.avahi = { services.avahi = {
enable = true; enable = true;
@ -82,8 +99,14 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
services.xserver = { services.xserver = if (config.fudo.ui.console-only) then {
# enable = true; enable = false;
layout = "us";
xkbVariant = "dvp";
xkbOptions = "ctrl:nocaps";
} else {
enable = true;
layout = "us"; layout = "us";
xkbVariant = "dvp"; xkbVariant = "dvp";
@ -104,7 +127,7 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
}; };
}; };
services.gnome3 = { services.gnome3 = mkIf (! config.fudo.ui.console-only) {
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;
}; };
@ -119,7 +142,7 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
fonts = { fonts = mkIf (! config.fudo.ui.console-only) {
enableFontDir = true; enableFontDir = true;
#fontconfig.antialias = true; #fontconfig.antialias = true;
fontconfig.enable = true; fontconfig.enable = true;
@ -182,4 +205,5 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
xlibs.fontxfree86type1 xlibs.fontxfree86type1
]; ];
}; };
};
} }

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

@ -1,15 +1,26 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
mkIf (config.fudo.common.profile == "laptop") {
{
options.fudo.laptop = {
use-network-manager = mkOption {
type = types.bool;
description = "Use NetworkManager instead of wpa_supplicant.";
default = false;
};
};
config = mkIf (config.fudo.common.profile == "laptop") {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
acpi acpi
upower upower
wpa_supplicant wpa_supplicant
]; ];
networking = { networking = if (config.fudo.laptop.use-network-manager) then {
# networkmanager.enable = true; networkmanager.enable = true;
} else {
networkmanager.enable = false;
wireless = { wireless = {
enable = true; enable = true;
userControlled = { userControlled = {
@ -20,6 +31,10 @@ mkIf (config.fudo.common.profile == "laptop") {
"sea.fudo.org" = { "sea.fudo.org" = {
psk = "DahHaocheiD5"; psk = "DahHaocheiD5";
}; };
"Pixel_9041" = {
psk = "ea72027e4e6";
};
};
}; };
}; };
}; };

View File

@ -33,10 +33,8 @@ in {
bash.enableCompletion = true; bash.enableCompletion = true;
}; };
services.xserver = { fudo.laptop.use-network-manager = false;
# videoDrivers = ["nvidia"]; fudo.ui.console-only = true;
# displayManager.gdm.wayland = false;
};
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
@ -45,5 +43,4 @@ in {
hardware.pulseaudio.support32Bit = true; hardware.pulseaudio.support32Bit = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
} }