diff --git a/flake.lock b/flake.lock index ff5d3ac..c6da879 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,27 @@ "url": "https://git.zynh.me/Zynh0722/backgrounds" } }, + "borderless-browser": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1697838514, + "narHash": "sha256-PWZCkx2+/86e1Jc6Myk/U3UbHZULypo+WPqJHmPPbH8=", + "owner": "lucasew", + "repo": "borderless-browser.nix", + "rev": "bcca59662b8d0cbbc6dd93321d8d65e3eb547d47", + "type": "github" + }, + "original": { + "owner": "lucasew", + "repo": "borderless-browser.nix", + "type": "github" + } + }, "dunst-theme": { "flake": false, "locked": { @@ -126,6 +147,24 @@ "type": "indirect" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -308,6 +347,7 @@ "root": { "inputs": { "backgrounds": "backgrounds", + "borderless-browser": "borderless-browser", "dunst-theme": "dunst-theme", "fish_theme": "fish_theme", "home-manager": "home-manager", @@ -337,6 +377,21 @@ "repo": "sops-nix", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 50c3a91..b4589a4 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,11 @@ }; repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone"; + + borderless-browser = { + url = "github:lucasew/borderless-browser.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home/modules/xivlauncher.nix b/home/modules/xivlauncher.nix index 49bf62b..043a161 100644 --- a/home/modules/xivlauncher.nix +++ b/home/modules/xivlauncher.nix @@ -1,24 +1,40 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: let cfg = config.snowhawk.xivlauncher; in { + imports = [ + inputs.borderless-browser.homeModules + ]; + options.snowhawk.xivlauncher = { enable = lib.mkEnableOption "xivlauncher home-manager module"; textools.enable = lib.mkEnableOption "TexTools wine application"; + + iinact.enable = lib.mkEnableOption "iinact borderless-browser"; }; config = let launchffxiv = "${pkgs.xivlauncher}/bin/XIVLauncher.Core"; in lib.mkIf cfg.enable { + borderless-browser = { + chromium = pkgs.brave; + apps = { + iinact = { + desktopName = "IINACT"; + url = "http://proxy.iinact.com/overlay/skyline/?OVERLAY_WS=ws://127.0.0.1:10501/ws"; + }; + }; + }; + home.packages = with pkgs; [ xivlauncher - (writeShellScriptBin "iinact" '' - ${pkgs.brave}/bin/brave --new-window "http://proxy.iinact.com/overlay/skyline/?OVERLAY_WS=ws://127.0.0.1:10501/ws" - '') + # (writeShellScriptBin "iinact" '' + # ${pkgs.brave}/bin/brave --new-window "http://proxy.iinact.com/overlay/skyline/?OVERLAY_WS=ws://127.0.0.1:10501/ws" + # '') ] ++ map (name: (writeShellScriptBin name launchffxiv)) [ "ff14" "xivlauncher" ]; }; }