From 05b0940e1441c447a926047db61cf4e122867d68 Mon Sep 17 00:00:00 2001 From: Zoty Date: Tue, 23 Jun 2026 14:39:52 -0300 Subject: [PATCH] cleanup and remove payara config --- modules/_home/theme.nix | 5 ----- modules/core.nix | 5 +---- modules/den.nix | 1 - modules/desktop.nix | 2 ++ modules/dev.nix | 22 +--------------------- modules/wayland.nix | 1 - 6 files changed, 4 insertions(+), 32 deletions(-) diff --git a/modules/_home/theme.nix b/modules/_home/theme.nix index 9750acc..c5afbd1 100644 --- a/modules/_home/theme.nix +++ b/modules/_home/theme.nix @@ -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 = { diff --git a/modules/core.nix b/modules/core.nix index b812945..4e9b95a 100644 --- a/modules/core.nix +++ b/modules/core.nix @@ -23,10 +23,7 @@ memoryPercent = 300; }; - services.xserver = { - enable = false; - xkb.layout = "en"; - }; + services.xserver.enable = false; environment.systemPackages = with pkgs; [ curl diff --git a/modules/den.nix b/modules/den.nix index 5ab8526..cc708fd 100644 --- a/modules/den.nix +++ b/modules/den.nix @@ -92,7 +92,6 @@ in { backupFileExtension = "backup"; extraSpecialArgs = { inherit inputs identity; }; }; - security.sudo.wheelNeedsPassword = false; }; homeManager = { imports = [ diff --git a/modules/desktop.nix b/modules/desktop.nix index 38ef7d6..0363d86 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -28,6 +28,8 @@ }; }; + security.sudo.wheelNeedsPassword = false; + services.xserver.videoDrivers = [ "nvidia" ]; boot = { diff --git a/modules/dev.nix b/modules/dev.nix index 477b3e9..cf47063 100644 --- a/modules/dev.nix +++ b/modules/dev.nix @@ -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" ]; }; diff --git a/modules/wayland.nix b/modules/wayland.nix index ca43e30..7f4fc18 100644 --- a/modules/wayland.nix +++ b/modules/wayland.nix @@ -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";