flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=407453166ce2a52433c7b0b4ee92a41e47ef8f6d' (2025-01-19)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=a661203bb6d4714b211572759e2f74b1da194972' (2025-01-20)
• Updated input 'lix':
    '4bb97b2a9b.tar.gz?narHash=sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8%3D&rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb' (2025-01-19)
  → '831e9d62f1.tar.gz?narHash=sha256-szM%2BhEGCKFiPxWkKCXqA0oIGmlfbHupsk4b1uss1zuk%3D&rev=831e9d62f118dc6180901a762e25d04fde064595' (2025-01-20)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/0deffe038aebb272bd19a514e780a09e24da8417' (2025-01-20)
  → 'github:nix-community/nixpkgs-wayland/900b3dbd52e89c7dde737e50c51ee97e93ee4d9e' (2025-01-20)

flake.lock

@@ -54,6 +54,21 @@
         "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": [
@@ -74,6 +89,43 @@
         "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"
@@ -423,17 +475,49 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1737403222,
+        "lastModified": 1737400654,
-        "narHash": "sha256-bAcx6Nv0a3XoCBs9TSqgjyf16nrz/ozUO93Ng52IfOI=",
+        "narHash": "sha256-szM+hEGCKFiPxWkKCXqA0oIGmlfbHupsk4b1uss1zuk=",
-        "rev": "fcc151d7898e466569c5f9e628217e476c1eaba8",
+        "rev": "831e9d62f118dc6180901a762e25d04fde064595",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fcc151d7898e466569c5f9e628217e476c1eaba8.tar.gz?rev=fcc151d7898e466569c5f9e628217e476c1eaba8"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/831e9d62f118dc6180901a762e25d04fde064595.tar.gz?rev=831e9d62f118dc6180901a762e25d04fde064595"
       },
       "original": {
         "type": "tarball",
         "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": [
@@ -582,6 +666,22 @@
         "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": [],
@@ -638,6 +738,7 @@
         "jj": "jj",
         "lib-aggregate": "lib-aggregate",
         "lix": "lix",
+        "lix-attic": "lix-attic",
         "lix-module": "lix-module",
         "my-nixpkgs": "my-nixpkgs",
         "nim2nix": "nim2nix",
@@ -682,11 +783,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737411508,
+        "lastModified": 1737107480,
-        "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
+        "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
+        "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
         "type": "github"
       },
       "original": {

flake.nix

@@ -61,14 +61,13 @@
     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";
@@ -96,7 +95,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,6 +1,7 @@
 {
   pkgs,
   enabled,
+  flake,
   ...
 }:
 let
@@ -24,12 +25,13 @@ in
   };
 
   security.polkit = enabled; # attic was looking for this...
-  environment.systemPackages = with pkgs; [ attic-client ];
+  environment.systemPackages = [ 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 "lix-attic").attic-server;
 
     # Replace with absolute path to your credentials file
     # TODO: replace with sops-secret!

hosts/othalan/default.nix

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

hosts/othalan/settings/pkgs

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

lib/default.nix

@@ -67,7 +67,7 @@ let
         iso = mkIso.config.system.build.isoImage;
         # nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
       }
-      // (import ../pkgs { inherit pkgs lib inputs; })
+      // (import ../pkgs { inherit pkgs lib; })
     );
 
     devShells = forAllSystems (pkgs: {

lib/generators.nix

@@ -49,22 +49,6 @@ let
         ]
         ++ (selfModules ''oizys'')
         ++ (nixosModules ''lix-module|sops-nix'')
-        ++ [
-          (
-            { ... }:
-            {
-              nixpkgs.overlays = [
-                (final: prev: {
-                  # override what the lix-module set
-                  # make sure attic is using this lix
-                  nix = inputs.self.${final.system}.lix;
-                })
-
-              ];
-            }
-          )
-
-        ]
         ++ (hostFiles hostName);
 
       specialArgs = commonSpecialArgs // {

overlays/default.nix

@@ -4,9 +4,6 @@
   inputs.nim2nix.overlays.default # adds buildNimPackage
 
   (final: prev: {
-
-    nix = inputs.self.packages.${final.system}.lix;
-
     stable = import inputs.stable {
       system = final.system;
       config.allowUnfree = true;

pkgs/default.nix

@@ -6,7 +6,6 @@
 let
   inherit (lib) flakeFromSystem;
   flake = flakeFromSystem pkgs.system;
-
 in
 {
   nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
@@ -17,6 +16,8 @@ in
 
   llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { };
 
+  attic-client = (flake.pkgs "lix-attic").attic-client;
+  attic-server = (flake.pkgs "lix-attic").attic-server;
   lix = pkgs.callPackage ./lix { inherit flake; };
 }
 // (flake.toPackageAttrs [

pkgs/lix/default.nix

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

todo.md

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