add krusader

nixos/boxes/bolty/woodpecker-agent.nix

@@ -1,10 +1,5 @@
-{
+{ config, pkgs, inputs, lib, ... }:
-  config,
+let
-  pkgs,
-  inputs,
-  lib,
-  ...
-}: let
   agentPort = 9000;
   domain = "ci.cyplo.dev";
   uid = 2061;
@@ -21,8 +16,7 @@
   woodpeckerNixStorePath = "/var/lib/woodpecker/nix-store";
   woodpeckerAgentContainer = {
     autoStart = true;
-    forwardPorts = [
+    forwardPorts = [ ];
-    ];
     bindMounts = {
       "${woodpeckerEnvSecretPath}" = {
         hostPath = "${woodpeckerEnvSecretPath}";
@@ -37,12 +31,7 @@
         isReadOnly = false;
       };
     };
-    config = {
+    config = { config, pkgs, lib, ... }: {
-      config,
-      pkgs,
-      lib,
-      ...
-    }: {
       system.stateVersion = "22.11";
       users = {
         mutableUsers = false;
@@ -74,9 +63,7 @@
           WOODPECKER_LOG_LEVEL = "debug";
         };
         serviceConfig = {
-          EnvironmentFile = [
+          EnvironmentFile = [ woodpeckerEnvSecretPath ];
-            woodpeckerEnvSecretPath
-          ];
           ExecStart = "${pkgs.woodpecker-agent}/bin/woodpecker-agent";
           User = systemUserName;
           Group = systemGroupName;
@@ -105,33 +92,27 @@ in {
     };
   };
 
-  sops.secrets."woodpecker-env" =
+  sops.secrets."woodpecker-env" = {
-    {
     sopsFile = ../vpsfree1/gitea.sops;
     format = "binary";
     path = woodpeckerEnvSecretPath;
-    }
+  } // secretSettings;
-    // secretSettings;
 
-  virtualisation.podman = {
+  virtualisation.podman = { enable = true; };
-    enable = true;
-  };
   systemd.services.woodpecker-make-path = {
     script = ''
       mkdir -p ${woodpeckerNixStorePath}
       chown -R ${systemUserName}:${systemGroupName} ${woodpeckerNixStorePath}
     '';
-    serviceConfig = {
+    serviceConfig = { Type = "oneshot"; };
-      Type = "oneshot";
-    };
   };
 
   containers.woodpecker-agent1 = woodpeckerAgentContainer;
   containers.woodpecker-agent2 = woodpeckerAgentContainer;
   containers.woodpecker-agent3 = woodpeckerAgentContainer;
   containers.woodpecker-agent4 = woodpeckerAgentContainer;
-  systemd.services."container@woodpecker-agent1".requires = ["woodpecker-make-path.service"];
+  systemd.services."container@woodpecker-agent1".requires =
-  systemd.services."container@woodpecker-agent2".requires = ["woodpecker-make-path.service"];
+    [ "woodpecker-make-path.service" ];
-  systemd.services."container@woodpecker-agent3".requires = ["woodpecker-make-path.service"];
+  systemd.services."container@woodpecker-agent2".requires =
-  systemd.services."container@woodpecker-agent4".requires = ["woodpecker-make-path.service"];
+    [ "woodpecker-make-path.service" ];
 }

nixos/gui/default.nix

@@ -1,12 +1,6 @@
-{
+{ config, pkgs, discord, inputs, nixpkgs-nixos-stable-and-unfree
-  config,
+, nixpkgs-nixos-unstable-and-unfree, ... }:
-  pkgs,
+let
-  discord,
-  inputs,
-  nixpkgs-nixos-stable-and-unfree,
-  nixpkgs-nixos-unstable-and-unfree,
-  ...
-}: let
   unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
   nixpkgs-master = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
 in {
@@ -51,6 +45,7 @@ in {
         gnome-screenshot
         gparted
         inkscape
+        krusader
         libreoffice
         mindforger
         modem-manager-gui
@@ -81,9 +76,7 @@ in {
         yubikey-manager-qt
         yubikey-personalization
         yubikey-personalization-gui
-      ]
+      ] ++ [ unstable.gnucash unstable.thunderbird ] ++ [
-      ++ [unstable.gnucash unstable.thunderbird]
-      ++ [
         nixpkgs-nixos-stable-and-unfree.discord
         nixpkgs-nixos-unstable-and-unfree.hopper
       ];