Reorganised nix code

Added firefox extension

Ports now not opened by default on portable devices.

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";
           };
       };
     };

home/programs/games.nix

@@ -9,6 +9,7 @@
     pkgs.dolphin-emu
     pkgs.suyu
     pkgs.gale
+    pkgs.adwsteamgtk
 
     # (
     #   pkgs.appimageTools.wrapType1 rec {

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"];
-  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"
-    ];
-  };
 
   services = {
     usbmuxd.enable = true;

system/hardware/fingerprint.nix

@@ -1,8 +1,26 @@
 {
   config,
   lib,
+  pkgs,
   ...
-}: {
+}: let
-  options.niksos.fingerprint = lib.mkEnableOption "fingerprint support.";
+  inherit (config.niksos) fingerprint desktop;
-  config.services.fprintd.enable = config.niksos.fingerprint;
+  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"
+      ];
+    };
+  };
 }

system/network/temporary-port.nix

@@ -1,7 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  networking.firewall.allowedTCPPorts = lib.mkOptionals config.niksos.desktop [8080]; # Handy for temporary web servers and stuff.
-}

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:.
     };
   };
 }

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];
 }

system/services/ssh.nix

@@ -1,6 +1,7 @@
-{
+{config, ...}: {
   services.openssh = {
     enable = true;
+    openFirewall = !config.niksos.portable;
     settings.UseDns = true;
   };
 }