nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:a798185a176e60868e140700a72fe1740ad43cfd
Branches Tags
nix:trunk
..
compare: nix:9c1331075a738ab013fe474c1417800be06be3b1
Branches Tags
nix:trunk

No commits in common. "a798185a176e60868e140700a72fe1740ad43cfd" and "9c1331075a738ab013fe474c1417800be06be3b1" have entirely different histories.
a798185a17 ... 9c1331075a

5 changed files with 31 additions and 43 deletions
Show Stats Expand all files Collapse all files

10
home-manager/linux/programs/sway.nix
View File

@ -68,11 +68,11 @@ in with lib; {
gtk = true; gtk = true;
}; };
extraSessionCommands = '' extraSessionCommands = ''
# Make qt theming work # Make qt theming work
export QT_QPA_PLATFORMTHEME="qt5ct" export QT_QPA_PLATFORMTHEME="qt5ct"
# Prepare for wob # Prepare for wob
export WOBSOCK="$XDG_RUNTIME_DIR/wob.sock" export WOBSOCK="$XDG_RUNTIME_DIR/wob.sock"
rm -rf $WOBSOCK && mkfifo $WOBSOCK rm -rf $WOBSOCK && mkfifo $WOBSOCK
''; '';
config = { config = {
# Startup wob # Startup wob

1
machines/tounge/configuration.nix
View File

@ -41,7 +41,6 @@
}; };
config = { config = {
setupGrub = false; setupGrub = false;
userUid = "1001";
nix = { nix = {
autoUpdate = true; autoUpdate = true;
autoGC = true; autoGC = true;

6
modules/linux/default.nix
View File

@ -138,12 +138,6 @@ in {
description = "Whether to install the 'nathan' user"; description = "Whether to install the 'nathan' user";
type = lib.types.bool; type = lib.types.bool;
}; };
homeTmpfs = mkEnableOptionT "~/.tmp as tmpfs";
userUid = mkOption {
default = "1000";
example = "1000";
description = "UID of the user";
};
# Should we harden this system? # Should we harden this system?
# On by default # On by default
harden = mkEnableOptionT "Apply system hardening"; harden = mkEnableOptionT "Apply system hardening";

9
modules/linux/user.nix
View File

@ -19,7 +19,8 @@ in with lib; {
}; };
environment.shells = [ pkgs.fish ]; environment.shells = [ pkgs.fish ];
users = { users = {
mutableUsers = !nc.installUser; # If we install the user and the system is hardended, then disable mutable users
mutableUsers = !(nc.installUser && nc.harden);
# Configure our user, if enabled # Configure our user, if enabled
users."${nc.user}" = mkMerge [ users."${nc.user}" = mkMerge [
(mkIf nc.installUser { (mkIf nc.installUser {
@ -64,11 +65,5 @@ in with lib; {
(mkIf config.nathan.hardware.amdPassthrough { (mkIf config.nathan.hardware.amdPassthrough {
users.users."${nc.user}".extraGroups = [ "libvirtd" ]; users.users."${nc.user}".extraGroups = [ "libvirtd" ];
}) })
(mkIf (nc.homeTmpfs && nc.installUser) {
fileSystems."/home/${nc.user}/.tmp" = {
fsType = "tmpfs";
options = [ "mode=700" "uid=${nc.userUid}" "gid=100" ];
};
})
]; ];
} }

48
packages/sommelier/default.nix
View File

@ -1,29 +1,29 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
, libxkbcommon, mesa, pixman, xorg, wayland, gtest }: , libxkbcommon, mesa, pixman, xorg, wayland, gtest }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "sommelier"; pname = "sommelier";
version = "104.0"; version = "104.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akvadrako"; owner = "akvadrako";
repo = "sommelier"; repo = "sommelier";
rev = "31a42a2f8c649ae82a3239284bced7ef39a569ef"; rev = "31a42a2f8c649ae82a3239284bced7ef39a569ef";
sha256 = "sha256-ZTvH4mn7eK2e/1u6FVVpR7aaeAQ+JxSa4nhXWLxSfvo="; sha256 = "sha256-ZTvH4mn7eK2e/1u6FVVpR7aaeAQ+JxSa4nhXWLxSfvo=";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ];
doCheck = true; doCheck = true;
nativeCheckInputs = [ gtest ]; nativeCheckInputs = [ gtest ];
meta = with lib; { meta = with lib; {
homepage = homepage =
"https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/main/vm_tools/sommelier/"; "https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/main/vm_tools/sommelier/";
description = "Nested Wayland compositor with support for X11 forwarding"; description = "Nested Wayland compositor with support for X11 forwarding";
maintainers = with maintainers; [ qyliss ]; maintainers = with maintainers; [ qyliss ];
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }