From f061e0b0c7ed745f372a89d5ec5f69dbd818c731 Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Sat, 31 Jan 2026 15:10:46 -0500 Subject: desktop changes 2026-01-31 --- modules/desktop/apps/browsers/librewolf.nix | 66 +++++++++++++++++++++++++++++ modules/desktop/apps/editors/vscode.nix | 4 +- modules/desktop/apps/games/prism.nix | 3 +- modules/desktop/apps/games/vintagestory.nix | 31 -------------- modules/desktop/apps/mpd.nix | 2 +- modules/desktop/apps/virt.nix | 7 --- 6 files changed, 71 insertions(+), 42 deletions(-) create mode 100644 modules/desktop/apps/browsers/librewolf.nix delete mode 100644 modules/desktop/apps/games/vintagestory.nix (limited to 'modules/desktop') diff --git a/modules/desktop/apps/browsers/librewolf.nix b/modules/desktop/apps/browsers/librewolf.nix new file mode 100644 index 0000000..1700754 --- /dev/null +++ b/modules/desktop/apps/browsers/librewolf.nix @@ -0,0 +1,66 @@ +{ + config, + options, + lib, + pkgs, + ... +}: let + librewolfConf = config.modules.desktop.apps.browsers.librewolf; +in +{ + options.modules.desktop.apps.browsers.librewolf = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + }; + }; + config = lib.mkIf (librewolfConf.enable) { + home.manager.programs.librewolf = { + enable = true; + profiles = { + "user" = { + id = 0; + isDefault = true; + + search.engines = { + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; + }; + "Nix Options" = { + urls = [{ + template = "https://search.nixos.org/options"; + params = [ + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@no" ]; + }; + "Nix Wiki" = { + urls = [{ + template = "https://wiki.nixos.org/w/index.php"; + params = [ + { name = "search"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@nw" ]; + }; + }; + }; + }; + }; + + modules.desktop.defaultApplications.apps.browser = rec { + package = pkgs.librewolf; + install = false; + cmd = "${package}/bin/librewolf"; + desktop = "librewolf"; + }; + }; +} diff --git a/modules/desktop/apps/editors/vscode.nix b/modules/desktop/apps/editors/vscode.nix index a775be8..d9f3bd4 100644 --- a/modules/desktop/apps/editors/vscode.nix +++ b/modules/desktop/apps/editors/vscode.nix @@ -5,10 +5,10 @@ pkgs, ... }: let - codeConf = config.modules.desktop.apps.editors.vscode; + codeConf = config.modules.desktop.apps.editors.vscodium; configDir = config.nixosConfig.configDir; in { - options.modules.desktop.apps.editors.vscode = { + options.modules.desktop.apps.editors.vscodium = { enable = lib.mkOption { type = lib.types.bool; default = false; diff --git a/modules/desktop/apps/games/prism.nix b/modules/desktop/apps/games/prism.nix index d3ceee7..b586451 100644 --- a/modules/desktop/apps/games/prism.nix +++ b/modules/desktop/apps/games/prism.nix @@ -16,7 +16,8 @@ in { }; config = lib.mkIf (prismConf.enable) { - environment.systemPackages = [ + home.packages = [ + pkgs.javaPackages.compiler.temurin-bin.jre-25 pkgs.prismlauncher ]; }; diff --git a/modules/desktop/apps/games/vintagestory.nix b/modules/desktop/apps/games/vintagestory.nix deleted file mode 100644 index a15935a..0000000 --- a/modules/desktop/apps/games/vintagestory.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - options, - lib, - pkgs, - rootPath, - ... -}: let - vsConf = config.modules.desktop.apps.games.vintagestory; - configDir = config.nixosConfig.configDir; -in { - options.modules.desktop.apps.games.vintagestory = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - }; - }; - - config = lib.mkIf (vsConf.enable) { - home.manager.xdg.mimeApps = { - defaultApplications = { - "x-scheme-handler/vintagestoryjoin" = [ "Vintagestory_url_connect.desktop" ]; - "x-scheme-handler/vintagestorymodinstall" = [ "Vintagestory_url_mod.desktop" ]; - }; - }; - - home.packages = with pkgs; [ - (callPackage (rootPath + /packages/vintagestory/default.nix) {}) - ]; - }; -} diff --git a/modules/desktop/apps/mpd.nix b/modules/desktop/apps/mpd.nix index 17b22ec..3ec86e4 100644 --- a/modules/desktop/apps/mpd.nix +++ b/modules/desktop/apps/mpd.nix @@ -17,7 +17,7 @@ in config = lib.mkIf (mpdConfig.enable) { home.packages = [ - pkgs.mpc-cli + pkgs.mpc ]; services.mpd = { diff --git a/modules/desktop/apps/virt.nix b/modules/desktop/apps/virt.nix index a9eaef4..ec4a41a 100644 --- a/modules/desktop/apps/virt.nix +++ b/modules/desktop/apps/virt.nix @@ -26,13 +26,6 @@ in package = pkgs.qemu_kvm; runAsRoot = true; swtpm.enable = true; - ovmf = { - enable = true; - packages = [(pkgs.OVMF.override { - secureBoot = true; - tpmSupport = true; - }).fd]; - }; }; }; programs.virt-manager.enable = true; -- cgit v1.2.3