Working (I think?) GUI on zbox

This commit is contained in:
root 2021-03-31 23:28:42 +00:00
parent f373da5475
commit d145f6282a
7 changed files with 125 additions and 43 deletions

View File

@ -7,7 +7,7 @@
local-users = [ "niten" "reaper" ]; local-users = [ "niten" "reaper" ];
local-groups = [ "fudo" "selby" "admin" ]; local-groups = [ "fudo" "selby" "admin" ];
admin-users = [ "niten" "reaper" ]; local-admins = [ "niten" "reaper" ];
admin-email = "admin@fudo.org"; admin-email = "admin@fudo.org";
gssapi-realm = "FUDO.ORG"; gssapi-realm = "FUDO.ORG";
}; };
@ -17,7 +17,7 @@
local-users = [ "niten" "reaper" "xiaoxuan" "ken" ]; local-users = [ "niten" "reaper" "xiaoxuan" "ken" ];
local-groups = [ "fudo" "selby" "admin" ]; local-groups = [ "fudo" "selby" "admin" ];
admin-users = [ "niten" ]; local-admins = [ "niten" ];
admin-email = "niten@fudo.org"; admin-email = "niten@fudo.org";
gssapi-realm = "FUDO.ORG"; gssapi-realm = "FUDO.ORG";
}; };
@ -48,7 +48,7 @@
local-users = [ "niten" "viator" ]; local-users = [ "niten" "viator" ];
local-groups = [ "admin" ]; local-groups = [ "admin" ];
admin-users = [ "niten" ]; local-admins = [ "niten" ];
admin-email = "viator@informis.land"; admin-email = "viator@informis.land";
gssapi-realm = "INFORMIS.LAND"; gssapi-realm = "INFORMIS.LAND";
}; };

70
config/hardware/zbox.nix Normal file
View File

@ -0,0 +1,70 @@
{ config, lib, pkgs, ... }:
{
imports =
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];
boot = {
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd = {
availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
kernelModules = [ ];
};
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
};
fileSystems."/" =
{ device = "/dev/disk/by-label/zbox-root";
fsType = "btrfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-label/zbox-swap"; }
];
hardware = {
bluetooth.enable = true;
cpu.intel.updateMicrocode = true;
opengl = {
driSupport = true;
driSupport32Bit = true;
# extraPackages32 = with pkgs.i686Linux; [ libva ];
};
pulseaudio.support32Bit = true;
};
networking = {
macvlans = {
intif0 = {
interface = "eno1";
mode = "bridge";
};
};
interfaces = {
intif0 = {
# output of: echo clunk-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
macAddress = "02:dd:80:52:83:9b";
};
};
};
services.xserver.videoDrivers = [ "nvidia" ];
nix.maxJobs = lib.mkDefault 8;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}

View File

@ -149,6 +149,7 @@
profile = "desktop"; profile = "desktop";
}; };
zbox = { description = "Niten's primary desktop."; }; zbox = { description = "Niten's primary desktop.";
enable-gui = true;};
}; };
} }

View File

@ -1,10 +1,17 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
# TODO: remove?
nixpkgs.config.permittedInsecurePackages = [
"openssh-with-gssapi-8.4p1" # CVE-2021-28041
];
fudo.slynk.enable = true; fudo.slynk.enable = true;
networking = { networking = {
eno1.useDHCP = false; interfaces = {
intif0 = { useDHCP = true; }; eno1.useDHCP = false;
intif0 = { useDHCP = true; };
};
}; };
} }

View File

@ -6,7 +6,7 @@ let
enable-gui = config.fudo.hosts.${hostname}.enable-gui; enable-gui = config.fudo.hosts.${hostname}.enable-gui;
in { in {
import = [ ./common.nix ]; imports = [ ./common.nix ];
boot.plymouth.enable = false; boot.plymouth.enable = false;
@ -14,7 +14,8 @@ in {
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
services.xserver = mkIf enable-gui { services = {
xserver = mkIf enable-gui {
enable = true; enable = true;
desktopManager.gnome3.enable = true; desktopManager.gnome3.enable = true;
@ -23,13 +24,6 @@ in {
windowManager.stumpwm.enable = true; windowManager.stumpwm.enable = true;
emacs = {
enable = true;
install = true;
package = pkgs.emacs;
defaultEditor = true;
};
# windowManager.session = pkgs.lib.singleton { # windowManager.session = pkgs.lib.singleton {
# name = "stumpwm"; # name = "stumpwm";
# start = '' # start = ''
@ -37,6 +31,14 @@ in {
# waidPID=$! # waidPID=$!
# ''; # '';
# }; # };
};
emacs = {
enable = true;
install = true;
package = pkgs.emacs;
defaultEditor = true;
};
}; };
sound.enable = true; sound.enable = true;

View File

@ -10,32 +10,32 @@
timezone = "America/Los_Angeles"; timezone = "America/Los_Angeles";
gateway-host = "nostromo"; gateway-host = "nostromo";
# FIXME: good idea? # FIXME: good idea?
network-mounts = { # network-mounts = {
"/mnt/documents" = { # "/mnt/documents" = {
device = "whitedwarf:/volume1/Documents"; # device = "whitedwarf:/volume1/Documents";
fsType = "nfs4"; # fsType = "nfs4";
}; # };
"/mnt/downloads" = { # "/mnt/downloads" = {
device = "whitedwarf:/volume1/Downloads"; # device = "whitedwarf:/volume1/Downloads";
fsType = "nfs4"; # fsType = "nfs4";
}; # };
"/mnt/music" = { # "/mnt/music" = {
device = "doraemon:/volume1/Music"; # device = "doraemon:/volume1/Music";
fsType = "nfs4"; # fsType = "nfs4";
}; # };
"/mnt/video" = { # "/mnt/video" = {
device = "doraemon:/volume1/Video"; # device = "doraemon:/volume1/Video";
fsType = "nfs4"; # fsType = "nfs4";
}; # };
"/mnt/cargo_video" = { # "/mnt/cargo_video" = {
device = "cargo:/volume1/video"; # device = "cargo:/volume1/video";
fsType = "nfs4"; # fsType = "nfs4";
}; # };
"/mnt/photo" = { # "/mnt/photo" = {
device = "cargo:/volume1/pictures"; # device = "cargo:/volume1/pictures";
fsType = "nfs4"; # fsType = "nfs4";
}; # };
}; # };
}; };
portage = { portage = {

View File

@ -1,5 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [
} hll2380dw-cups
];
}