diff --git a/homes/x86_64-linux/kylekrein/default.nix b/homes/x86_64-linux/kylekrein/default.nix index 016f545..17df474 100644 --- a/homes/x86_64-linux/kylekrein/default.nix +++ b/homes/x86_64-linux/kylekrein/default.nix @@ -21,6 +21,7 @@ in #xournalpp.enable = osConfig.custom.presets.wayland.enable; librewolf.enable = osConfig.custom.presets.wayland.enable; prismlauncher.enable = osConfig.custom.presets.gaming.enable; + minecraft-bedrock.enable = osConfig.custom.presets.gaming.enable; bottles.enable = osConfig.custom.presets.wayland.enable; nextcloud-client.enable = osConfig.custom.presets.wayland.enable; thunderbird.enable = osConfig.custom.presets.wayland.enable; @@ -38,8 +39,7 @@ in obs-studio localsend kdePackages.kdenlive - ] - ++ lib.optionals osConfig.custom.presets.gaming.enable [mcpelauncher-ui-qt]; + ]; sessionVariables = { EDITOR = diff --git a/modules/home/impermanence/default.nix b/modules/home/impermanence/default.nix index 244721c..27854da 100644 --- a/modules/home/impermanence/default.nix +++ b/modules/home/impermanence/default.nix @@ -58,8 +58,6 @@ in { } ".mozilla" ".librewolf" - ".local/share/mcpelauncher" - ".local/share/PrismLauncher" ".local/share/TelegramDesktop" ".local/share/Paradox Interactive" ".config/unity3d/Ludeon Studios/RimWorld by Ludeon Studios" diff --git a/modules/home/programs/minecraft-bedrock/default.nix b/modules/home/programs/minecraft-bedrock/default.nix new file mode 100644 index 0000000..ab1acea --- /dev/null +++ b/modules/home/programs/minecraft-bedrock/default.nix @@ -0,0 +1,34 @@ +{ + lib, + pkgs, + inputs, + namespace, + system, + target, + format, + virtual, + systems, + config, + ... +}: +with lib; +with lib.${namespace}; let + cfg = config.${namespace}.programs.minecraft-bedrock; + impermanence = config.${namespace}.impermanence; +in { + options.${namespace}.programs.minecraft-bedrock = with types; { + enable = mkBoolOpt false "Enable mcpelauncher"; + }; + + config = mkIf cfg.enable { + home.packages = with pkgs; [mcpelauncher-ui-qt]; + home.persistence = mkIf impermanence.enable { + "${impermanence.persistentStorage}".directories = [ + { + directory = ".local/share/mcpelauncher"; + method = "symlink"; + } + ]; + }; + }; +} diff --git a/modules/home/programs/prismlauncher/default.nix b/modules/home/programs/prismlauncher/default.nix index e0588e1..c1c89d1 100644 --- a/modules/home/programs/prismlauncher/default.nix +++ b/modules/home/programs/prismlauncher/default.nix @@ -25,7 +25,7 @@ in { home.persistence = mkIf impermanence.enable { "${impermanence.persistentStorage}".directories = [ { - directory = ".local/share/Prismlauncher"; + directory = ".local/share/PrismLauncher"; method = "symlink"; } ]; diff --git a/systems/x86_64-linux/andrej-pc/default.nix b/systems/x86_64-linux/andrej-pc/default.nix index 477bfcf..1a4651c 100644 --- a/systems/x86_64-linux/andrej-pc/default.nix +++ b/systems/x86_64-linux/andrej-pc/default.nix @@ -20,7 +20,7 @@ with lib.custom; { presets.wayland = enabled; presets.gaming = enabled; hardware = { - nvidia = enabled; + #nvidia = enabled; bluetooth = enabled; printing = enabled; }; @@ -58,9 +58,6 @@ with lib.custom; { enable = true; systemd.setPath = enabled; }; - services.scx.enable = true; # by default uses scx_rustland scheduler - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos; - system.modulesTree = [pkgs.linux_cachyos.modules]; networking.firewall.allowedTCPPorts = [22 25565]; networking.firewall.allowedUDPPorts = [22 25565]; @@ -115,9 +112,8 @@ with lib.custom; { jdk teams-for-linux ]; - hardware.nvidia.open = lib.mkForce false; - #hardware.nvidia.package = lib.mkForce config.boot.kernelPackages.nvidiaPackages.latest; systemd.network.wait-online.enable = lib.mkForce false; + networking.wireless.enable = false; networking.networkmanager.enable = true; services.udisks2.enable = true; diff --git a/systems/x86_64-linux/stargate/services/paperless.nix b/systems/x86_64-linux/stargate/services/paperless.nix index 85f138a..88bc427 100644 --- a/systems/x86_64-linux/stargate/services/paperless.nix +++ b/systems/x86_64-linux/stargate/services/paperless.nix @@ -30,6 +30,7 @@ with lib.custom; { pdfa_image_compression = "lossless"; }; PAPERLESS_URL = "https://paperless.kylekrein.com"; + PAPERLESS_FILENAME_FORMAT = "{{ created_year }}/{{ correspondent }}/{{ title }}"; }; }; }