flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0dc7367a7006cc3cc877d52bf34c4998144bff84' (2025-01-16)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=407453166ce2a52433c7b0b4ee92a41e47ef8f6d' (2025-01-19)
• Updated input 'hyprland/hyprland-protocols':
    'github:hyprwm/hyprland-protocols/e3b6af97ddcfaafbda8e2828c719a5af84f662cb' (2025-01-01)
  → 'github:hyprwm/hyprland-protocols/455c055883d9639d4fcbfcedb4c6d12ce313791e' (2025-01-17)
• Updated input 'lib-aggregate':
    'github:nix-community/lib-aggregate/917882a0186d7731a61ede986c701e272f744750' (2025-01-12)
  → 'github:nix-community/lib-aggregate/e07594822638004d96f100febbe947189c42e8a9' (2025-01-19)
• Added input 'lix-attic/flake-compat':
    'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/271e5bd7c57e1f001693799518b10a02d1123b12' (2025-01-12)
  → 'github:nix-community/nix-index-database/744d330659e207a1883d2da0141d35e520eb87bd' (2025-01-19)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8' (2025-01-14)
  → 'github:nixos/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c' (2025-01-16)
• Updated input 'nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/1418bc28a52126761c02dd3d89b2d8ca0f521181' (2025-01-12)
  → 'github:nix-community/nixpkgs.lib/977f49fd8cf854416f82987696784717acd6e817' (2025-01-19)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/8f3a889a1bb60d58f42fc671d8a0b73496ede51c' (2025-01-15)
  → 'github:nix-community/nixpkgs-wayland/4b5cbd9e85bfedab28018e955086b9987bc495df' (2025-01-19)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/553c7cb22fed19fd60eb310423fdc93045c51ba8' (2025-01-13)
  → 'github:Mic92/sops-nix/4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6' (2025-01-17)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/97871d416166803134ba64597a1006f3f670fbde' (2025-01-16)
  → 'github:numtide/treefmt-nix/d1ed3b385f8130e392870cfb1dbfaff8a63a1899' (2025-01-17)

.github/actions/nix/action.yml

@@ -5,8 +5,8 @@ inputs:
     description: Extra nix.conf config
     default: |
       accept-flake-config = true
-      build-dir = /nix/var
       experimental-features = pipe-operator
+      build-dir = /nix/var
       keep-derivations = true
       keep-outputs = true
   clean:
@@ -37,3 +37,7 @@ runs:
       run: |
         nix profile install "nixpkgs#attic-client"
         attic login oizys https://attic.dayl.in "${{ inputs.attic_token}}"
+
+    - name: "Show Nix Info"
+      shell: bash
+      run: nix run "nixpkgs#nix-info" -- -m

.github/workflows/build.yml

@@ -6,11 +6,15 @@ on:
       hosts:
         description: "list of hosts to build"
         required: true
-        default: "othalan,algiz"
         type: string
+        default: "othalan,algiz"
       lockFile:
         description: "flake.lock file"
         type: string
+      extraArgs:
+        description: "postional args forwared to nix"
+        type: string
+        default: "--keep-going"
 
   workflow_call:
     inputs:
@@ -54,4 +58,4 @@ jobs:
           --flake .
           -vv
           --
-          --keep-going
+          ${{ inputs.extraArgs }}

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": [
@@ -75,22 +90,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1733328505,
@@ -106,26 +105,10 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
-      "locked": {
-        "lastModified": 1717312683,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "nixpkgs-wayland",
+          "lix-attic",
-          "nix-eval-jobs",
           "nixpkgs"
         ]
       },
@@ -145,43 +128,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -212,28 +159,6 @@
         "type": "github"
       }
     },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -305,16 +230,16 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks": "pre-commit-hooks",
+        "pre-commit-hooks": [],
-        "systems": "systems",
+        "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1737038559,
+        "lastModified": 1737310896,
-        "narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=",
+        "narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
         "ref": "refs/heads/main",
-        "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84",
+        "rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
-        "revCount": 5674,
+        "revCount": 5690,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -357,11 +282,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735774328,
+        "lastModified": 1737127640,
-        "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
+        "narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
+        "rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e",
         "type": "github"
       },
       "original": {
@@ -430,7 +355,9 @@
     },
     "hyprman": {
       "inputs": {
-        "nim2nix": "nim2nix",
+        "nim2nix": [
+          "nim2nix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -501,7 +428,9 @@
     },
     "jj": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -524,15 +453,17 @@
     },
     "lib-aggregate": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1736684024,
+        "lastModified": 1737288694,
-        "narHash": "sha256-FYJ4iFD/2L1CFN/aHjI8HxxSxuPNy4OvW+VCBh41Lzk=",
+        "narHash": "sha256-e9MsdkHidgepQpF0InyRSpeD6YujQcaB0uUzeXVvW+I=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "917882a0186d7731a61ede986c701e272f744750",
+        "rev": "e07594822638004d96f100febbe947189c42e8a9",
         "type": "github"
       },
       "original": {
@@ -544,20 +475,54 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1729298361,
+        "lastModified": 1737234286,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.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": "flake-utils_2",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "flakey-profile": "flakey-profile",
         "lix": "lix",
         "nixpkgs": [
@@ -565,15 +530,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1729360442,
+        "lastModified": 1737237494,
-        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
+        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
-        "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
+        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
       }
     },
     "my-nixpkgs": {
@@ -595,7 +560,6 @@
     "nim2nix": {
       "inputs": {
         "nixpkgs": [
-          "hyprman",
           "nixpkgs"
         ]
       },
@@ -613,87 +577,6 @@
         "type": "github"
       }
     },
-    "nim2nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731683943,
-        "narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=",
-        "owner": "daylinmorgan",
-        "repo": "nim2nix",
-        "rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "daylinmorgan",
-        "repo": "nim2nix",
-        "type": "github"
-      }
-    },
-    "nim2nix_3": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "lastModified": 1725469705,
-        "narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
-        "owner": "daylinmorgan",
-        "repo": "nim2nix",
-        "rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
-        "type": "github"
-      },
-      "original": {
-        "owner": "daylinmorgan",
-        "repo": "nim2nix",
-        "type": "github"
-      }
-    },
-    "nix-eval-jobs": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs_3",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1736194844,
-        "narHash": "sha256-CXtD5xUKb92EjL9RrsGQ9jgnl0aIoGEPwnJ805d3Xz0=",
-        "owner": "nix-community",
-        "repo": "nix-eval-jobs",
-        "rev": "cbae9154bc76c5aa7873f0a67b3c9f13124929d3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-eval-jobs",
-        "type": "github"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-wayland",
-          "nix-eval-jobs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731952509,
-        "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -701,11 +584,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736652904,
+        "lastModified": 1737257306,
-        "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
+        "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
+        "rev": "744d330659e207a1883d2da0141d35e520eb87bd",
         "type": "github"
       },
       "original": {
@@ -716,8 +599,10 @@
     },
     "nixos-wsl": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": [],
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1736095716,
@@ -735,11 +620,57 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733384649,
+        "lastModified": 1737062831,
-        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1737248590,
+        "narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "977f49fd8cf854416f82987696784717acd6e817",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1737248590,
+        "narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "977f49fd8cf854416f82987696784717acd6e817",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {
@@ -749,34 +680,23 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1736643958,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs-wayland": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": [],
-        "lib-aggregate": "lib-aggregate",
+        "lib-aggregate": [
-        "nix-eval-jobs": "nix-eval-jobs",
+          "lib-aggregate"
-        "nixpkgs": "nixpkgs_4"
+        ],
+        "nix-eval-jobs": [],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1736965550,
+        "lastModified": 1737325094,
-        "narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=",
+        "narHash": "sha256-cUi6vDI/rveFpKsJJhIe084XiXzbJPYUxBKB1dfepH4=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c",
+        "rev": "4b5cbd9e85bfedab28018e955086b9987bc495df",
         "type": "github"
       },
       "original": {
@@ -785,86 +705,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1736883708,
-        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1736042175,
-        "narHash": "sha256-jdd5UWtLVrNEW8K6u5sy5upNAFmF3S4Y+OIeToqJ1X8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bf689c40d035239a489de5997a4da5352434632e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1736798957,
-        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1735554305,
-        "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1724479785,
-        "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pixi": {
       "inputs": {
         "nixpkgs": [
@@ -885,48 +725,29 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735882644,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "NixVirt": "NixVirt",
         "f1multiviewer": "f1multiviewer",
+        "flake-utils": "flake-utils",
         "hyprland": "hyprland",
         "hyprland-contrib": "hyprland-contrib",
         "hyprman": "hyprman",
         "jj": "jj",
+        "lib-aggregate": "lib-aggregate",
+        "lix-attic": "lix-attic",
         "lix-module": "lix-module",
         "my-nixpkgs": "my-nixpkgs",
-        "nim2nix": "nim2nix_2",
+        "nim2nix": "nim2nix",
         "nix-index-database": "nix-index-database",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-lib": "nixpkgs-lib_2",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "pixi": "pixi",
         "sops-nix": "sops-nix",
         "stable": "stable",
-        "treefmt-nix": "treefmt-nix_2",
+        "treefmt-nix": "treefmt-nix",
         "tsm": "tsm",
         "utils": "utils"
       }
@@ -959,11 +780,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736808430,
+        "lastModified": 1737107480,
-        "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=",
+        "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8",
+        "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
         "type": "github"
       },
       "original": {
@@ -989,6 +810,21 @@
       }
     },
     "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1003,83 +839,18 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-wayland",
-          "nix-eval-jobs",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1736154270,
+        "lastModified": 1737103437,
-        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
+        "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
+        "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1737054102,
-        "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "97871d416166803134ba64597a1006f3f670fbde",
         "type": "github"
       },
       "original": {
@@ -1090,7 +861,9 @@
     },
     "tsm": {
       "inputs": {
-        "nim2nix": "nim2nix_3",
+        "nim2nix": [
+          "nim2nix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]

flake.nix

@@ -7,20 +7,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     stable.url = "github:nixos/nixpkgs/nixos-24.05";
     my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
-    treefmt-nix.url = "github:numtide/treefmt-nix";
-
-    nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
-    nixos-wsl.url = "github:nix-community/NixOS-WSL";
-
-    nix-index-database = {
-      url = "github:nix-community/nix-index-database";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     # lix = {
     #   url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
@@ -31,49 +17,78 @@
     #   inputs.nixpkgs.follows = "nixpkgs";
     #   inputs.lix.follows = "lix";
     # };
-    # lix is failing to build only on GHA?
+    #
     # keep for when lix breaks :/
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # using nixpkgs version now
+    nix-index-database = {
-    # # https://github.com/ghostty-org/ghostty/issues/2025
+      url = "github:nix-community/nix-index-database";
-    # ghostty = {
+      inputs.nixpkgs.follows = "nixpkgs";
-    #   url = "git+https://github.com/ghostty-org/ghostty.git?ref=refs/tags/v1.0.1";
+    };
-    #   inputs = {
-    #     nixpkgs-stable.follows = "nixpkgs";
-    #     nixpkgs-unstable.follows = "nixpkgs";
-    #   };
-    # };
 
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
+    treefmt-nix = {
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:numtide/treefmt-nix";
-    hyprland-contrib.url = "github:hyprwm/contrib";
+      inputs.nixpkgs.follows = "nixpkgs";
-    hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nixos-wsl = {
+      url = "github:nix-community/NixOS-WSL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    hyprland = {
+      url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    hyprland-contrib = {
+      url = "github:hyprwm/contrib";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nixpkgs-wayland = {
+      url = "github:nix-community/nixpkgs-wayland";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     f1multiviewer = {
       url = "github:daylinmorgan/f1multiviewer-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     tsm = {
       url = "github:daylinmorgan/tsm?dir=nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        nim2nix.follows = "nim2nix";
+      };
     };
     hyprman = {
       url = "git+https://git.dayl.in/daylin/hyprman.git";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nim2nix.follows = "nim2nix";
     };
     utils = {
       url = "git+https://git.dayl.in/daylin/utils.git";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
-      inputs.nim2nix.follows = "nim2nix";
+        nixpkgs.follows = "nixpkgs";
+        nim2nix.follows = "nim2nix";
+      };
     };
     nim2nix = {
       url = "github:daylinmorgan/nim2nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     pixi = {
       url = "github:daylinmorgan/pixi-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -90,6 +105,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    lix-attic = {
+      url = "git+https://git.lix.systems/nrabulinski/attic.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.lix-module.follows = "lix-module";
+      # make lix-module source of truth
+      inputs.lix.follows = "lix-module/lix";
+    };
+
     # roc = {
     #   url = "github:roc-lang/roc";
     #   inputs.nixpkgs.follows = "nixpkgs";
@@ -100,6 +123,30 @@
     # zls.url = "github:zigtools/zls";
     # zls.inputs.nixpkgs.follows = "nixpkgs";
     # zls.inputs.zig-overlay.follows = "zig-overlay";
+
+    # further flake.lock minimization shenanigans
+    flake-utils.url = "github:numtide/flake-utils";
+    jj.inputs.flake-utils.follows = "flake-utils";
+    lib-aggregate.inputs.flake-utils.follows = "flake-utils";
+
+    lib-aggregate.url = "github:nix-community/lib-aggregate";
+    nixpkgs-wayland.inputs.lib-aggregate.follows = "lib-aggregate";
+
+    nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
+
+    # nil inputs
+    hyprland.inputs.pre-commit-hooks.follows = "";
+
+    nixos-wsl.inputs.flake-compat.follows = "";
+
+    nixpkgs-wayland.inputs = {
+      flake-compat.follows = "";
+      nix-eval-jobs.follows = "";
+    };
+
+    lix-attic.inputs = {
+      nix-github-actions.follows = "";
+    };
   };
 
   nixConfig = {

hosts/algiz/caddy/Caddyfile

@@ -2,14 +2,6 @@ links.dayl.in {
   reverse_proxy http://localhost:9090
 }
 
-elizabeth-and-daylin.com {
-    reverse_proxy http://localhost:4321
-}
-
-elizabeth.dayl.in, www.elizabeth-and-daylin.com {
-  redir https://elizabeth-and-daylin.com{uri} permanent
-}
-
 git.dayl.in {
   reverse_proxy http://localhost:3000
 }
@@ -26,6 +18,19 @@ gts.dayl.in {
 	}
 }
 
+daylin.bsky.dayl.in, bsky.dayl.in {
+  reverse_proxy http://localhost:6555
+}
+
+elizabeth-and-daylin.com {
+    reverse_proxy http://localhost:4321
+}
+
+elizabeth.dayl.in, www.elizabeth-and-daylin.com {
+  redir https://elizabeth-and-daylin.com{uri} permanent
+}
+
+
 # not currently a running service on algiz
 # (caddy-common) {
 # 	encode gzip

hosts/algiz/default.nix

@@ -27,6 +27,7 @@
       "/home/daylin/services/gotosocial/"
       "/home/daylin/services/caddy/"
       "/home/daylin/services/wedding-website/"
+      "/home/daylin/services/bsky-pds/"
     ];
   };
 

hosts/algiz/services.nix

@@ -1,4 +1,9 @@
-{ pkgs, enabled, ... }:
+{
+  pkgs,
+  enabled,
+  flake,
+  ...
+}:
 let
   atticPort = "5656";
   static = pkgs.runCommandLocal "static-files" { } ''
@@ -26,8 +31,10 @@ in
   # 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!
     environmentFile = "/etc/atticd.env";
 
     settings = {

hosts/othalan/default.nix

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

hosts/othalan/settings/pkgs

@@ -1,7 +1,6 @@
 flake:utils
 ghostty
 sops
-attic-client
 distrobox
 firefox
 zk

lib/checks.nix

@@ -36,11 +36,11 @@ in
             swww
             nixVersions.git
           ])
-          ++ [
+          # ++ [
-            (flake.pkgs "roc").full
+          #   (flake.pkgs "roc").full
-            (flake.pkgs "zig-overlay").master
+          #   (flake.pkgs "zig-overlay").master
-            (flake.pkg "zls")
+          #   (flake.pkg "zls")
-          ]
+          # ]
           ++ hyprPackages
           ++ selfPackages;
       }

lib/default.nix

@@ -10,7 +10,6 @@ let
   inherit (builtins) mapAttrs readDir listToAttrs;
   inherit (lib)
     genAttrs
-    pkgFromSystem
     loadOverlays
     listify
     enableAttrs
@@ -33,15 +32,6 @@ let
       )
     );
 
-  inheritFlakePkgs =
-    pkgs: flakes:
-    listToAttrs (
-      map (name: {
-        inherit name;
-        value = pkgFromSystem pkgs.system name;
-      }) flakes
-    );
-
   evalTreeFmt =
     pkgs:
     (treefmt-nix.lib.evalModule pkgs (
@@ -75,14 +65,10 @@ let
         default = oizys;
         oizys = pkgs.callPackage ../pkgs/oizys { };
         iso = mkIso.config.system.build.isoImage;
-        lix = pkgFromSystem pkgs.system "lix-module";
+
+        # nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
       }
-      // (inheritFlakePkgs pkgs [
+      // (import ../pkgs { inherit pkgs lib; })
-        "pixi"
-        "f1multiviewer"
-        "tsm"
-      ])
-      // (import ../pkgs { inherit pkgs; })
     );
 
     devShells = forAllSystems (pkgs: {
@@ -105,7 +91,6 @@ let
       }
     );
     formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper);
-    # formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
   };
 in
 {

lib/extended.nix

@@ -104,6 +104,16 @@ let
   # listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
   listNixFilesRecursive = dir: dir |> listFilesRecursive |> filterNotDefaultNixFile;
 
+  ## convert a list of flakes to { name = packageAttr; }
+  flakesToPackagesAttrs =
+    system: flakes:
+    listToAttrs (
+      map (name: {
+        inherit name;
+        value = pkgFromSystem system name;
+      }) flakes
+    );
+
   # defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
   # defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
   pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
@@ -115,6 +125,7 @@ let
     module = nixosModuleFrom;
     pkgs = pkgsFromSystem system;
     pkg = pkgFromSystem system;
+    toPackageAttrs = flakesToPackagesAttrs system;
   };
 
   loadOverlays =

lib/generators.nix

@@ -5,7 +5,6 @@
   ...
 }:
 let
-  inherit (builtins) filter;
   inherit (lib)
     nixosSystem
     mkDefaultOizysModule
@@ -21,29 +20,32 @@ let
   nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default);
   selfModules = names: names |> listify |> map (n: self.nixosModules.${n});
 
-  # generate anonymous module to set oizys settings from existing plaintext files
-
   commonSpecialArgs = {
     inherit
       self
       inputs
       lib
+      flake
       enabled
       ;
   };
 
   mkIso = nixosSystem {
-    system = "x86_64-linux";
+    modules =
-    modules = (nixosModules "lix-module") ++ (selfModules "nix|essentials|iso");
+      [
+        { nixpkgs.hostPlatform = "x86_64-linux"; }
+      ]
+      ++ (nixosModules "lix-module")
+      ++ (selfModules "essentials|iso");
     specialArgs = commonSpecialArgs;
   };
 
   mkSystem =
     hostName:
     nixosSystem {
-      system = "x86_64-linux";
       modules =
         [
+          { nixpkgs.hostPlatform = "x86_64-linux"; }
         ]
         ++ (selfModules ''oizys'')
         ++ (nixosModules ''lix-module|sops-nix'')
@@ -51,7 +53,6 @@ let
 
       specialArgs = commonSpecialArgs // {
         inherit
-          flake
           mkDefaultOizysModule
           mkOizysModule
           listify

modules/essentials.nix

@@ -1,6 +1,8 @@
 {
+  inputs,
   pkgs,
   self,
+  flake,
   enabled,
   ...
 }:
@@ -19,5 +21,47 @@
     wget
     curl
     htop
+
+    (flake.pkg "self")
+
+    pkgs.nix-output-monitor
   ];
+
+  nixpkgs.config.allowUnfree = true;
+  nix = {
+    optimise.automatic = true;
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+
+    # use the same nixpkgs for nix run "nixpkgs#hello" style commands
+    registry.nixpkgs.flake = inputs.nixpkgs;
+  };
+
+  nix = {
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "pipe-operator"
+      ];
+      use-xdg-base-directories = true;
+      trusted-users = [ "@wheel" ];
+      accept-flake-config = true;
+      extra-substituters = [
+        "https://attic.dayl.in/oizys"
+        "https://nixpkgs-wayland.cachix.org"
+        # "https://hyprland.cachix.org"
+        # "https://daylin.cachix.org"
+      ];
+      extra-trusted-public-keys = [
+        "oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
+        "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+        # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        # "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
+      ];
+    };
+  };
 }

modules/nix-improved.nix

@@ -0,0 +1,47 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  enabled,
+  ...
+}:
+let
+  inherit (lib) makeBinPath;
+in
+{
+  imports = [ inputs.nix-index-database.nixosModules.nix-index ];
+
+  # https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
+  # use the same nixpkgs for nix-shell -p hello style commands
+  # I don't know that this is necesary...
+  # nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
+  # environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
+
+  environment.systemPackages = [
+    pkgs.nixd
+    pkgs.nixfmt-rfc-style
+  ];
+
+  programs.nix-index-database.comma = enabled;
+
+  # nix-index didn't like this being enabled?
+  programs.command-not-found.enable = false;
+
+  # I'm getting errors related to a non-existent nix-index?
+  programs.nix-index.enableZshIntegration = false;
+  programs.nix-index.enableBashIntegration = false;
+  programs.nix-index.enableFishIntegration = false;
+
+  system.activationScripts.diff = ''
+    if [[ -e /run/current-system ]]; then
+      PATH=$PATH:${
+        makeBinPath [
+          pkgs.nvd
+          pkgs.nix
+        ]
+      }
+      nvd diff /run/current-system "$systemConfig"
+    fi
+  '';
+
+}

modules/nix.nix

@@ -1,89 +0,0 @@
-{
-  inputs,
-  pkgs,
-  lib,
-  enabled,
-  flake,
-  ...
-}:
-let
-  inherit (lib) makeBinPath;
-in
-{
-  imports = [ inputs.nix-index-database.nixosModules.nix-index ];
-
-  nixpkgs.config.allowUnfree = true;
-  # nix.package = pkgs.nixVersions.latest;
-  nix = {
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-        "pipe-operator"
-      ];
-      use-xdg-base-directories = true;
-    };
-
-    optimise.automatic = true;
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-
-    # use the same nixpkgs for nix run "nixpkgs#hello" style commands
-    registry.nixpkgs.flake = inputs.nixpkgs;
-  };
-
-  # https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
-  # use the same nixpkgs for nix-shell -p hello style commands
-  # I don't know that this is necesary...
-  # nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
-  # environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
-
-  environment.systemPackages = [
-    pkgs.nixd
-    pkgs.nixfmt-rfc-style
-    pkgs.nix-output-monitor
-    (flake.pkg "self")
-  ];
-
-  programs.nix-index-database.comma = enabled;
-
-  # nix-index didn't like this being enabled?
-  programs.command-not-found.enable = false;
-
-  # I'm getting errors related to a non-existent nix-index?
-  programs.nix-index.enableZshIntegration = false;
-  programs.nix-index.enableBashIntegration = false;
-  programs.nix-index.enableFishIntegration = false;
-
-  system.activationScripts.diff = ''
-    if [[ -e /run/current-system ]]; then
-      PATH=$PATH:${
-        makeBinPath [
-          pkgs.nvd
-          pkgs.nix
-        ]
-      }
-      nvd diff /run/current-system "$systemConfig"
-    fi
-  '';
-
-  nix.settings = {
-    trusted-users = [ "@wheel" ];
-    accept-flake-config = true;
-    extra-substituters = [
-      "https://attic.dayl.in/oizys"
-      "https://nixpkgs-wayland.cachix.org"
-      # "https://hyprland.cachix.org"
-      # "https://daylin.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
-      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-      # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      # "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
-    ];
-  };
-}

modules/oizys.nix

@@ -19,9 +19,9 @@ in
   imports = with self.nixosModules; [
     users
     runes
-    nix
-
     essentials
+
+    nix-improved
     cli
     nvim
     vpn

pkgs/default.nix

@@ -1,4 +1,12 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (lib) flakeFromSystem;
+  flake = flakeFromSystem pkgs.system;
+in
 {
   nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
   procs = pkgs.callPackage ./nim/procs { };
@@ -7,4 +15,13 @@
   distrobox = pkgs.callPackage ./distrobox { };
 
   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 = (flake.pkgs "lix-module").default;
 }
+// (flake.toPackageAttrs [
+  "pixi"
+  "f1multiviewer"
+  "tsm"
+])

pkgs/distrobox/default.nix

@@ -47,8 +47,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   postInstall = ''
-    ls completions/zsh
+    installShellCompletion \
-    installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox
+      --cmd distrbox \
+      --zsh completions/zsh/_distrobox \
+      --bash completions/bash/distrbox
   '';
 
   meta = with lib; {

pkgs/oizys/default.nix

@@ -5,7 +5,7 @@
 }:
 buildNimblePackage {
   name = "oizys";
-  verions = "unstable";
+  version = "unstable";
   src = lib.cleanSource ./.;
   nativeBuildInputs = [ openssl ];
   nimbleDepsHash = "sha256-dFJw/m7D5UFUrHH7exsyHknt8WHIK1QIQATNd5l7FZA=";

pkgs/oizys/src/oizys/exec.nim

@@ -56,6 +56,28 @@ proc runCmdCapt*(
 
   close p
 
+proc formatStdoutStderr(stdout: string, stderr: string): string =
+  template addLine =
+    # TODO: make -> red after hwylterm update
+    result.add "-> "
+    result.add line
+    result.add "\n"
+  result.add "stdout:\n"
+  for line in stdout.splitLines():
+    addLine
+    # result.add bb"[red]->[/]"
+    #  result.add "-> "
+    #  result.add line
+    #  result.add "\n"
+  result.add "stdout:\n"
+  for line in stderr.splitLines():
+    addLine
+    result.add "-> "
+    result.add line
+    result.add "\n"
+
+
+
 proc runCmdCaptWithSpinner*(
   cmd: string,
   msg: string = "",
@@ -67,8 +89,7 @@ proc runCmdCaptWithSpinner*(
   with(Dots2, msg):
     (output, err, code) = runCmdCapt(cmd, capture)
   if code != 0:
-    stderr.writeLine("stdout\n" & output)
+    stderr.write(formatStdoutStderr(output,err))
-    stderr.writeLine("stderr\n" & err)
     error fmt"{cmd} had non zero exit"
     quit code
   return (output, err)

pkgs/oizys/src/oizys/nix.nim

@@ -389,6 +389,7 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
   if isCi():
     reportResults(results)
 
+  if outs.len > 0:
     # TODO: push after build not at once?
     var cmd = service
     cmd.addArg "push"