moritz/clan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "feat: switch back to lix"

Browse source 
This reverts commit 679f12e6a8.
This commit is contained in:
Moritz Böhme 2025-05-19 12:25:54 +02:00
parent a345552e16
commit 701443bf1f
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
4 changed files with 12 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

53
flake.lock generated
View file

@ -373,21 +373,6 @@
"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": {
"flake": false,
"locked": {
@ -572,43 +557,6 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1746827285,
"narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746838955,
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
}
},
"master": {
"locked": {
"lastModified": 1747575265,
@ -1045,7 +993,6 @@
"home-manager": "home-manager",
"impermanence": "impermanence",
"jovian": "jovian",
"lix-module": "lix-module",
"master": "master",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"niri": "niri",

3
flake.nix
View file

@ -112,7 +112,6 @@
home-manager.url = "github:nix-community/home-manager";
impermanence.url = "github:nix-community/impermanence";
jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-monitored.url = "github:ners/nix-monitored";
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
@ -153,8 +152,6 @@
git-hooks.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
jovian.inputs.nixpkgs.follows = "nixpkgs";
lix-module.inputs.flake-utils.follows = "flake-utils";
lix-module.inputs.nixpkgs.follows = "nixpkgs";
neovim-nightly-overlay.inputs.flake-compat.follows = "flake-compat";
neovim-nightly-overlay.inputs.flake-parts.follows = "flake-parts";
neovim-nightly-overlay.inputs.git-hooks.follows = "git-hooks";

3
machines/moritz-server/configuration.nix
View file

@ -1,4 +1,4 @@
{inputs, ...}: {
{
imports = [
../../modules/zfs_unencrypted.nix
../../modules/shared.nix
@ -7,7 +7,6 @@
./ddns.nix
./mail-server.nix
./website/root
inputs.lix-module.nixosModules.default
];
time.timeZone = "Europe/Berlin";

15
modules/moritz/programs/nix.nix
View file

@ -2,16 +2,14 @@
config,
lib,
inputs,
self,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkOption types;
cfg = config.my.programs.nix;
in {
imports = [
inputs.lix-module.nixosModules.default
];
options.my.programs.nix = {
gc = {
enable = mkEnableOption "nix-gc";
@ -25,9 +23,15 @@ in {
};
config = {
home-manager.users.moritz.programs.direnv.nix-direnv.package = pkgs.nix-direnv.override {
nix = config.nix.package;
};
nix = {
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
package = pkgs.nix; # TODO: change this back
extraOptions = ''
experimental-features = nix-command flakes
'';
@ -52,6 +56,9 @@ in {
master.flake = inputs.master;
nixpkgs.flake = inputs.nixpkgs;
stable.flake = inputs.stable;
dotfiles.flake = self;
default.flake = self;
d.flake = self;
};
settings = {