chore: bump dependencies

flake.lock

@@ -52,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756115622,
+        "lastModified": 1756733629,
-        "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
+        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bafad29f89e83b2d861b493aa23034ea16595560",
+        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1756245047,
+        "lastModified": 1756925795,
-        "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=",
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1756469547,
+        "lastModified": 1756886854,
-        "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=",
+        "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "41d292bfc37309790f70f4c120b79280ce40af16",
+        "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1756542300,
+        "lastModified": 1756787288,
-        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
         "type": "github"
       },
       "original": {

hosts/APPA/default.nix

@@ -11,12 +11,6 @@
     ../../modules
   ];
 
-  bchmnn = {
-    collections = {
-      cli-utils.enable = true;
-    };
-  };
-
   services.openssh = {
     settings = {
       PasswordAuthentication = false;

hosts/APPA/services/acme.nix

@@ -12,6 +12,7 @@
     extraDomainNames = [ "*.dryb.org" ];
     dnsProvider = "cloudflare";
     dnsPropagationCheck = true;
-    credentialsFile = config.age.secrets.environments-acme.path;
+    dnsResolver = "1.1.1.1:53";
+    environmentFile = config.age.secrets.environments-acme.path;
   };
 }

hosts/PABU/user.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }: {
+{ pkgs, ... }: {
 
   users.groups.gandalf = { gid = 1000; };
 
@@ -35,74 +35,5 @@
     };
   };
 
-  environment.systemPackages = [
+  environment.homeBinInPath = true;
-    (pkgs.writeShellScriptBin "n" ''
-      set -euo pipefail
-
-      action=$(${pkgs.gum}/bin/gum choose --header "Choose action:" build clean)
-      target=$(${pkgs.gum}/bin/gum choose --header "Choose target:" PABU APPA MOMO)
-
-      case "$target" in
-        "PABU")
-          ;;
-        *)
-          if ! ps -p $SSH_AGENT_PID > /dev/null; then
-            ${pkgs.gum}/bin/gum log -t kitchen -l error "ssh-agent is not running! Please run \"sa\". Exiting ..."
-            exit 1
-          fi
-          ${pkgs.rsync}/bin/rsync -r . $target:/root/nix/
-          ;;
-      esac
-
-      case "$action" in
-        "clean")
-          case "$target" in
-            "PABU")
-              ${pkgs.gum}/bin/gum log -t kitchen -l info "Running: sudo nix-collect-garbage -d && nix store gc && nix-store --optimise"
-              sudo nix-collect-garbage -d && nix store gc && nix-store --optimise
-              ;;
-            *)
-              ${pkgs.gum}/bin/gum log -t kitchen -l info "Running: ssh $target \"nix-collect-garbage -d && nix store gc && nix-store --optimise\""
-              ssh $target "nix-collect-garbage -d && nix store gc && nix-store --optimise"
-              ;;
-          esac
-          ;;
-        "build")
-          case "$target" in
-            "PABU")
-              sudo nixos-rebuild build --option sandbox false --log-format internal-json -v --flake .#PABU |& ${pkgs.nix-output-monitor}/bin/nom --json
-              ${pkgs.nvd}/bin/nvd --color=always diff /run/current-system result
-              postBuildAction=$(${pkgs.gum}/bin/gum choose --header "Choose post-build-action" skip switch boot test )
-              case "$postBuildAction" in
-                "skip")
-                  ${pkgs.gum}/bin/gum log -t kitchen -l info "Skipping ..."
-                  ;;
-                *)
-                  sudo ./result/bin/switch-to-configuration $postBuildAction
-                  ;;
-              esac
-              ;;
-            *)
-              ssh $target "cd /root/nix; nixos-rebuild build --log-format internal-json -v --flake .#$target" |& ${pkgs.nix-output-monitor}/bin/nom --json
-              ssh $target "cd /root/nix; nix run nixpkgs#nvd -- --color=always diff /run/current-system result"
-              postBuildAction=$(${pkgs.gum}/bin/gum choose --header "Choose post-build-action" skip switch boot test )
-              case "$postBuildAction" in
-                "skip")
-                  ${pkgs.gum}/bin/gum log -t kitchen -l info "Skipping ..."
-                  ;;
-                *)
-                  ssh $target "cd /root/nix; ./result/bin/switch-to-configuration $postBuildAction"
-                  ;;
-              esac
-              ;;
-          esac
-          ;;
-        *)
-          ${pkgs.gum}/bin/gum log -t kitchen -l error "Unkown action: $action. Exiting ..."
-          exit 1
-          ;;
-      esac
-    '')
-  ];
-
 }

modules/core/applications.nix

@@ -27,6 +27,5 @@
       pkgs.hexedit
       pkgs.gdu # fast disk usage analyzer with console interface written in go
       pkgs.duf # disk usage/free utility - a better 'df' alternative
-      pkgs.nvd # Nix/NixOS package version diff tool
     ];
 }

modules/core/shell.nix

@@ -1,11 +1,13 @@
 {
   pkgs,
+  config,
+  lib,
   ...
 }:
 let
   common = import ./common.nix;
 in
-{
+lib.mkIf (config.bchmnn.collections.shell.enable) {
   programs.zsh = {
     enable = true;
   };
@@ -28,7 +30,6 @@ in
       generateCaches = true;
       man-db.enable = true;
     };
-
   };
 
   environment.systemPackages = with pkgs; [

modules/default.nix

@@ -1,8 +1,10 @@
 { lib, ... }:
 {
   options.bchmnn = with lib; {
-
     collections = {
+      shell = {
+        enable = mkEnableOption "shell";
+      };
       cli-utils = {
         enable = mkEnableOption "cli-utils";
       };