ctucx.git: nixfiles

replace `currentSystem` with `config.nixpkgs.system`

diff --git a/configurations/common/common.nix b/configurations/common/common.nix
@@ -41,8 +41,14 @@ in {
     settings = {
       trusted-users         = [ "@wheel" ];
       experimental-features = [ "nix-command" "flakes" ];
-      extra-substituters    = [ "https://cache.lix.systems" ];
-      trusted-public-keys   = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
+      extra-substituters    = [
+        "https://cache.lix.systems"
+        "https://colmena.cachix.org"
+      ];
+      trusted-public-keys   = [
+        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+        "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg="
+      ];
     };
   };
 

diff --git a/configurations/common/programs/htop.nix b/configurations/common/programs/htop.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, currentSystem, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 

diff --git a/configurations/common/programs/scripts.nix b/configurations/common/programs/scripts.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, currentSystem, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   nix-cleanup = pkgs.writeShellScriptBin "nix-cleanup" ''

@@ -148,7 +148,7 @@ let
 
 in {
 
-  home-manager.users.katja.home.packages = [ nix-cleanup colmena-remote ] ++ lib.optionals ( currentSystem == "x86_64-linux") [
+  home-manager.users.katja.home.packages = [ nix-cleanup colmena-remote ] ++ lib.optionals ( config.nixpkgs.system == "x86_64-linux") [
     backupToSSD
   ];
 

diff --git a/configurations/common/programs/shellUtilities.nix b/configurations/common/programs/shellUtilities.nix
@@ -1,4 +1,4 @@
-{ config, inputs, currentSystem, pkgs, lib, ... }:
+{ config, inputs, pkgs, lib, ... }:
 
 {
 

@@ -34,7 +34,7 @@
 
     home.packages = with pkgs; [
       coreutils
-      inputs.colmena.packages."${currentSystem}".colmena
+      colmena
 
       agenix
       age

diff --git a/configurations/darwin/default.nix b/configurations/darwin/default.nix
@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, lib, ... }:
+{ inputs, ctucxConfig, config, pkgs, lib, ... }:
 
 {
 

diff --git a/configurations/nixos/services/dns-server.nix b/configurations/nixos/services/dns-server.nix
@@ -1,4 +1,4 @@
-{ currentSystem, nodes, config, lib, pkgs, ...}:
+{ nodes, config, lib, pkgs, ...}:
 
 let
   acmeZone = "acme.ctu.cx";

diff --git a/flake.nix b/flake.nix
@@ -20,17 +20,15 @@
 
     darwinConfigurations = {
       blechkasten = inputs.nixDarwin.lib.darwinSystem rec {
-        system = "aarch64-darwin";
 
         pkgs = import inputs.nixpkgsDarwin {
-          inherit system;
-          config.allowUnfree = true;
+          system   = "aarch64-darwin";
           overlays = overlays ++ [(import ./pkgs/darwin)];
+          config.allowUnfree = true;
         };
 
         specialArgs = {
-          currentSystem = system;
-          ctucxConfig   = ctucxConfig.darwin;
+          ctucxConfig = ctucxConfig.darwin;
           inherit inputs;
         };
 

@@ -53,8 +51,6 @@
 
         specialArgs = {
           inherit inputs;
-          ctucxConfig   = ctucxConfig.nixos;
-          currentSystem = nixpkgs.system;
         };
       };