diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index 80b2f31..e1378f2 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -57,6 +57,7 @@ in { # "{34daeb50-c2d2-4f14-886a-7160b24d66a4}".install_url = "https://addons.mozilla.org/firefox/downloads/latest/youtube-shorts-block/latest.xpi"; # Youtube short blocker "vimium-c@gdh1995.cn".install_url = "https://addons.mozilla.org/firefox/downloads/latest/vimium-c/latest.xpi"; # Extension info here. "ff2mpv@yossarian.net".install_url = "https://addons.mozilla.org/firefox/downloads/latest/ff2mpv/latest.xpi"; + "newtaboverride@agenedia.com".install_url = "https://addons.mozilla.org/firefox/downloads/latest/new-tab-override/latest.xpi"; }; }; }; diff --git a/home/programs/games.nix b/home/programs/games.nix index fbfb04e..ec5b652 100644 --- a/home/programs/games.nix +++ b/home/programs/games.nix @@ -9,6 +9,7 @@ pkgs.dolphin-emu pkgs.suyu pkgs.gale + pkgs.adwsteamgtk # ( # pkgs.appimageTools.wrapType1 rec { diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 458ca15..1c88ecf 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -20,17 +20,7 @@ in { portable = true; neovim = true; }; - - home-manager.users.jsw.wayland.windowManager.hyprland.settings = { - monitor = ["eDP-1,2880x1920@120,0x0,1.5,vrr,1"]; - bind = [ - ", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'" - ]; - windowrulev2 = [ - # FIXME: change to `windowrule` after hyprland update. - "float, class:foot-fprintd" - ]; - }; + home-manager.users.jsw.wayland.windowManager.hyprland.settings.monitor = ["eDP-1,2880x1920@120,0x0,1.5,vrr,1"]; services = { usbmuxd.enable = true; diff --git a/system/hardware/fingerprint.nix b/system/hardware/fingerprint.nix index d8e8160..1212b33 100644 --- a/system/hardware/fingerprint.nix +++ b/system/hardware/fingerprint.nix @@ -1,8 +1,26 @@ { config, lib, + pkgs, ... -}: { - options.niksos.fingerprint = lib.mkEnableOption "fingerprint support."; - config.services.fprintd.enable = config.niksos.fingerprint; +}: let + inherit (config.niksos) fingerprint desktop; + inherit (lib) mkIf mkEnableOption; + uwsm = lib.getExe pkgs.uwsm; + foot = lib.getExe pkgs.foot; +in { + options.niksos.fingerprint = mkEnableOption "fingerprint support."; + + config = mkIf fingerprint { + services.fprintd.enable = true; + + home-manager.users.jsw.wayland.windowManager.hyprland.settings = mkIf desktop { + bind = [ + ", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'" + ]; + windowrule = [ + "float, class:foot-fprintd" + ]; + }; + }; } diff --git a/system/network/temporary-port.nix b/system/network/temporary-port.nix deleted file mode 100644 index 3cd8865..0000000 --- a/system/network/temporary-port.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - config, - lib, - ... -}: { - networking.firewall.allowedTCPPorts = lib.mkOptionals config.niksos.desktop [8080]; # Handy for temporary web servers and stuff. -} diff --git a/system/programs/games.nix b/system/programs/games.nix index abf54a7..e06e2f1 100644 --- a/system/programs/games.nix +++ b/system/programs/games.nix @@ -61,7 +61,7 @@ }; }; environment.variables = { - "STEAM_FORCE_DESKTOP_UI_SCALING" = "1.5"; + "STEAM_FORCE_DESKTOP_UI_SCALING" = "1.5"; #FIXME:. }; }; } diff --git a/system/server/caddy.nix b/system/server/caddy.nix index f36b696..389cbed 100644 --- a/system/server/caddy.nix +++ b/system/server/caddy.nix @@ -1,9 +1,15 @@ -{config, ...}: { +{ + config, + lib, + ... +}: let + cfg = config.niksos.server; +in { services.caddy = { - enable = config.niksos.server; + enable = cfg; email = "jurnwubben@gmail.com"; enableReload = false; }; - networking.firewall.allowedTCPPorts = [80 443]; + networking.firewall.allowedTCPPorts = lib.mkIf cfg [80 443]; } diff --git a/system/services/ssh.nix b/system/services/ssh.nix index 48d6c4b..574d769 100644 --- a/system/services/ssh.nix +++ b/system/services/ssh.nix @@ -1,6 +1,7 @@ -{ +{config, ...}: { services.openssh = { enable = true; + openFirewall = !config.niksos.portable; settings.UseDns = true; }; }