diff --git a/modules/nixos/nix.nix b/modules/nixos/nix.nix --- a/modules/nixos/nix.nix +++ b/modules/nixos/nix.nix @@ -5,90 +5,26 @@ ... }: with lib; { - options.profiles.nix-ld = { - enable = mkEnableOption "nix-ld profile"; - }; - config = mkMerge [ - { - nixpkgs.config.allowUnfree = true; - nix = { - gc = { - automatic = true; - dates = "monthly"; - }; - settings = let - substituters = [ - "https://nix-community.cachix.org" - ]; - in { - experimental-features = ["nix-command" "flakes"]; - trusted-users = ["root" "joshua"]; - extra-substituters = substituters; - trusted-substituters = substituters; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; + config = { + nixpkgs.config.allowUnfree = true; + nix = { + gc = { + automatic = true; + dates = "monthly"; }; - } - (mkIf config.profiles.nix-ld.enable { - # Enable nix ld - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig - freetype - fuse3 - gdk-pixbuf - glib - gtk3 - icu - libGL - libappindicator-gtk3 - libdrm - libglvnd - libnotify - libpulseaudio - libunwind - libusb1 - libuuid - libxkbcommon - libxml2 - mesa - nspr - nss - openssl - pango - pipewire - stdenv.cc.cc - systemd - vulkan-loader - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libxcb - libxkbfile - libxshmfence - zlib + settings = let + substituters = [ + "https://nix-community.cachix.org" + ]; + in { + experimental-features = ["nix-command" "flakes"]; + trusted-users = ["root" "joshua"]; + extra-substituters = substituters; + trusted-substituters = substituters; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; - }) - ]; + }; + }; }