Added workflow for automatic iso builds

.gitea/workflows/ci.yml

@@ -9,15 +9,17 @@ jobs:
   check:
     runs-on: nix
     env:
-      PATH: "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/usr/bin:/bin"
+      PATH: "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"
+      NIXPKGS_ALLOW_UNFREE: "1"
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
-
+        run: git clone https://git.cyperpunk.de/DerGrumpf/cyper-nix.git .
-      - name: Nix flake check
-        run: nix flake check --no-build
 
       - name: Format check
-        run: nix fmt -- --check .
+        run: nix fmt -- --ci
+      
+      - name: Nix flake check
+        run: nix flake check --impure
 
       - name: Build NixOS configs (dry-run)
         run: |
@@ -27,5 +29,3 @@ jobs:
           nix build .#nixosConfigurations.cyper-node-1.config.system.build.toplevel --dry-run
           nix build .#nixosConfigurations.cyper-node-2.config.system.build.toplevel --dry-run
 
-      - name: Eval darwin config (Linux-safe)
-        run: nix eval .#darwinConfigurations.cyper-mac.system

.gitea/workflows/release.yml

@@ -0,0 +1,47 @@
+name: Release ISOs
+
+on:
+  workflow_run:
+    workflows: ["CI"]
+    types:
+      - completed
+    branches: ["main"]
+
+jobs:
+  build-isos:
+    runs-on: nix
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    env:
+      NIXPKGS_ALLOW_UNFREE: "1"
+    steps:
+      - name: Checkout
+        run: git clone https://git.cyperpunk.de/DerGrumpf/cyper-nix.git .
+
+      - name: Build ISOs
+        run: |
+          nix build .#packages.x86_64-linux.cyper-desktop-iso --out-link result-desktop
+          nix build .#packages.x86_64-linux.cyper-controller-iso --out-link result-controller
+          nix build .#packages.x86_64-linux.cyper-proxy-iso --out-link result-proxy
+          nix build .#packages.x86_64-linux.cyper-node-1-iso --out-link result-node-1
+          nix build .#packages.x86_64-linux.cyper-node-2-iso --out-link result-node-2
+
+      - name: Create release and upload ISOs
+        run: |
+          TAG="iso-$(date +%Y%m%d-%H%M%S)"
+          COMMIT=$(git -C . rev-parse --short HEAD)
+
+          RELEASE=$(curl -s -X POST \
+            -H "Authorization: token ${{ secrets.CI_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "{\"tag_name\":\"${TAG}\",\"name\":\"ISOs ${TAG}\",\"body\":\"Automated ISO build from commit ${COMMIT}\"}" \
+            "https://git.cyperpunk.de/api/v1/repos/DerGrumpf/cyper-nix/releases")
+
+          RELEASE_ID=$(echo $RELEASE | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
+
+          for result in result-desktop result-controller result-proxy result-node-1 result-node-2; do
+            iso=$(find $result -name "*.iso" | head -1)
+            curl -s -X POST \
+              -H "Authorization: token ${{ secrets.CI_TOKEN }}" \
+              -F "attachment=@${iso};filename=${result}.iso" \
+              "https://git.cyperpunk.de/api/v1/repos/DerGrumpf/cyper-nix/releases/${RELEASE_ID}/assets"
+          done

flake.nix

@@ -95,6 +95,61 @@
     }@inputs:
     let
       primaryUser = "phil";
+
+      mkIso =
+        {
+          hostName,
+          isDarwin ? false,
+          isServer ? false,
+        }:
+        nixos-generators.nixosGenerate {
+          system = "x86_64-linux";
+          format = "iso";
+          specialArgs = {
+            inherit
+              inputs
+              primaryUser
+              self
+              hostName
+              isDarwin
+              isServer
+              ;
+          };
+          modules = [
+            {
+              nixpkgs.overlays = [
+                inputs.nur.overlays.default
+                (import ./overlays { inherit (inputs) nur; })
+              ];
+            }
+            { nixpkgs.config.allowUnfree = true; }
+            { nixpkgs.hostPlatform = "x86_64-linux"; }
+            { networking.hostName = hostName; }
+            ./hosts/${hostName}/configuration.nix
+            ./nixos
+            inputs.sops-nix.nixosModules.sops
+            inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                extraSpecialArgs = {
+                  inherit
+                    inputs
+                    primaryUser
+                    self
+                    hostName
+                    isDarwin
+                    isServer
+                    ;
+                };
+                users.${primaryUser} = import ./home;
+                backupFileExtension = "backup";
+                useGlobalPkgs = true;
+                useUserPackages = true;
+              };
+            }
+          ];
+        };
+
       mkSystem =
         {
           hostName,
@@ -196,38 +251,26 @@
         isDarwin = true;
       };
 
-      # NEW: flashable image for cyper-controller
+      packages.x86_64-linux = {
-      packages.x86_64-linux.cyper-controller-image = nixos-generators.nixosGenerate {
+        cyper-desktop-iso = mkIso { hostName = "cyper-desktop"; };
-        system = "x86_64-linux";
+        cyper-controller-iso = mkIso {
-        format = "raw-efi";
-        specialArgs = {
-          inherit inputs primaryUser self;
           hostName = "cyper-controller";
-          isDarwin = false;
           isServer = true;
         };
-        modules = [
+        cyper-proxy-iso = mkIso {
-          { nixpkgs.hostPlatform = "x86_64-linux"; }
+          hostName = "cyper-proxy";
-          { networking.hostName = "cyper-controller"; }
+          isServer = true;
-          ./hosts/cyper-controller/configuration.nix
+        };
-          ./nixos
+        cyper-node-1-iso = mkIso {
-          inputs.sops-nix.nixosModules.sops
+          hostName = "cyper-node-1";
-          inputs.home-manager.nixosModules.home-manager
+          isServer = true;
-          {
+        };
-            home-manager = {
+        cyper-node-2-iso = mkIso {
-              extraSpecialArgs = {
+          hostName = "cyper-node-2";
-                inherit inputs primaryUser self;
+          isServer = true;
-                hostName = "cyper-controller";
+        };
-                isDarwin = false;
-                isServer = true;
-              };
-              users.${primaryUser} = import ./home;
-              backupFileExtension = "backup";
-            };
-          }
-        ];
       };
 
-      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
+      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-tree;
     };
 }

home/desktop/niri/swaync.nix

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

home/desktop/rofi/default.nix

@@ -1,6 +1,11 @@
 { pkgs, lib, ... }: {
-  home.packages =
+  home.packages = lib.mkIf (!pkgs.stdenv.isDarwin) (
-    lib.mkIf (!pkgs.stdenv.isDarwin) (with pkgs; [ rofi-power-menu rofi-calc ]);
+    with pkgs;
+    [
+      rofi-power-menu
+      rofi-calc
+    ]
+  );
 
   programs.rofi = lib.mkIf (!pkgs.stdenv.isDarwin) {
     enable = true;

home/desktop/sketchybar/default.nix

@@ -1,4 +1,10 @@
-{ pkgs, lib, isDarwin, ... }: {
+{
+  pkgs,
+  lib,
+  isDarwin,
+  ...
+}:
+{
   programs.sketchybar = lib.mkIf isDarwin {
     enable = true;
     configType = "lua";

home/desktop/waybar/default.nix

@@ -1,8 +1,17 @@
-{ pkgs, lib, compositor ? "hyprland", ... }: {
+{
-  programs.waybar = lib.mkIf (!pkgs.stdenv.isDarwin) ({
+  pkgs,
-    enable = true;
+  lib,
-    package = pkgs.waybar;
+  compositor ? "hyprland",
-  } // (import ./dual.nix { inherit compositor; }));
+  ...
+}:
+{
+  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 ]);
 

home/neovim/alpha.nix

@@ -46,10 +46,14 @@
           {
             type = "button";
             val = "[+] New file";
-            on_press.__raw =
+            on_press.__raw = "function() vim.cmd[[ene]] vim.cmd[[startinsert]] end";
-              "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;

home/neovim/molten.nix

@@ -2,8 +2,8 @@
   programs.nixvim = lib.mkIf (!isDarwin) {
     plugins.molten = {
       enable = true;
-      python3Dependencies = p:
+      python3Dependencies =
-        with p; [
+        p: with p; [
           pynvim
           jupyter-client
           cairosvg

home/onlyoffice.nix

@@ -1,4 +1,3 @@
 { pkgs, ... }: {
-  programs.onlyoffice =
+  programs.onlyoffice = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) { enable = true; };
-    pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) { enable = true; };
 }

home/shell.nix

@@ -74,57 +74,6 @@
       };
     };
 
-    # Doenst work
-    iamb = {
-      enable = false;
-      settings = {
-        default_profile = "personal";
-        settings = {
-          notifications.enabled = true;
-          image_preview.protocol = {
-            type = "kitty";
-            size = {
-              height = 10;
-              width = 66;
-            };
-          };
-        };
-      };
-    };
-
-    newsboat = {
-      enable = true;
-      autoReload = true;
-      browser = if isDarwin then "open" else "xdg-open";
-      urls = [
-        {
-          url = "https://www.tagesschau.de/xml/rss2";
-          tags = [
-            "news"
-            "de"
-          ];
-        }
-        {
-          url = "https://www.spiegel.de/schlagzeilen/index.rss";
-          tags = [
-            "news"
-            "de"
-          ];
-        }
-        {
-          url = "https://www.focus.de/rss";
-          tags = [
-            "news"
-            "de"
-          ];
-        }
-        {
-          url = "https://feeds.feedburner.com/blogspot/rkEL";
-          tags = [ "blog" ];
-        }
-      ];
-    };
-
     cava = lib.mkIf (!isDarwin) { enable = true; };
 
     yazi = {

hosts/cyper-node-1/configuration.nix

@@ -1,11 +1,6 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../nixos/roles/monitoring.nix
-    ../../nixos/roles/matrix.nix
-    ../../nixos/roles/postgresql.nix
-    ../../nixos/roles/wyl.nix
-    ../../nixos/roles/adguard.nix
   ];
 
   networking = {

hosts/cyper-node-2/configuration.nix

@@ -1,8 +1,6 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../nixos/roles/gitea.nix
-    ../../nixos/roles/filebrowser.nix
   ];
 
   networking = {

hosts/cyper-proxy/hardware-configuration.nix

@@ -5,38 +5,41 @@
   ];
 
   boot = {
-  	loader.grub = {
+    loader.grub = {
-		enable = true;
+      enable = true;
-  		device = "/dev/vda";
+      device = "/dev/vda";
-		};
+    };
 
-  	initrd = {
+    initrd = {
-		availableKernelModules = [
+      availableKernelModules = [
-    "ata_piix"
+        "ata_piix"
-    "virtio_pci"
+        "virtio_pci"
-    "virtio_scsi"
+        "virtio_scsi"
-    "virtio_blk"
+        "virtio_blk"
-    "xhci_pci"
+        "xhci_pci"
-    "sr_mod"
+        "sr_mod"
-  ];
+      ];
-  		kernelModules = [ ];
+      kernelModules = [ ];
-	};
+    };
-  kernelModules = [ ];
+    kernelModules = [ ];
-  extraModulePackages = [ ];
+    extraModulePackages = [ ];
-	};
+  };
 
   fileSystems = {
-  	"/" = {
+    "/" = {
-    device = "/dev/disk/by-label/NIXROOT";
+      device = "/dev/disk/by-label/NIXROOT";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  	"/boot" = {
+    "/boot" = {
-    device = "/dev/disk/by-label/NIXBOOT";
+      device = "/dev/disk/by-label/NIXBOOT";
-    fsType = "vfat";
+      fsType = "vfat";
-    options = [ "fmask=0022" "dmask=0022" ];
+      options = [
+        "fmask=0022"
+        "dmask=0022"
+      ];
+    };
   };
-};
 
   swapDevices = [ ];
 

nixos/catppuccin.nix

@@ -12,9 +12,5 @@
       enable = true;
       accent = "sapphire";
     };
-    fcitx5.enable = false;
-    forgejo.enable = false;
-    gitea.enable = false;
-    sddm.enable = false;
   };
 }

nixos/default.nix

@@ -57,6 +57,11 @@
     };
   };
 
+  nixpkgs.config = {
+    allowUnfree = true;
+    permittedInsecurePackages = [ "olm-3.2.16" ];
+  };
+
   documentation = {
     enable = true;
     doc.enable = false;
@@ -80,6 +85,8 @@
     };
   };
 
+  environment.systemPackages = with pkgs; [ git ];
+
   security = lib.mkIf (!isServer) {
     pam.services.swaylock = { };
     polkit.enable = true;

nixos/plymouth.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 {
   boot = {
     plymouth = {
@@ -15,6 +15,6 @@
       "udev.log_priority=3"
       "rd.systemd.show_status=auto"
     ];
-    loader.timeout = 0;
+    loader.timeout = lib.mkDefault 0;
   };
 }

nixos/roles/gitea.nix

@@ -209,24 +209,20 @@ in
       url = "https://git.cyperpunk.de";
       tokenFile = config.sops.secrets."gitea/runnerToken".path;
       name = "cyper-controller";
-      labels = [
+      labels = [ "nix:host" ];
-        "nix:host"
-      ];
-      settings = {
-        runner.env_vars = {
-          PATH = "/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:$PATH";
-        };
-      };
-    };
-  };
 
-  system.activationScripts.gitea-runner-age-key = {
+      hostPackages = with pkgs; [
-    text = ''
+        bash
-      mkdir -p /var/lib/gitea-runner/.config/sops/age
+        coreutils
-      cp /home/${primaryUser}/.config/nix/secrets/keys.txt /var/lib/gitea-runner/.config/sops/age/keys.txt
+        curl
-      chmod 600 /var/lib/gitea-runner/.config/sops/age/keys.txt
+        gawk
-      chown -R gitea-runner:gitea-runner /var/lib/gitea-runner/.config
+        gitMinimal
-    '';
+        gnused
+        nodejs
+        wget
+        nix
+      ];
+    };
   };
 
   users = {
@@ -237,9 +233,12 @@ in
         home = "/var/lib/gitea";
         createHome = true;
       };
+
       postgres.extraGroups = [ "gitea" ];
     };
-    groups.gitea = { };
+    groups = {
+      gitea = { };
+    };
   };
 
   networking.firewall.allowedTCPPorts = [

nixos/roles/matrix/discord-bridge.nix

@@ -1,7 +1,5 @@
 { config, lib, ... }:
 {
-  nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ];
-
   sops.secrets = {
     discord_bot_token = {
       owner = "mautrix-discord";

nixos/roles/unifi.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.allowUnfree = true;
-
   services.unifi = {
     enable = true;
     unifiPackage = pkgs.unifi;