cleanup and remove payara config
This commit is contained in:
parent
6cdd4636e0
commit
05b0940e14
6 changed files with 4 additions and 32 deletions
|
|
@ -16,11 +16,6 @@
|
|||
name = "Gruvbox-Plus-Dark";
|
||||
package = pkgs.gruvbox-plus-icons;
|
||||
};
|
||||
cursorTheme = {
|
||||
name = "Bibata-Modern-Ice";
|
||||
package = pkgs.bibata-cursors;
|
||||
size = 24;
|
||||
};
|
||||
};
|
||||
|
||||
qt = {
|
||||
|
|
|
|||
|
|
@ -23,10 +23,7 @@
|
|||
memoryPercent = 300;
|
||||
};
|
||||
|
||||
services.xserver = {
|
||||
enable = false;
|
||||
xkb.layout = "en";
|
||||
};
|
||||
services.xserver.enable = false;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ in {
|
|||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = { inherit inputs identity; };
|
||||
};
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
};
|
||||
homeManager = {
|
||||
imports = [
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
boot = {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ let
|
|||
in {
|
||||
den.aspects.dev.nixos = { pkgs, ... }:
|
||||
let
|
||||
pkgs-unstable = import inputs.nixpkgs-unstable {
|
||||
system = pkgs.system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
environment.systemPackages = with pkgs-unstable; [
|
||||
# CLI utilities
|
||||
|
|
@ -67,23 +64,6 @@ in {
|
|||
JAVA_HOME = "${pkgs-unstable.openjdk8}";
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/lib/payara41 0755 ${username} users -"
|
||||
];
|
||||
|
||||
system.activationScripts.payaraJava = ''
|
||||
asenv=/var/lib/payara41/glassfish/config/asenv.conf
|
||||
if [ -f "$asenv" ]; then
|
||||
${pkgs.gnused}/bin/sed -i '/^AS_JAVA=/d' "$asenv"
|
||||
echo 'AS_JAVA="${pkgs-unstable.openjdk8}"' >> "$asenv"
|
||||
fi
|
||||
|
||||
domain_xml=/var/lib/payara41/glassfish/domains/domain1/config/domain.xml
|
||||
if [ -f "$domain_xml" ]; then
|
||||
${pkgs.gnused}/bin/sed -i 's|java-home="[^"]*"|java-home="${pkgs-unstable.openjdk8}/lib/openjdk"|' "$domain_xml"
|
||||
fi
|
||||
'';
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
users.users.${username}.extraGroups = [ "docker" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
# Browser / Electron Wayland backends
|
||||
MOZ_ENABLE_WAYLAND = "1";
|
||||
MOZ_USE_XINPUT2 = "1";
|
||||
ELECTRON_OZONE_PLATFORM_HINT = "wayland";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue