Compare commits

...

3 commits

Author SHA1 Message Date
xqtc161 b9875568bd nix fmt 2024-07-02 12:45:41 +02:00
xqtc161 1658d209a3 Lix Migration Part 2 2024-07-02 12:44:28 +02:00
xqtc161 32e301cb7f Migrate to lix 2024-07-02 12:28:22 +02:00
2 changed files with 99 additions and 10 deletions

View file

@ -22,7 +22,7 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
@ -167,11 +167,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1710146030,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,6 +184,24 @@
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_4"
},
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@ -198,6 +216,21 @@
"type": "github" "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"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@ -289,6 +322,41 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1718419213,
"narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=",
"rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1718778548,
"narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=",
"rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"
}
},
"nh": { "nh": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
@ -507,6 +575,7 @@
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module",
"nh": "nh", "nh": "nh",
"nixos-aarch64-widevine": "nixos-aarch64-widevine", "nixos-aarch64-widevine": "nixos-aarch64-widevine",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -534,7 +603,7 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
@ -596,6 +665,21 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -11,6 +11,10 @@
}; };
spicetify-nix.url = "github:the-argus/spicetify-nix"; spicetify-nix.url = "github:the-argus/spicetify-nix";
nh.url = "github:/viperML/nh"; nh.url = "github:/viperML/nh";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
#inputs.agenix.url = "github:ryantm/agenix"; #inputs.agenix.url = "github:ryantm/agenix";
inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
@ -32,6 +36,7 @@
nixos-hardware, nixos-hardware,
nixvim, nixvim,
nh, nh,
lix-module,
... ...
}: let }: let
lib = nixpkgs.lib; lib = nixpkgs.lib;
@ -51,22 +56,22 @@
# }); # });
"asmodeus" = lib.nixosSystem { "asmodeus" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./hosts/x86_64-linux/asmodeus]; modules = [./hosts/x86_64-linux/asmodeus lix-module.nixosModules.default];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"seraphim" = lib.nixosSystem { "seraphim" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./hosts/x86_64-linux/seraphim]; modules = [./hosts/x86_64-linux/seraphim lix-module.nixosModules.default];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"lilith" = lib.nixosSystem { "lilith" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./hosts/x86_64-linux/lilith]; modules = [./hosts/x86_64-linux/lilith lix-module.nixosModules.default];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"lambda" = lib.nixosSystem { "lambda" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./hosts/x86_64-linux/lambda]; modules = [./hosts/x86_64-linux/lambda lix-module.nixosModules.default];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"beleth" = lib.nixosSystem { "beleth" = lib.nixosSystem {
@ -76,7 +81,7 @@
}; };
"alastor" = lib.nixosSystem { "alastor" = lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [./hosts/aarch64-linux/alastor {nixpkgs.overlays = [inputs.nixos-aarch64-widevine.overlays.default];}]; modules = [./hosts/aarch64-linux/alastor {nixpkgs.overlays = [inputs.nixos-aarch64-widevine.overlays.default];} lix-module.nixosModules.default];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
}; };