From 8b5c8337856b217cad0797ff556e325dafc3e43b Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 4 Jul 2025 01:31:56 -0400 Subject: [PATCH 1/5] fix lix linting error --- systems/palatine-hill/attic/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/systems/palatine-hill/attic/default.nix b/systems/palatine-hill/attic/default.nix index 1b3580a..cdef37a 100644 --- a/systems/palatine-hill/attic/default.nix +++ b/systems/palatine-hill/attic/default.nix @@ -10,10 +10,6 @@ attic-client ]; - systemd.services.atticd.environment = { - RUST_LOG = "INFO"; - }; - services = { atticd = { enable = true; @@ -71,6 +67,9 @@ # configured default webstore for this on root user separately systemd = { services = { + atticd.environment = { + RUST_LOG = "INFO"; + }; attic-watch-store = { wantedBy = [ "multi-user.target" ]; after = [ From afccd339e975c3c6b854a9124237f7d40f310e67 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 4 Jul 2025 01:45:07 -0400 Subject: [PATCH 2/5] add lix to artemision --- flake.lock | 56 ++++++++++++++++++++++++++++++++++ flake.nix | 8 +++++ lib/systems.nix | 2 ++ systems/artemision/default.nix | 1 + 4 files changed, 67 insertions(+) diff --git a/flake.lock b/flake.lock index bda355a..a8348e9 100644 --- a/flake.lock +++ b/flake.lock @@ -178,6 +178,21 @@ "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": { @@ -343,6 +358,46 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1737234286, + "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", + "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741892773, + "narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=", + "ref": "stable", + "rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911", + "revCount": 130, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "ref": "stable", + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "nix": { "flake": false, "locked": { @@ -605,6 +660,7 @@ "home-manager": "home-manager", "hydra": "hydra", "hyprland-contrib": "hyprland-contrib", + "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-cosmic": "nixos-cosmic", "nixos-generators": "nixos-generators", diff --git a/flake.nix b/flake.nix index 444e20e..68a36c0 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/systems.nix b/lib/systems.nix index 4cb2607..fd46b2a 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -156,6 +156,7 @@ rec { modules ? [ ], server ? true, sops ? true, + lix ? false, system ? "x86_64-linux", }@args: lib.nixosSystem { @@ -180,6 +181,7 @@ rec { ++ genWrapper sops genSops args ++ genWrapper home genHome args ++ genWrapper true genUsers args + ++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args ++ genWrapper (system != "x86_64-linux") genNonX86 args; }; diff --git a/systems/artemision/default.nix b/systems/artemision/default.nix index 538e135..dfc80eb 100644 --- a/systems/artemision/default.nix +++ b/systems/artemision/default.nix @@ -3,6 +3,7 @@ system = "x86_64-linux"; home = true; sops = true; + lix = true; server = false; users = [ "alice" ]; modules = [ From c310e8b5c389bddcf97727150ab01257365bedf8 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 4 Jul 2025 13:18:07 -0400 Subject: [PATCH 3/5] update flake lock --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index a8348e9..c34c37a 100644 --- a/flake.lock +++ b/flake.lock @@ -112,7 +112,7 @@ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" }, "original": { "type": "tarball", @@ -302,11 +302,11 @@ ] }, "locked": { - "lastModified": 1751589297, - "narHash": "sha256-3q35cq6BPuwIRL3IoVKYPc72r3OleeuRyf4YAPjEqzA=", + "lastModified": 1751638848, + "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "83f978812c37511ef2ffaf75ffa72160483f738a", + "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", "type": "github" }, "original": { @@ -744,11 +744,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751602277, - "narHash": "sha256-mlJeMDyj+B9QYNw/f9YdlBzvq6mcQ3dx5qjfepzV70I=", + "lastModified": 1751648901, + "narHash": "sha256-yC45eAT37H6rOFCGhr2iuV5dzJ/8I2N1QrKq1MwPG7U=", "owner": "danth", "repo": "stylix", - "rev": "3c73dee2dbdf242a16a6e929f3e574dd0694d85a", + "rev": "dea0337e0bffeeeb941ca6caffb44e966b13a97b", "type": "github" }, "original": { From 70037306ec139a9fdcfe884845687d03347ede91 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 4 Jul 2025 13:25:20 -0400 Subject: [PATCH 4/5] update flake lock --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c34c37a..3def149 100644 --- a/flake.lock +++ b/flake.lock @@ -112,7 +112,7 @@ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1751469444, - "narHash": "sha256-L5vPflQCt7WWzL66cA0ZbITfg+vzrSf6Ak5m4s6vDds=", + "lastModified": 1751649523, + "narHash": "sha256-39SLBeXE+bzq5ChXYB7FFzUNa+8SCnXvwe9IEgKcxWQ=", "owner": "SuperSandro2000", "repo": "nixos-modules", - "rev": "ed24075c9b4d1cedac253f31aaa2d4729d4fdf53", + "rev": "d2a834e4f97a1ccb71c62e3091501a4e237fd6cb", "type": "github" }, "original": { From bb81c54d453d779bf80349816d1998c1d749c19d Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 4 Jul 2025 13:40:45 -0400 Subject: [PATCH 5/5] update flake lock --- flake.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 3def149..e8b0605 100644 --- a/flake.lock +++ b/flake.lock @@ -365,7 +365,7 @@ "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", "rev": "079528098f5998ba13c88821a2eca1005c1695de", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz" }, "original": { "type": "tarball",