From c00b9dc2041988afbf0b74461531f720a83ebee8 Mon Sep 17 00:00:00 2001
From: DerGrumpf <phil.keier@hotmail.com>
Date: Mon, 22 Jun 2026 22:33:33 +0200
Subject: [PATCH] Fixed workflow; removed unnecessary stuff; add iso builder

---
 .gitea/workflows/ci.yml                      |   6 +-
 flake.nix                                    |   2 +-
 home/desktop/niri/default.nix                |   0
 home/desktop/niri/swayidle.nix               |   0
 home/desktop/niri/swaylock.nix               |   0
 home/desktop/niri/swaync.nix                 | 110 -------------------
 home/desktop/rofi/default.nix                |   9 +-
 home/desktop/sketchybar/default.nix          |   8 +-
 home/desktop/waybar/default.nix              |  19 +++-
 home/neovim/alpha.nix                        |  45 ++++++--
 home/neovim/molten.nix                       |   4 +-
 home/onlyoffice.nix                          |   3 +-
 hosts/cyper-proxy/hardware-configuration.nix |  57 +++++-----
 nixos/catppuccin.nix                         |   4 -
 nixos/default.nix                            |   2 +
 nixos/roles/gitea.nix                        |  17 +--
 16 files changed, 113 insertions(+), 173 deletions(-)
 delete mode 100644 home/desktop/niri/default.nix
 delete mode 100644 home/desktop/niri/swayidle.nix
 delete mode 100644 home/desktop/niri/swaylock.nix
 delete mode 100644 home/desktop/niri/swaync.nix

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 560b4a0..d459cb2 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -15,12 +15,12 @@ jobs:
       - name: Checkout
         run: git clone https://git.cyperpunk.de/DerGrumpf/cyper-nix.git .
 
+      - name: Format check
+        run: nix fmt -- --ci
+      
       - name: Nix flake check
         run: nix flake check --impure
 
-      - name: Format check
-        run: nix fmt -- --check .
-
       - name: Build NixOS configs (dry-run)
         run: |
           nix build .#nixosConfigurations.cyper-desktop.config.system.build.toplevel --dry-run
diff --git a/flake.nix b/flake.nix
index 36ef17a..60942a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -271,6 +271,6 @@
         };
       };
 
-      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
+      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-tree;
     };
 }
diff --git a/home/desktop/niri/default.nix b/home/desktop/niri/default.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/home/desktop/niri/swayidle.nix b/home/desktop/niri/swayidle.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/home/desktop/niri/swaylock.nix b/home/desktop/niri/swaylock.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/home/desktop/niri/swaync.nix b/home/desktop/niri/swaync.nix
deleted file mode 100644
index 0f95483..0000000
--- a/home/desktop/niri/swaync.nix
+++ /dev/null
@@ -1,110 +0,0 @@
-{ ... }:
-{
-  services.swaync = {
-    enable = true;
-    settings = {
-      positionX = "center";
-      positionY = "center";
-      layer = "overlay";
-      control-center-layer = "top";
-      layer-shell = true;
-      cssPriority = "user";
-      control-center-margin-top = 100;
-      control-center-margin-bottom = 200;
-      control-center-margin-right = 0;
-      control-center-margin-left = 0;
-      notification-2fa-action = true;
-      notification-inline-replies = false;
-      notification-icon-size = 64;
-      notification-body-image-height = 100;
-      notification-body-image-width = 200;
-      widgets = [
-        "mpris"
-        "volume"
-        "inhibitors"
-        "title"
-        "dnd"
-        "notifications"
-      ];
-      widget-config = {
-
-        mpris = {
-          blacklist = [ ];
-          autohide = false;
-          show-album-art = "always";
-          loop-carousel = false;
-          image-size = 96;
-          image-radius = 12;
-        };
-
-        volume = {
-          label = "gain";
-          show-per-app = false;
-          empty-list-label = "Nothin' is playin'";
-          expand-button-label = "⤢";
-          collaps-button-label = "⤡";
-        };
-
-        title = {
-          text = "Hollerin'";
-          clear-all-button = true;
-          button-text = "Sheriff's Pardon";
-        };
-
-        dnd = {
-          text = "Let'er rest";
-        };
-
-        menubar = {
-          "menu#power" = {
-            label = "Power";
-            position = "right";
-            animation-type = "slide_down";
-            animation-duration = 250;
-            actions = [
-              {
-                label = "Bolt It";
-                command = "hyprlock";
-              }
-              {
-                label = "Ride Out";
-                command = "hyprctl dispatch exit";
-              }
-              {
-                label = "Circle Back";
-                command = "systemctl reboot";
-              }
-              {
-                label = "Bet Down the Horses";
-                command = "systemctl poweroff";
-              }
-            ];
-          };
-
-          "buttons#media" = {
-            position = "left";
-            actions = [
-              {
-                label = "Play/Pause";
-                command = "playerctl play-pause";
-              }
-              {
-                label = "Next";
-                command = "playerctl next";
-              }
-              {
-                label = "Previous";
-                command = "playerctl previous";
-              }
-            ];
-          };
-        };
-
-        notifications = {
-          vexpand = true;
-        };
-
-      };
-    };
-  };
-}
diff --git a/home/desktop/rofi/default.nix b/home/desktop/rofi/default.nix
index a3b80dd..671320e 100644
--- a/home/desktop/rofi/default.nix
+++ b/home/desktop/rofi/default.nix
@@ -1,6 +1,11 @@
 { pkgs, lib, ... }: {
-  home.packages =
-    lib.mkIf (!pkgs.stdenv.isDarwin) (with pkgs; [ rofi-power-menu rofi-calc ]);
+  home.packages = lib.mkIf (!pkgs.stdenv.isDarwin) (
+    with pkgs;
+    [
+      rofi-power-menu
+      rofi-calc
+    ]
+  );
 
   programs.rofi = lib.mkIf (!pkgs.stdenv.isDarwin) {
     enable = true;
diff --git a/home/desktop/sketchybar/default.nix b/home/desktop/sketchybar/default.nix
index d6bfd60..6d4d07c 100644
--- a/home/desktop/sketchybar/default.nix
+++ b/home/desktop/sketchybar/default.nix
@@ -1,4 +1,10 @@
-{ pkgs, lib, isDarwin, ... }: {
+{
+  pkgs,
+  lib,
+  isDarwin,
+  ...
+}:
+{
   programs.sketchybar = lib.mkIf isDarwin {
     enable = true;
     configType = "lua";
diff --git a/home/desktop/waybar/default.nix b/home/desktop/waybar/default.nix
index cef685f..e2784f2 100644
--- a/home/desktop/waybar/default.nix
+++ b/home/desktop/waybar/default.nix
@@ -1,8 +1,17 @@
-{ pkgs, lib, compositor ? "hyprland", ... }: {
-  programs.waybar = lib.mkIf (!pkgs.stdenv.isDarwin) ({
-    enable = true;
-    package = pkgs.waybar;
-  } // (import ./dual.nix { inherit compositor; }));
+{
+  pkgs,
+  lib,
+  compositor ? "hyprland",
+  ...
+}:
+{
+  programs.waybar = lib.mkIf (!pkgs.stdenv.isDarwin) (
+    {
+      enable = true;
+      package = pkgs.waybar;
+    }
+    // (import ./dual.nix { inherit compositor; })
+  );
 
   home.packages = lib.mkIf (!pkgs.stdenv.isDarwin) (with pkgs; [ cava ]);
 
diff --git a/home/neovim/alpha.nix b/home/neovim/alpha.nix
index 52357f4..81a9b98 100644
--- a/home/neovim/alpha.nix
+++ b/home/neovim/alpha.nix
@@ -46,10 +46,14 @@
           {
             type = "button";
             val = "[+] New file";
-            on_press.__raw =
-              "function() vim.cmd[[ene]] vim.cmd[[startinsert]] end";
+            on_press.__raw = "function() vim.cmd[[ene]] vim.cmd[[startinsert]] end";
             opts = {
-              keymap = [ "n" "e" ":ene <BAR> startinsert <CR>" { } ];
+              keymap = [
+                "n"
+                "e"
+                ":ene <BAR> startinsert <CR>"
+                { }
+              ];
               shortcut = "e";
               position = "center";
               cursor = 3;
@@ -63,7 +67,12 @@
             val = "[?] Find file";
             on_press.__raw = "function() vim.cmd[[Telescope find_files]] end";
             opts = {
-              keymap = [ "n" "f" ":Telescope find_files <CR>" { } ];
+              keymap = [
+                "n"
+                "f"
+                ":Telescope find_files <CR>"
+                { }
+              ];
               shortcut = "f";
               position = "center";
               cursor = 3;
@@ -77,7 +86,12 @@
             val = "[~] Recent files";
             on_press.__raw = "function() vim.cmd[[Telescope oldfiles]] end";
             opts = {
-              keymap = [ "n" "r" ":Telescope oldfiles <CR>" { } ];
+              keymap = [
+                "n"
+                "r"
+                ":Telescope oldfiles <CR>"
+                { }
+              ];
               shortcut = "r";
               position = "center";
               cursor = 3;
@@ -91,7 +105,12 @@
             val = "[Y] Yazi";
             on_press.__raw = "function() require('yazi').yazi() end";
             opts = {
-              keymap = [ "n" "y" ":Yazi<CR>" { } ];
+              keymap = [
+                "n"
+                "y"
+                ":Yazi<CR>"
+                { }
+              ];
               shortcut = "y";
               position = "center";
               cursor = 3;
@@ -105,7 +124,12 @@
             val = "[A] Open Prompt";
             #on_press.__raw = "function() require('yazi').yazi() end";
             opts = {
-              keymap = [ "n" "a" ":AvanteChatNew<CR>" { } ];
+              keymap = [
+                "n"
+                "a"
+                ":AvanteChatNew<CR>"
+                { }
+              ];
               shortcut = "a";
               position = "center";
               cursor = 3;
@@ -119,7 +143,12 @@
             val = "[X] Quit";
             on_press.__raw = "function() vim.cmd[[qa]] end";
             opts = {
-              keymap = [ "n" "q" ":qa<CR>" { } ];
+              keymap = [
+                "n"
+                "q"
+                ":qa<CR>"
+                { }
+              ];
               shortcut = "q";
               position = "center";
               cursor = 3;
diff --git a/home/neovim/molten.nix b/home/neovim/molten.nix
index 0636bab..aa0bd20 100644
--- a/home/neovim/molten.nix
+++ b/home/neovim/molten.nix
@@ -2,8 +2,8 @@
   programs.nixvim = lib.mkIf (!isDarwin) {
     plugins.molten = {
       enable = true;
-      python3Dependencies = p:
-        with p; [
+      python3Dependencies =
+        p: with p; [
           pynvim
           jupyter-client
           cairosvg
diff --git a/home/onlyoffice.nix b/home/onlyoffice.nix
index a189d4f..ed0a96b 100644
--- a/home/onlyoffice.nix
+++ b/home/onlyoffice.nix
@@ -1,4 +1,3 @@
 { pkgs, ... }: {
-  programs.onlyoffice =
-    pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) { enable = true; };
+  programs.onlyoffice = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) { enable = true; };
 }
diff --git a/hosts/cyper-proxy/hardware-configuration.nix b/hosts/cyper-proxy/hardware-configuration.nix
index 29e3382..46e3130 100644
--- a/hosts/cyper-proxy/hardware-configuration.nix
+++ b/hosts/cyper-proxy/hardware-configuration.nix
@@ -5,38 +5,41 @@
   ];
 
   boot = {
-  	loader.grub = {
-		enable = true;
-  		device = "/dev/vda";
-		};
+    loader.grub = {
+      enable = true;
+      device = "/dev/vda";
+    };
 
-  	initrd = {
-		availableKernelModules = [
-    "ata_piix"
-    "virtio_pci"
-    "virtio_scsi"
-    "virtio_blk"
-    "xhci_pci"
-    "sr_mod"
-  ];
-  		kernelModules = [ ];
-	};
-  kernelModules = [ ];
-  extraModulePackages = [ ];
-	};
+    initrd = {
+      availableKernelModules = [
+        "ata_piix"
+        "virtio_pci"
+        "virtio_scsi"
+        "virtio_blk"
+        "xhci_pci"
+        "sr_mod"
+      ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems = {
-  	"/" = {
-    device = "/dev/disk/by-label/NIXROOT";
-    fsType = "ext4";
-  };
+    "/" = {
+      device = "/dev/disk/by-label/NIXROOT";
+      fsType = "ext4";
+    };
 
-  	"/boot" = {
-    device = "/dev/disk/by-label/NIXBOOT";
-    fsType = "vfat";
-    options = [ "fmask=0022" "dmask=0022" ];
+    "/boot" = {
+      device = "/dev/disk/by-label/NIXBOOT";
+      fsType = "vfat";
+      options = [
+        "fmask=0022"
+        "dmask=0022"
+      ];
+    };
   };
-};
 
   swapDevices = [ ];
 
diff --git a/nixos/catppuccin.nix b/nixos/catppuccin.nix
index fae92fa..8750f37 100644
--- a/nixos/catppuccin.nix
+++ b/nixos/catppuccin.nix
@@ -12,9 +12,5 @@
       enable = true;
       accent = "sapphire";
     };
-    fcitx5.enable = false;
-    forgejo.enable = false;
-    gitea.enable = false;
-    sddm.enable = false;
   };
 }
diff --git a/nixos/default.nix b/nixos/default.nix
index 1562509..613c00e 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -85,6 +85,8 @@
     };
   };
 
+  environment.systemPackages = with pkgs; [ git ];
+
   security = lib.mkIf (!isServer) {
     pam.services.swaylock = { };
     polkit.enable = true;
diff --git a/nixos/roles/gitea.nix b/nixos/roles/gitea.nix
index 6be6a7a..0849ae6 100644
--- a/nixos/roles/gitea.nix
+++ b/nixos/roles/gitea.nix
@@ -210,17 +210,18 @@ in
       tokenFile = config.sops.secrets."gitea/runnerToken".path;
       name = "cyper-controller";
       labels = [ "nix:host" ];
+
       hostPackages = with pkgs; [
-        nodejs
-        git
-        nix
         bash
+        coreutils
+        curl
+        gawk
+        gitMinimal
+        gnused
+        nodejs
+        wget
+        nix
       ];
-      settings = {
-        runner.env_vars = {
-          PATH = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin";
-        };
-      };
     };
   };