fix: remove overwriting of forgejo port opening

home/themes/vanilla.nix

@@ -1,4 +1,7 @@
 { pkgs, lib, ... }:
+let
+  inherit (lib.my) validatePath;
+in
 {
   dconf = {
     enable = true;
@@ -11,6 +14,10 @@
       name = "Adwaita";
       package = pkgs.gnome-themes-extra;
     };
+    iconTheme = rec {
+      name = validatePath "${package}/share/icons/Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
   };
 
   qt = {

hosts/marr/default.nix

@@ -95,6 +95,7 @@
   };
 
   services = {
+    displayManager.sddm.enable = true;
     dbus.enable = true;
     fwupd.enable = true;
     gvfs.enable = true;
@@ -109,16 +110,6 @@
     gnome.gnome-keyring.enable = true;
     openssh.enable = true;
 
-    greetd = {
-      enable = true;
-      settings = {
-        default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --remember-user-session --time";
-          user = "greeter";
-        };
-      };
-    };
-
     #: Power Consumption {{{
     logind = {
       lidSwitch = "suspend-then-hibernate";
@@ -127,19 +118,7 @@
 
     thermald.enable = true;
 
-    tlp = {
-      enable = false;
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-        CPU_MIN_PERF_ON_BAT = 0;
-        CPU_MAX_PERF_ON_BAT = 20;
-
-        # Optional helps save long term battery health
-        START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
-        STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
-      };
-    };
+    auto-cpufreq.enable = true;
 
     upower = {
       enable = true;
@@ -172,21 +151,18 @@
 
   security.polkit.enable = true;
 
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
+  virtualisation = {
+    libvirtd.enable = true;
+  };
 
   programs.nix-ld.enable = true;
 
   environment.systemPackages = with pkgs; [
     shared-mime-info
     glib
-    wireguard-tools
     dconf
     xdg-utils
     brightnessctl
-    pop-icon-theme
-
-    kicad-small
   ];
 
   system.stateVersion = "24.11";

hosts/raptus/default.nix

@@ -79,7 +79,7 @@ in
 
   networking = {
     nftables.enable = true;
-    firewall = lib.mkForce {
+    firewall = {
       enable = true;
       allowedTCPPorts = [
         80 # for acme challenges
@@ -109,6 +109,8 @@ in
     port = 22;
   };
 
+  services.fail2ban.enable = true;
+
   environment.systemPackages = map lib.lowPrio [
     pkgs.curl
     pkgs.gitMinimal

hosts/raptus/forgejo.nix

@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 let
   domain = "git.ccnlc.eu";
+  sshPort = 2222;
 in
 {
   systemd.tmpfiles.rules =
@@ -15,7 +16,7 @@ in
       "L+ ${config.services.forgejo.customDir}/public/robots.txt - - - - ${robots.outPath}"
     ];
 
-  networking.firewall.allowedTCPPorts = [ 2222 ];
+  networking.firewall.allowedTCPPorts = [ sshPort ];
 
   services.nginx = {
     enable = true;
@@ -43,8 +44,8 @@ in
 
     settings = {
       server = {
-        SSH_PORT = 2222;
-        SSH_LISTEN_PORT = 2222;
+        SSH_PORT = sshPort;
+        SSH_LISTEN_PORT = sshPort;
         START_SSH_SERVER = true;
         DOMAIN = domain;
         HTTP_PORT = 3000;