From bb30a9e93ba1bdf1c1877eea3866e2aa4c5bbb65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 16 May 2024 14:26:46 +0200 Subject: [PATCH] update the lix to use nixpkgs, and update the flake lock --- flake.lock | 200 +++++++++++---------------------------- flake.nix | 17 ---- nixos/shared/default.nix | 2 +- 3 files changed, 55 insertions(+), 164 deletions(-) diff --git a/flake.lock b/flake.lock index 2c85447..b957ebe 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1715210854, - "narHash": "sha256-88jxvd+LIP/XwlvJ3+QPbGCFMChmBfIbUNp1mEP9DJY=", + "lastModified": 1715659881, + "narHash": "sha256-emodPGTXLVqlcOkqbJiOUkf5vo8WWujgzKxms1B+iBs=", "owner": "catppuccin", "repo": "nix", - "rev": "e5322f7b4001aa8aab38ca5a0f42cafc590f42b6", + "rev": "d6344610c04af0f8e315fef45dd3b854014b119e", "type": "github" }, "original": { @@ -57,11 +57,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1714472853, - "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", "owner": "matrix-org", "repo": "complement", - "rev": "891d18872c153d39a9ce63b545045efddb845738", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715396204, - "narHash": "sha256-IYT/n9vFWOXDergfXe5iOFGTe8TrjI+rYcwQQEWy2iY=", + "lastModified": 1715798361, + "narHash": "sha256-NkUaW/o2oVLkD+DSgS8ktFP2H2w6cLrakiwheu3vCaM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "18e43e1d35c70e71b5fbaf44059f96a0bc4cf49e", + "rev": "4389e086868cc10b97a464478e88c03dc4f2e00a", "type": "github" }, "original": { @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1713738183, - "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=", + "lastModified": 1715274763, + "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", "owner": "ipetkov", "repo": "crane", - "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11", + "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", "type": "github" }, "original": { @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1715217706, - "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", + "lastModified": 1715822638, + "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", "owner": "nix-community", "repo": "disko", - "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", + "rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432", "type": "github" }, "original": { @@ -214,11 +214,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1714544767, - "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", + "lastModified": 1715322226, + "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", "owner": "nix-community", "repo": "fenix", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "rev": "297c756ba6249d483c1dafe42378560458842173", "type": "github" }, "original": { @@ -386,7 +386,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -402,39 +402,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -464,11 +431,11 @@ ] }, "locked": { - "lastModified": 1715380449, - "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7682620185f213df384c363288093b486b2883f", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -484,11 +451,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1715417624, - "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=", + "lastModified": 1715845522, + "narHash": "sha256-zKv1tlYvIrboMrXo0RD8PZsAAUHB2cKD/BpA31LsPRI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8fef078acb3206be58ae5892a32d6ed75b695647", + "rev": "6aa9ba0cda3a3b2e3ce503d67c55d7d6eaf89e6f", "type": "github" }, "original": { @@ -521,48 +488,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - }, - "original": { - "ref": "refs/tags/2.90-beta.1", - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_5", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715278311, - "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=", - "ref": "refs/heads/main", - "rev": "c8ab1e79ba0140bc75731c75177242089506260b", - "revCount": 75, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - } - }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -608,11 +533,11 @@ ] }, "locked": { - "lastModified": 1714878592, - "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", "type": "github" }, "original": { @@ -723,11 +648,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1714858427, - "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", + "lastModified": 1715458492, + "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", + "rev": "8e47858badee5594292921c2668c11004c3b0142", "type": "github" }, "original": { @@ -739,11 +664,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -755,11 +680,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -787,11 +712,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -818,11 +743,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1715413075, + "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", "type": "github" }, "original": { @@ -928,8 +853,6 @@ "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", - "lix": "lix", - "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", @@ -944,11 +867,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713628977, - "narHash": "sha256-iN5QUlUq527lswmBC+RopfXdu6Xx7mmTaBSH2l59FtM=", + "lastModified": 1715255944, + "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "55d9a533b309119c8acd13061581b43ae8840823", + "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", "type": "github" }, "original": { @@ -1036,11 +959,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715244550, - "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", + "lastModified": 1715482972, + "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", + "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", "type": "github" }, "original": { @@ -1124,24 +1047,9 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1709126324, @@ -1160,16 +1068,16 @@ "zjstatus": { "inputs": { "crane": "crane_4", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1715177960, - "narHash": "sha256-47EdSIRvRfn0ZIOGHeoBQxpA2nyY29VjFPjSRYel/tU=", + "lastModified": 1715776884, + "narHash": "sha256-jGAwhJ9FPa5jbysuYjOhcW2OQOdXEtLloq+3wTlHzO0=", "owner": "dj95", "repo": "zjstatus", - "rev": "d124427b2fa597aacd330d0f73557e4fb20fbbdd", + "rev": "25e3a56f8be3732661a622352590886957c5a59a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0d5bafd..5e0a94b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,16 +5,6 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - lix = { - url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; - flake = false; - }; - lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; - inputs.lix.follows = "lix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Disko for declaratively setting disk formatting @@ -89,7 +79,6 @@ plasma-manager, zjstatus, lanzaboote, - lix-module, jovian, nixos-hardware, nix-index-database, @@ -142,7 +131,6 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index - lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -164,7 +152,6 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index - lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -185,7 +172,6 @@ disko.nixosModules.disko simple-nixos-mailserver.nixosModule catppuccin.nixosModules.catppuccin - lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -205,7 +191,6 @@ disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager - lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -227,7 +212,6 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin - lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager @@ -248,7 +232,6 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin - lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index ee1dff2..ba083a3 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -14,7 +14,7 @@ sops.secrets."lillian-password".neededForUsers = true; nix = { - package = pkgs.nixFlakes; + package = pkgs.lix; gc = { automatic = true; dates = "weekly";