diff --git a/host/Rory-laptop/configuration.nix b/host/Rory-laptop/configuration.nix
index 26e0620..3eae202 100644
--- a/host/Rory-laptop/configuration.nix
+++ b/host/Rory-laptop/configuration.nix
@@ -19,9 +19,13 @@ args@{
./postgres.nix
./nginx.nix
-
+
+ ./edu/vmware.nix
+ ./edu/nodejs-dev.nix
+
# hardware-specific imports
./optional/hardware-specific/nvidia.nix
+ ./optional/hardware-specific/intel.nix
./optional/gui/wayland.nix
];
@@ -34,8 +38,9 @@ args@{
device = "nodev"; # nodev for EFI only
# EFI
efiSupport = true;
- efiInstallAsRemovable = true;
+ #efiInstallAsRemovable = true;
};
+ efi.canTouchEfiVariables = true;
};
};
programs.noisetorch.enable = true;
@@ -56,14 +61,14 @@ args@{
# allowedUDPPorts = [ ... ];
};
- interfaces.enp34s0.ipv4.addresses = [
- {
- address = "192.168.0.3";
- prefixLength = 24;
- }
- ];
+ #interfaces.enp2s0.ipv4.addresses = [
+ # {
+ # address = "192.168.0.4";
+ # prefixLength = 24;
+ # }
+ #];
- defaultGateway = "192.168.0.1";
+ #defaultGateway = "192.168.0.1";
#useDHCP = true; # Doesn't work with NetworkManager, investigate
};
@@ -71,6 +76,11 @@ args@{
i18n.defaultLocale = "en_US.UTF-8";
services = {
+ resolved.enable = true;
+ mullvad-vpn = {
+ enable = true;
+ package = pkgs.mullvad-vpn;
+ };
xserver = {
displayManager.gdm.enable = true;
displayManager.lightdm.enable = false;
@@ -111,7 +121,9 @@ args@{
youtube-music
# - IDEs
+
(jetbrains.plugins.addPlugins jetbrains.webstorm [ "github-copilot" ])
+ (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ])
dbeaver-bin
vscode
@@ -168,11 +180,13 @@ args@{
eid-mw
jitsi-meet-electron
nixd
+ mullvad-vpn
];
environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
module: ${pkgs.opensc}/lib/opensc-pkcs11.so
'';
+ services.power-profiles-daemon.enable = true;
programs.steam = {
enable = true;
gamescopeSession.enable = true;
@@ -276,7 +290,7 @@ args@{
};
services.rabbitmq = {
- enable = true;
+ #enable = true;
};
system.stateVersion = "22.11"; # DO NOT EDIT!
diff --git a/host/Rory-laptop/edu/nodejs-dev.nix b/host/Rory-laptop/edu/nodejs-dev.nix
new file mode 100644
index 0000000..ce02770
--- /dev/null
+++ b/host/Rory-laptop/edu/nodejs-dev.nix
@@ -0,0 +1,14 @@
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
+
+{
+ environment.systemPackages = with pkgs;[
+ nodejs_latest
+
+ ];
+
+}
diff --git a/host/Rory-laptop/edu/vmware.nix b/host/Rory-laptop/edu/vmware.nix
new file mode 100644
index 0000000..de9e988
--- /dev/null
+++ b/host/Rory-laptop/edu/vmware.nix
@@ -0,0 +1,18 @@
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
+
+{
+ virtualisation.vmware.host = {
+ enable = true;
+ extraConfig = ''
+ # Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU
+ mks.gl.allowUnsupportedDrivers = "TRUE"
+ mks.vk.allowUnsupportedDevices = "TRUE"
+ '';
+ };
+
+}
diff --git a/host/Rory-laptop/nginx.nix b/host/Rory-laptop/nginx.nix
index d28dd33..98ef48b 100644
--- a/host/Rory-laptop/nginx.nix
+++ b/host/Rory-laptop/nginx.nix
@@ -13,7 +13,7 @@
recommendedProxySettings = true;
#recommendedTlsSettings = true;
recommendedZstdSettings = true;
- # recommendedGzipSettings = true;
+# recommendedGzipSettings = true;
recommendedBrotliSettings = true;
recommendedOptimisation = true;
#defaultMimeTypes = ../../../../packages/nginx/mime.types;
diff --git a/host/Rory-laptop/optional/gui/wayland.nix b/host/Rory-laptop/optional/gui/wayland.nix
index eac6391..b850a0f 100644
--- a/host/Rory-laptop/optional/gui/wayland.nix
+++ b/host/Rory-laptop/optional/gui/wayland.nix
@@ -30,6 +30,7 @@
slurp
easyeffects
keepassxc
+ networkmanagerapplet
];
};
diff --git a/host/Rory-laptop/optional/hardware-specific/intel.nix b/host/Rory-laptop/optional/hardware-specific/intel.nix
new file mode 100644
index 0000000..d74c9e3
--- /dev/null
+++ b/host/Rory-laptop/optional/hardware-specific/intel.nix
@@ -0,0 +1,25 @@
+{
+ pkgs,
+ ...
+}:
+
+{
+ nixpkgs.config.packageOverrides = pkgs: {
+ intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+ };
+
+ hardware = {
+ opengl = {
+ enable = true;
+ extraPackages = with pkgs; [
+ intel-media-driver # LIBVA_DRIVER_NAME=iHD
+ intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+ libvdpau-va-gl
+ ];
+ };
+ };
+ environment.sessionVariables = {
+ LIBVA_DRIVER_NAME = "iHD";
+ };
+ system.stateVersion = "22.11"; # DO NOT EDIT!
+}
|
