"Release" 25.11 Hooray

flake.lock

@@ -90,23 +90,8 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1763938834,
+        "lastModified": 1760924934,
-        "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=",
+        "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "crane_2": {
-      "locked": {
-        "lastModified": 1725409566,
-        "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=",
         "owner": "ipetkov",
         "repo": "crane",
         "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f",
@@ -256,27 +241,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "harmonia",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -463,31 +427,6 @@
         "type": "github"
       }
     },
-    "harmonia": {
-      "inputs": {
-        "crane": "crane",
-        "flake-parts": "flake-parts",
-        "nix": "nix",
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1765032623,
-        "narHash": "sha256-BbtN5NFN2RU3KP2TLA6zOoiv5MZXWqN1mXxIkKY8Kx4=",
-        "owner": "devplayer0",
-        "repo": "harmonia",
-        "rev": "310e2b2c6583710c52531785f1245d9621284310",
-        "type": "github"
-      },
-      "original": {
-        "owner": "devplayer0",
-        "ref": "cache-config-daemon-store",
-        "repo": "harmonia",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -580,22 +519,6 @@
         "type": "github"
       }
     },
-    "nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1764532838,
-        "narHash": "sha256-hw4J7wfqXWBCvsMVXPS4nvkcSeTXAtR5h9Ylv7a7dBA=",
-        "owner": "nixos",
-        "repo": "nix",
-        "rev": "8be9507a88f466dd44e6e56cd00167fa10e995b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "nixGL": {
       "inputs": {
         "flake-utils": "flake-utils_7",
@@ -635,11 +558,11 @@
     },
     "nixpkgs-mine": {
       "locked": {
-        "lastModified": 1765034197,
+        "lastModified": 1764886613,
-        "narHash": "sha256-SioIdjObnBC/N78okBChJpcfNns3qLsyXrMaBLx6uio=",
+        "narHash": "sha256-jNTFco4zgRNB7jMsEP4DMiAWs4+EQv8zP9Z7QhNaxbo=",
         "owner": "devplayer0",
         "repo": "nixpkgs",
-        "rev": "96f12e0722c76b4113f8bd4c4fd18532b35d5a7f",
+        "rev": "d6e5dbc8dad8012c93109ad81b19a6590d7c4660",
         "type": "github"
       },
       "original": {
@@ -651,11 +574,11 @@
     },
     "nixpkgs-mine-stable": {
       "locked": {
-        "lastModified": 1765034227,
+        "lastModified": 1764886662,
-        "narHash": "sha256-5yQGE8/IvyHV1xQsESjhQumSzPcAmeLXFCY6ZdGDpek=",
+        "narHash": "sha256-xQbkT8b3a9TC6t1i0TMXl+pQlHjk7FnurFcTAW0TvcE=",
         "owner": "devplayer0",
         "repo": "nixpkgs",
-        "rev": "c07d5abb1e18828369dabbda975b7374d39347c0",
+        "rev": "7fb113672bfb0ef6ab05d4d043020314d4d930a2",
         "type": "github"
       },
       "original": {
@@ -781,7 +704,7 @@
     "ragenix": {
       "inputs": {
         "agenix": "agenix",
-        "crane": "crane_2",
+        "crane": "crane",
         "flake-utils": "flake-utils_8",
         "nixpkgs": [
           "nixpkgs-unstable"
@@ -811,7 +734,6 @@
         "deploy-rs": "deploy-rs",
         "devshell": "devshell_3",
         "flake-utils": "flake-utils_6",
-        "harmonia": "harmonia",
         "home-manager-stable": "home-manager-stable",
         "home-manager-unstable": "home-manager-unstable",
         "impermanence": "impermanence",
@@ -1023,27 +945,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "harmonia",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1761311587,
-        "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "utils": {
       "inputs": {
         "systems": "systems_3"

flake.nix

@@ -34,9 +34,6 @@
     boardie.inputs.nixpkgs.follows = "nixpkgs-unstable";
     nixGL.url = "github:nix-community/nixGL";
     nixGL.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    # harmonia.url = "github:nix-community/harmonia";
-    harmonia.url = "github:devplayer0/harmonia/cache-config-daemon-store";
-    harmonia.inputs.nixpkgs.follows = "nixpkgs-unstable";
 
     # Packages not in nixpkgs
     sharry.url = "github:eikek/sharry";

nixos/boxes/colony/vms/shill/containers/object.nix

@@ -89,17 +89,12 @@ in
             {
               users = {
                 harmonia = {
-                isSystemUser = true;
-                group = "harmonia";
                   shell = pkgs.bashInteractive;
                   openssh.authorizedKeys.keyFiles = [
                     lib.my.c.sshKeyFiles.harmonia
                   ];
                 };
               };
-              groups = {
-                harmonia = { };
-              };
             }
           ];
 
@@ -132,24 +127,13 @@ in
                   };
                 }
               ];
-
+              harmonia = {
-              harmonia-dev = {
+                environment.NIX_REMOTE = "/var/lib/harmonia";
-                # environment.RUST_LOG = mkForce "trace";
-                # serviceConfig = {
-                #   StateDirectory = "harmonia";
-                #   DynamicUser = mkForce false;
-                # };
-              };
-              harmonia-daemon = {
-                # environment.RUST_LOG = mkForce "trace";
                 preStart = ''
-                  ${config.nix.package}/bin/nix store info --store /var/lib/harmonia
+                  ${config.nix.package}/bin/nix store ping
                 '';
                 serviceConfig = {
-                  User = "harmonia";
-                  Group = "harmonia";
                   StateDirectory = "harmonia";
-                  DynamicUser = mkForce false;
                 };
               };
             };
@@ -251,20 +235,11 @@ in
               };
             };
 
-            harmonia-dev = {
+            harmonia = {
-              daemon = {
+              enable = true;
-                enable = true;
+              signKeyPaths = [ config.age.secrets."nix-cache.key".path ];
-                storeDir = "/nix/store";
+              settings = {
-                dbPath = "/var/lib/harmonia/nix/var/nix/db/db.sqlite";
+                priority = 30;
-              };
-              cache = {
-                enable = true;
-                signKeyPaths = [ config.age.secrets."nix-cache.key".path ];
-                settings = {
-                  priority = 30;
-                  daemon_store = "/nix/store";
-                  real_nix_store = "/var/lib/harmonia/nix/store";
-                };
               };
             };
 

nixos/modules/common.nix

@@ -9,11 +9,10 @@ in
   };
 
   imports = [
-    inputs.impermanence.nixosModules.default
+    inputs.impermanence.nixosModule
     inputs.ragenix.nixosModules.age
     inputs.sharry.nixosModules.default
     inputs.copyparty.nixosModules.default
-    inputs.harmonia.nixosModules.harmonia
   ];
 
   config = mkMerge [