[feature] nix: switch to lix

This commit is contained in:
Jalil David Salamé Messina 2024-05-10 21:47:38 +02:00
parent a8596bd19f
commit 42484f176f
Signed by: jalil
GPG key ID: F016B9E770737A0B
3 changed files with 105 additions and 7 deletions

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
result result
.direnv/ .direnv/
.pre-commit-config.yaml .pre-commit-config.yaml
# ignore vm images
*.qcow2

View file

@ -136,7 +136,7 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
@ -261,11 +261,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": {
@ -278,6 +278,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_4": {
"inputs": {
"systems": "systems_4"
},
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@ -292,6 +310,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"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -387,9 +420,46 @@
"type": "github" "type": "github"
} }
}, },
"neovim-flake": { "lix": {
"flake": false,
"locked": {
"lastModified": 1715369616,
"narHash": "sha256-H4tntQASGNdP2UySLDc3KjcdXjEChpwCDweYrPI7KWo=",
"rev": "4ebbd4362f3e39315717706ebf853a9a2876fdbc",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4ebbd4362f3e39315717706ebf853a9a2876fdbc.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
}
},
"lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1715278311,
"narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=",
"rev": "c8ab1e79ba0140bc75731c75177242089506260b",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c8ab1e79ba0140bc75731c75177242089506260b.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
}
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -473,7 +543,7 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -503,6 +573,8 @@
"audiomenu": "audiomenu", "audiomenu": "audiomenu",
"home-manager": "home-manager", "home-manager": "home-manager",
"jpassmenu": "jpassmenu", "jpassmenu": "jpassmenu",
"lix": "lix",
"lix-module": "lix-module",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@ -588,6 +660,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

@ -32,6 +32,13 @@
inputs.neovim-flake.url = "github:neovim/neovim?dir=contrib"; inputs.neovim-flake.url = "github:neovim/neovim?dir=contrib";
inputs.neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; inputs.neovim-flake.inputs.nixpkgs.follows = "nixpkgs";
# Lix
inputs.lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
inputs.lix.flake = false;
inputs.lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
inputs.lix-module.inputs.lix.follows = "lix";
inputs.lix-module.inputs.nixpkgs.follows = "nixpkgs";
# Flake outputs that other flakes can use # Flake outputs that other flakes can use
outputs = { outputs = {
self, self,
@ -43,6 +50,8 @@
audiomenu, audiomenu,
nixvim, nixvim,
neovim-flake, neovim-flake,
lix,
lix-module,
}: let }: let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
# Helpers for producing system-specific outputs # Helpers for producing system-specific outputs
@ -199,7 +208,7 @@
imports = [ imports = [
(import ./system {inherit stylix;}) (import ./system {inherit stylix;})
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
]; ] ++ nixpkgs.lib.optional (lix != null && lix-module != null) lix-module.nixosModules.default;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;