There is no capslock, only escape. Also, other changes.
parent
4a8f32ddcb
commit
7c01fddce1
|
@ -11,30 +11,36 @@ in
|
||||||
[ ../physical/hp8570w.nix
|
[ ../physical/hp8570w.nix
|
||||||
../roles/common.nix
|
../roles/common.nix
|
||||||
../roles/workstation.nix
|
../roles/workstation.nix
|
||||||
../modules/tor-hidden-service.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# no, not that Ascanius.
|
# no, not that Ascanius.
|
||||||
networking.hostName = secrets.hostnames.ascanius;
|
networking.hostName = secrets.hostnames.ascanius;
|
||||||
|
|
||||||
# GOTTA GO FASTER
|
|
||||||
# this pulls in systemd-udevd-settle, which slows down boot
|
|
||||||
systemd.services.scsi-link-pm.enable = false;
|
|
||||||
|
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
packageOverrides = pkgs : {
|
packageOverrides = pkgs : {
|
||||||
bluez = pkgs.bluez5;
|
bluez = pkgs.bluez5;
|
||||||
# https://github.com/NixOS/nixpkgs/issues/22099
|
# https://github.com/NixOS/nixpkgs/issues/22099
|
||||||
trustedGrub = pkgs.trustedGrub.overrideDerivation (attr: {NIX_CFLAGS_COMPILE = "-Wno-error";});
|
trustedGrub = pkgs.grub2.overrideDerivation (attr: rec {
|
||||||
|
version = "2.x-20170910";
|
||||||
|
name = "trustedGRUB2-${version}";
|
||||||
|
buildInputs = attr.buildInputs ++ (with pkgs;[autoconf automake]);
|
||||||
|
prePatch = ''
|
||||||
|
rm -rf po
|
||||||
|
tar Jxf ${pkgs.grub2.src} grub-2.02/po
|
||||||
|
cp -r grub-2.02/po po
|
||||||
|
./autogen.sh
|
||||||
|
'';
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
repo = "TrustedGRUB2";
|
||||||
|
owner = "Rohde-Schwarz-Cybersecurity";
|
||||||
|
rev = "e656aaabd3bc5abda6c62c8967ebfd0c53ef179b";
|
||||||
|
sha256 = "08lq4prqhn923i8a7q79s4lsfnqgk4jd255xzk1wy12vg45dwlsc";
|
||||||
|
};
|
||||||
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
services.tor.hiddenServices = [
|
services.tor.hiddenServices.ssh.map = [{ port = 22; }];
|
||||||
{ name = "ssh";
|
|
||||||
port = 22;
|
|
||||||
hostname = secrets.tor_hostnames."ssh.ascanius";
|
|
||||||
private_key = "/run/keys/torkeys/ssh.ascanius.key"; }
|
|
||||||
];
|
|
||||||
nix.gc.automatic = pkgs.lib.mkOverride 30 false;
|
nix.gc.automatic = pkgs.lib.mkOverride 30 false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
|
|
||||||
|
|
||||||
# The NixOS release to be compatible with for stateful data such as databases.
|
# The NixOS release to be compatible with for stateful data such as databases.
|
||||||
system.stateVersion = "17.03";
|
system.stateVersion = "17.09";
|
||||||
networking.enableIPv6 = lib.mkOverride 30 true;
|
#networking.enableIPv6 = lib.mkOverride 30 true;
|
||||||
|
|
||||||
|
|
||||||
services.xserver.displayManager.sessionCommands = ''
|
services.xserver.displayManager.sessionCommands = ''
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
boot.blacklistedKernelModules = ["psmouse"];
|
boot.blacklistedKernelModules = ["psmouse"];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_4_11;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
|
@ -33,7 +33,7 @@
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
# https://wiki.archlinux.org/index.php/Dell_XPS_13_(9360)#Module-based_Powersaving_Options
|
# https://wiki.archlinux.org/index.php/Dell_XPS_13_(9360)#Module-based_Powersaving_Options
|
||||||
# might require linux 4.11
|
# might require linux 4.11
|
||||||
boot.kernelParams = ["i915.enable_fbc=1" "i915.enable_guc_loading=1" "i915.enable_guc_submission=1" "i915.enable_huc=1" "i915.enable_psr=2"];
|
boot.kernelParams = ["i915.enable_fbc=1" "i915.enable_guc_loading=1" "i915.enable_guc_submission=1" "i915.enable_huc=1" "i915.enable_psr=2" "intel_iommu=on"];
|
||||||
# now we wait until enable_psr=1 is fixed
|
# now we wait until enable_psr=1 is fixed
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
|
|
|
@ -67,6 +67,7 @@ in
|
||||||
cowsay ponysay
|
cowsay ponysay
|
||||||
ed # ed, man!
|
ed # ed, man!
|
||||||
sl
|
sl
|
||||||
|
rlwrap
|
||||||
|
|
||||||
vim
|
vim
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ in
|
||||||
tappingDragLock = false;
|
tappingDragLock = false;
|
||||||
};
|
};
|
||||||
layout = "us";
|
layout = "us";
|
||||||
|
xkbOptions = "caps:escape";
|
||||||
displayManager.slim.defaultUser = "yorick";
|
displayManager.slim.defaultUser = "yorick";
|
||||||
# xkbOptions = "eurosign:e";
|
# xkbOptions = "eurosign:e";
|
||||||
windowManager.i3 = {
|
windowManager.i3 = {
|
||||||
|
|
Loading…
Reference in New Issue