From 3ccf3147edf663271960826c79a4213bc3b3eb8f Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Wed, 4 Mar 2026 16:48:13 -0600 Subject: refactor mercury config --- hosts/mercury/hjem.nix | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) (limited to 'hosts/mercury/hjem.nix') diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix index 793ee2a..bb08a33 100644 --- a/hosts/mercury/hjem.nix +++ b/hosts/mercury/hjem.nix @@ -1,40 +1,28 @@ -{ - pkgs, - inputs, - ... -}: let - captiveBrowserDesktop = pkgs.makeDesktopItem { - name = "captive-browser"; - desktopName = "Captive Browser"; - exec = "${pkgs.captive-browser}/bin/captive-browser"; - icon = "web-browser"; - terminal = false; - categories = ["Application"]; - }; -in { +{pkgs, ...}: { packages = with pkgs; [ - tor-browser # don't ask - obsidian - kdePackages.kleopatra anki - musescore libreoffice-qt - mpv - bluetuith - + kdePackages.kleopatra prismlauncher + mpv + musescore vital - captive-browser # https://words.filippo.io/captive-browser - captiveBrowserDesktop - # inputs.glide-browser.packages."x86_64-linux".default - # inputs.vermilion.packages."x86_64-linux".default + bluetuith + (pkgs.callPackage ../../pkgs/yo {}) - # (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;}) - (pkgs.callPackage ../../pkgs/yo {inherit inputs;}) + captive-browser # https://words.filippo.io/captive-browser + (pkgs.makeDesktopItem { + name = "captive-browser"; + desktopName = "Captive Browser"; + exec = "${pkgs.captive-browser}/bin/captive-browser"; + icon = "web-browser"; + terminal = false; + categories = ["Application"]; + }) ]; files.".config/captive-browser.toml".text = '' @@ -51,8 +39,4 @@ in { socks5-addr = "localhost:1666" ''; - - files.".config/yo.conf".text = '' - sudo run0 --background= - ''; } -- cgit v1.3.1