diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix index 76f376e..3ed6e24 100644 --- a/instances/odin/hm.nix +++ b/instances/odin/hm.nix @@ -105,7 +105,7 @@ ../../modules/hm/dunst.nix # ../../modules/hm/dwarf-fortress.nix ../../modules/hm/easyeffects.nix - ../../modules/hm/firefox.nix + # ../../modules/hm/firefox.nix # ../../modules/hm/fonts.nix # ../../modules/hm/gnome_shell.nix # ../../modules/hm/grobi.nix diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index 3687c94..1a75149 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -97,7 +97,7 @@ ../../modules/hm/dunst.nix # ../../modules/hm/dwarf-fortress.nix ../../modules/hm/easyeffects.nix - ../../modules/hm/firefox.nix + # ../../modules/hm/firefox.nix ../../modules/hm/fonts.nix # ../../modules/hm/gnome_shell.nix # ../../modules/hm/grobi.nix diff --git a/modules/hm/webapp.nix b/modules/hm/webapp.nix index 58c6c12..4eeb4e1 100644 --- a/modules/hm/webapp.nix +++ b/modules/hm/webapp.nix @@ -1,14 +1,27 @@ { pkgs, lib, ... }: # Categories: https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry let - # cmd = link: "${pkgs.google-chrome}/bin/google-chrome-stable --app=${link}"; - cmd = link: "firefox --new-window ${link}"; + chrome-cmd = link: "${pkgs.google-chrome}/bin/google-chrome-stable --app=${link}"; + # firefox-cmd = link: "firefox --new-window ${link}"; + webAppBuilder = + { desktopName + , name ? builtins.replaceStrings [ " " ] [ "_" ] desktopName + , link + , cmd ? chrome-cmd + , icon ? lib.toLower name + , comment ? null + , categories ? [ "Network" ] + }: + pkgs.makeDesktopItem { + inherit name icon desktopName comment categories; + exec = cmd link; + }; links = [ - # { - # desktopName = "Microsoft Teams"; - # link = "https://teams.microsoft.com"; - # categories = [ "Office" ]; - # } + { + desktopName = "Microsoft Teams"; + link = "https://teams.microsoft.com"; + categories = [ "Office" ]; + } { desktopName = "Chess.com"; link = "https://chess.com"; @@ -80,17 +93,6 @@ let categories = [ "AudioVideo" ]; } ]; - webAppBuilder = - { desktopName - , name ? builtins.replaceStrings [ " " ] [ "_" ] desktopName - , link - , icon ? lib.toLower name - , comment ? null - , categories ? [ "Network" ] - }: - pkgs.makeDesktopItem { - inherit name icon desktopName comment categories; - exec = cmd link; - }; + in { home.packages = map webAppBuilder links; }