From 8e5316761c95dc10fa5a429c146a3b1d42507458 Mon Sep 17 00:00:00 2001
From: Sebastian Moser <smoser@student.tugraz.at>
Date: Thu, 26 Feb 2026 19:34:43 +0100
Subject: [PATCH] idk

---
 common/nixos-wayland.nix |  4 ++--
 hosts/mac.nix            |  4 ++++
 hosts/main.nix           |  7 +++++--
 mods/fesu-services.nix   | 11 +++++++----
 programs/bash.nix        |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/common/nixos-wayland.nix b/common/nixos-wayland.nix
index eb5e650..d1251b1 100644
--- a/common/nixos-wayland.nix
+++ b/common/nixos-wayland.nix
@@ -459,7 +459,6 @@ output "HDMI-A-1" {
         # the sticky workspaces, that are the same in all workrooms
 
           bindsym $mod+1 workspace number 1
-          bindsym $mod+4 workspace number 4
           bindsym $mod+7 workspace number 7
           bindsym $mod+8 workspace number 8
           bindsym $mod+9 workspace number 9
@@ -467,7 +466,6 @@ output "HDMI-A-1" {
 
 
           bindsym $mod+Shift+1 move container to workspace number 1
-          bindsym $mod+Shift+4 move container to workspace number 4
           bindsym $mod+Shift+7 move container to workspace number 7
           bindsym $mod+Shift+8 move container to workspace number 8
           bindsym $mod+Shift+9 move container to workspace number 9
@@ -492,12 +490,14 @@ output "HDMI-A-1" {
         # nav to workspaces in workrooms
           bindsym $mod+2 set $$workspace 2; workspace $$workroom$$workspace
           bindsym $mod+3 set $$workspace 3; workspace $$workroom$$workspace
+          bindsym $mod+4 set $$workspace 4; workspace $$workroom$$workspace
           bindsym $mod+5 set $$workspace 5; workspace $$workroom$$workspace
           bindsym $mod+6 set $$workspace 6; workspace $$workroom$$workspace
 
         # move windows to workspaces in workrooms
           bindsym $mod+Shift+2 set $$tmp-workspace 2; move container to workspace $$workroom$$tmp-workspace
           bindsym $mod+Shift+3 set $$tmp-workspace 3; move container to workspace $$workroom$$tmp-workspace
+          bindsym $mod+Shift+4 set $$tmp-workspace 4; move container to workspace $$workroom$$tmp-workspace
           bindsym $mod+Shift+5 set $$tmp-workspace 5; move container to workspace $$workroom$$tmp-workspace
           bindsym $mod+Shift+6 set $$tmp-workspace 6; move container to workspace $$workroom$$tmp-workspace
 
diff --git a/hosts/mac.nix b/hosts/mac.nix
index 339723e..a4cc69b 100644
--- a/hosts/mac.nix
+++ b/hosts/mac.nix
@@ -85,11 +85,15 @@ in {
     "aarch64-linux"
   ];
 
+  networking.nftables.enable = true;
   virtualisation.libvirtd = {
     enable = true;
     qemuOvmf = true;
     qemuSwtpm = true;
     #qemuOvmfPackage = pkgs.OVMFFull;
+    extraConfig = ''
+      firewall_backend = "nftables"
+    '';
   };
 
 	# Use the GRUB 2 boot loader.
diff --git a/hosts/main.nix b/hosts/main.nix
index ace64af..2dcd045 100644
--- a/hosts/main.nix
+++ b/hosts/main.nix
@@ -866,18 +866,21 @@
 
 
   ######################################### virtualisation ###############################
-    virtualisation.docker.enable = true;
+  networking.nftables.enable = true;
+  virtualisation.docker.enable = true;
   	virtualisation.libvirtd = {
       enable = true;
       #qemuOvmf = true;
       qemuSwtpm = true;
       #qemuOvmfPackage = pkgs.OVMFFull;
+      extraConfig = ''
+        firewall_backend = "nftables"
+      '';
     };
 
 
     # see: https://github.com/NixOS/nixpkgs/issues/300081
     #disabledModules = [ "virtualisation/incus.nix" ]; 
-    networking.nftables.enable = true;
     # client package now separated...
     #virtualisation.incus.clientPackage = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux.incus;
     virtualisation.incus.enable = true;
diff --git a/mods/fesu-services.nix b/mods/fesu-services.nix
index 2fa70b4..61302db 100644
--- a/mods/fesu-services.nix
+++ b/mods/fesu-services.nix
@@ -34,12 +34,14 @@
 - ppc hosting ports
   - 8000 dav
   - 8001 affine
+  - 8002 git
+  - 8003 git ssh
 
 ## hosting container ips (on the interface br-proxy
-  - fusu 192.168.101.1
-  - me-hosting 192.168.101.2
-  - ppc-hosting 192.168.101.3
-  - pcmc 192.168.101.4
+  - fusu 192.168.1.2
+  - me-hosting 192.168.1.20
+  - ppc-hosting 192.168.1.21
+  - pcmc 192.168.1.23
 
  */
 
@@ -423,6 +425,7 @@ in {
           { name = "instant-backend"; domain = "instant-backend.ppc.social"; host = "me-hosting"; port = 8005; }
           { name = "isotoke-website"; domain = "isotoke.ppc.social"; host = "192.168.1.26"; port = 80; }
           { name = "affine"; domain = "affine.ppc.social"; host = "ppc-hosting"; port = 8001; }
+          { name = "gitea"; domain = "git.ppc.social"; host = "ppc-hosting"; port = 8002; }
         ]
 
         # extraRouters (full configs)
diff --git a/programs/bash.nix b/programs/bash.nix
index 3a70b66..9aebf2e 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -41,7 +41,7 @@
 		shellAliases = {
       archive-video = "${lib.getExe pkgs.yt-dlp} -f \"bv*+ba/b\" --merge-output-format mp4 --embed-thumbnail --write-thumbnail --convert-thumbnails png --add-metadata -o \"%(title)s.%(ext)s\"";
 
-      zed="WAYLAND_DISPLAY= zeditor";
+      #zed="WAYLAND_DISPLAY= zeditor";
       npm="pnpm";
       md="~/work/modules/modules/dev/run";
       mize="~/work/mize/mize";