commit c2e08ceeebb6713b1d9967694302e98777a725cb
parent 123408658540663d0aa80b3590c1ad4e49bf1fef
Author: Toni Brown <me@tb148.net>
Date: Mon, 27 Apr 2026 18:27:11 +0800
change how lix is imported
Diffstat:
8 files changed, 15 insertions(+), 106 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -106,39 +106,6 @@
"type": "github"
}
},
- "flake-utils": {
- "inputs": {
- "systems": "systems_2"
- },
- "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"
- }
- },
- "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"
- }
- },
"hermes-agent": {
"inputs": {
"flake-parts": "flake-parts_2",
@@ -199,43 +166,6 @@
"type": "github"
}
},
- "lix": {
- "flake": false,
- "locked": {
- "lastModified": 1777046179,
- "narHash": "sha256-ukqkOXABDV9aNOtM6jm1Xfkak4hVUOsB65j7Jsvnjug=",
- "rev": "de212be82bfb51dd7cc96c1485b1b7d713696501",
- "type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/de212be82bfb51dd7cc96c1485b1b7d713696501.tar.gz?rev=de212be82bfb51dd7cc96c1485b1b7d713696501"
- },
- "original": {
- "type": "tarball",
- "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
- }
- },
- "lix-module": {
- "inputs": {
- "flake-utils": "flake-utils",
- "flakey-profile": "flakey-profile",
- "lix": [
- "lix"
- ],
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1773460763,
- "narHash": "sha256-y9kC3ff89btXS8RD6pAtM50g0qtsim1I8HXBtgSqdbI=",
- "rev": "5e56f5a973e24292b125dca9e9d506b0a91d6903",
- "type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5e56f5a973e24292b125dca9e9d506b0a91d6903.tar.gz?rev=5e56f5a973e24292b125dca9e9d506b0a91d6903"
- },
- "original": {
- "type": "tarball",
- "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1776877367,
@@ -388,8 +318,6 @@
"catppuccin": "catppuccin",
"hermes-agent": "hermes-agent",
"home-manager": "home-manager",
- "lix": "lix",
- "lix-module": "lix-module",
"nixpkgs": "nixpkgs",
"nur": "nur"
}
@@ -409,21 +337,6 @@
"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"
- }
- },
"uv2nix": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
@@ -7,15 +7,6 @@
url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs";
};
- lix = {
- url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
- flake = false;
- };
- lix-module = {
- url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
- inputs.nixpkgs.follows = "nixpkgs";
- inputs.lix.follows = "lix";
- };
betterfox = {
url = "github:HeitorAugustoLN/betterfox-nix";
inputs.nixpkgs.follows = "nixpkgs";
@@ -38,8 +29,6 @@
self,
nixpkgs,
nur,
- lix,
- lix-module,
betterfox,
catppuccin,
hermes-agent,
@@ -54,7 +43,6 @@
modules = [
./local/.
nur.modules.nixos.default
- lix-module.nixosModules.default
catppuccin.nixosModules.catppuccin
hermes-agent.nixosModules.default
home-manager.nixosModules.home-manager
@@ -77,7 +65,6 @@
specialArgs = {inherit inputs;};
modules = [
./remote/.
- lix-module.nixosModules.default
];
};
};
diff --git a/home/default.nix b/home/default.nix
@@ -7,6 +7,7 @@
./alacritty/.
./catppuccin/.
./directory/.
+ ./direnv/.
./fcitx5/.
./firefox/.
./gpg/.
@@ -41,7 +42,6 @@
programs.bat.enable = true;
programs.carapace.enable = true;
- programs.direnv.enable = true;
programs.fastfetch.enable = true;
programs.fd.enable = true;
programs.helix.enable = true;
diff --git a/home/direnv/default.nix b/home/direnv/default.nix
@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+ programs.direnv = {
+ enable = true;
+ nix-direnv = {
+ enable = true;
+ package = pkgs.lixPackageSets.latest.nix-direnv;
+ };
+ };
+}
diff --git a/home/zed-editor/default.nix b/home/zed-editor/default.nix
@@ -4,7 +4,7 @@
extraPackages = with pkgs; [
alejandra
dprint
- nil
+ lixPackageSets.latest.nil
prettier
tombi
vscode-json-languageserver
diff --git a/local/nix/default.nix b/local/nix/default.nix
@@ -1,5 +1,6 @@
-{...}: {
+{pkgs, ...}: {
nixpkgs.config.allowUnfree = true;
+ nix.package = pkgs.lixPackageSets.latest.lix;
nix.settings = {
auto-optimise-store = true;
experimental-features = [
diff --git a/local/user/default.nix b/local/user/default.nix
@@ -3,9 +3,7 @@
users.users.tb148 = {
isNormalUser = true;
home = "/home/tb148";
- shell = pkgs.zsh;
description = "Toni Brown";
extraGroups = ["wheel" "boinc" "docker"];
};
- programs.zsh.enable = true;
}
diff --git a/remote/nix/default.nix b/remote/nix/default.nix
@@ -1,4 +1,5 @@
-{...}: {
+{pkgs, ...}: {
+ nix.package = pkgs.lixPackageSets.latest.lix;
nix.settings = {
auto-optimise-store = true;
experimental-features = [
