go back to using nixpkgs#attic

flake.lock

@@ -54,21 +54,6 @@
         "type": "github"
       }
     },
-    "crane": {
-      "locked": {
-        "lastModified": 1736898272,
-        "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "f1multiviewer": {
       "inputs": {
         "nixpkgs": [
@@ -89,43 +74,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "lix-attic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -486,38 +434,6 @@
         "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
       }
     },
-    "lix-attic": {
-      "inputs": {
-        "crane": "crane",
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "lix": [
-          "lix-module",
-          "lix"
-        ],
-        "lix-module": [
-          "lix-module"
-        ],
-        "nix-github-actions": [],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1736969694,
-        "narHash": "sha256-4OKeL5HbDNDKl1JgRH97HCe/QQjhLGB4pjxxYr5PTFc=",
-        "ref": "refs/heads/main",
-        "rev": "d413a74fa132cf5f421732dc7dd5cadda96fb874",
-        "revCount": 361,
-        "type": "git",
-        "url": "https://git.lix.systems/nrabulinski/attic.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.lix.systems/nrabulinski/attic.git"
-      }
-    },
     "lix-module": {
       "inputs": {
         "flake-utils": [
@@ -666,22 +582,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1735563628,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-wayland": {
       "inputs": {
         "flake-compat": [],
@@ -738,7 +638,6 @@
         "jj": "jj",
         "lib-aggregate": "lib-aggregate",
         "lix": "lix",
-        "lix-attic": "lix-attic",
         "lix-module": "lix-module",
         "my-nixpkgs": "my-nixpkgs",
         "nim2nix": "nim2nix",

flake.nix

@@ -61,13 +61,14 @@
     tsm.inputs.nim2nix.follows = "nim2nix";
     utils.inputs.nim2nix.follows = "nim2nix";
 
-    lix-attic = {
+    # lix-attic = {
-      url = "git+https://git.lix.systems/nrabulinski/attic.git";
+    #   url = "git+https://git.lix.systems/nrabulinski/attic.git";
-      inputs.nixpkgs.follows = "nixpkgs";
+    #   inputs.nixpkgs.follows = "nixpkgs";
-      inputs.lix-module.follows = "lix-module";
+    #   inputs.lix-module.follows = "lix-module";
-      # make lix-module source of truth
+    #   # make lix-module source of truth
-      inputs.lix.follows = "lix-module/lix";
+    #   inputs.lix.follows = "lix-module/lix";
-    };
+    #   inputs.nix-github-actions.follows = "";
+    # };
 
     # roc = {
     #   url = "github:roc-lang/roc";
@@ -95,7 +96,7 @@
     nixos-wsl.inputs.flake-compat.follows = "";
     nixpkgs-wayland.inputs.flake-compat.follows = "";
     nixpkgs-wayland.inputs.nix-eval-jobs.follows = "";
-    lix-attic.inputs.nix-github-actions.follows = "";
+
   };
 
   nixConfig = {

hosts/algiz/services.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   enabled,
-  flake,
   ...
 }:
 let
@@ -25,13 +24,12 @@ in
   };
 
   security.polkit = enabled; # attic was looking for this...
-  environment.systemPackages = [ (flake.pkgs "self").attic-client ];
+  environment.systemPackages = with pkgs; [ attic-client ];
 
   # allow docker to forward the request to the host running attic
   # https://discourse.nixos.org/t/docker-container-not-resolving-to-host/30259/6
   # networking.firewall.extraCommands = "iptables -A INPUT -p tcp --destination-port ${atticPort} -s 172.16.0.0/12 -j ACCEPT";
   services.atticd = enabled // {
-    package = (flake.pkgs "self").attic-server;
 
     # Replace with absolute path to your credentials file
     # TODO: replace with sops-secret!

hosts/othalan/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   enabled,
-  flake,
   ...
 }:
 {
@@ -28,8 +27,4 @@
     };
   };
 
-  environment.systemPackages = [
-    (flake.pkgs "self").attic-client
-  ];
-
 }

hosts/othalan/settings/pkgs

@@ -8,3 +8,4 @@ graphviz
 charm-freeze
 quarto
 calibre
+attic-client

overlays/default.nix

@@ -5,10 +5,8 @@
 
   (final: prev: {
 
-    # make sure attic is using this lix
     nix = inputs.self.packages.${final.system}.lix;
 
-
     stable = import inputs.stable {
       system = final.system;
       config.allowUnfree = true;

pkgs/default.nix

@@ -6,14 +6,6 @@
 let
   inherit (lib) flakeFromSystem;
   flake = flakeFromSystem pkgs.system;
-  lix = pkgs.callPackage ./lix { inherit flake; };
-
-  # make attic also use the "no check lix"
-  atticPackages = pkg: {
-    "${pkg}" = (flake.pkgs "lix-attic").${pkg}.overrideAttrs (oldAttrs: {
-      buildInputs = [ pkgs.boost lix ];
-    });
-  };
 
 in
 {
@@ -25,10 +17,8 @@ in
 
   llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { };
 
-  lix = lix;
+  lix = pkgs.callPackage ./lix { inherit flake; };
 }
-// (atticPackages "attic-client")
-// (atticPackages "attic-server")
 // (flake.toPackageAttrs [
   "pixi"
   "f1multiviewer"

pkgs/lix/default.nix

@@ -1,5 +1,6 @@
 { flake, ... }:
 ((flake.pkgs "lix-module").default.override {
+  # is this doing anything?
   aws-sdk-cpp = null;
 }).overrideAttrs
   (attrs: {

todo.md

@@ -2,6 +2,7 @@
 
 ## oizys
 
+
 ## software
 
 - [ ] switch systemd desktop file to libvirt VM