From c3ed2345a6c978720343947bb9bb29c8d07e6293 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Wed, 5 Mar 2025 18:43:39 +0000 Subject: [PATCH] flake update --- 1 | 1 + flake.lock | 95 ++++++++++------------- flake.nix | 4 +- home/users/lkk-admin/base/default.nix | 2 +- home/users/produktion/base/default.nix | 2 +- hosts/common/users/lkk-admin/default.nix | 2 +- hosts/common/users/lkk-admin/lkk-admin | 1 - hosts/common/users/produktion/default.nix | 2 +- hosts/common/users/produktion/produktion | 1 - hosts/lkk-nix-1/services/gitea.nix | 6 +- 10 files changed, 54 insertions(+), 62 deletions(-) create mode 100644 1 delete mode 120000 hosts/common/users/lkk-admin/lkk-admin delete mode 120000 hosts/common/users/produktion/produktion diff --git a/1 b/1 new file mode 100644 index 0000000..573541a --- /dev/null +++ b/1 @@ -0,0 +1 @@ +0 diff --git a/flake.lock b/flake.lock index 48d69ef..eec81fd 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715101957, - "narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "07479c2e7396acaaaac5925483498154034ea80a", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1711973905, - "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", "type": "github" }, "original": { @@ -72,31 +72,31 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "narHash": "sha256-0dZpggYjjmWEk+rGixiBHOHuQfLzEzNfrtjSig04s6Q=", - "rev": "9ccae1754eec0341b640d5705302ac0923d22875", - "revCount": 1618, + "lastModified": 1735713283, + "narHash": "sha256-xC6X49L55xo7AV+pAYclOj5UNWtBo/xx5aB5IehJD0M=", + "rev": "bfba822a4220b0e2c4dc7f36a35e4c8450cd9a9c", + "revCount": 2125, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1618%2Brev-9ccae1754eec0341b640d5705302ac0923d22875/018aea4c-03c9-7734-95d5-b84cc8881e3d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2125%2Brev-bfba822a4220b0e2c4dc7f36a35e4c8450cd9a9c/019420f1-c64f-7176-bdf5-3f4f4fe2bac6/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/nix-community/fenix/0.1.1565.tar.gz" + "url": "https://flakehub.com/f/nix-community/fenix/0.1.1584.tar.gz" } }, "fh": { "inputs": { "fenix": "fenix", - "flake-compat": "flake-compat_2", "naersk": "naersk", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1711118970, - "narHash": "sha256-fRaKydMSwd1zl6ptBKvn5ej2pqtI8xi9dioFmR8QA+g=", - "rev": "73fed26f0231ae650122beb3ac1b7654b5cc682c", - "revCount": 425, + "lastModified": 1740069727, + "narHash": "sha256-yOqXcn/OMfC97t002V8yzZn1PhuV8lIp5szPA7eys1Q=", + "rev": "ed73c2dd1d4ccc6d1588809078ebb2f38431dddc", + "revCount": 683, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.10/018e66b1-a218-7f23-949d-ace71c4e4c8b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.22/0195244a-b1c2-7264-b779-0e1e34d9735f/source.tar.gz" }, "original": { "type": "tarball", @@ -119,19 +119,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -160,11 +147,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1741174782, + "narHash": "sha256-dYRebJk58/d5Ej1G6xTOadTfG6tU5zFgXYrLsRJlrgw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "def0dbbcea715d4514ca343ab4d6d7f3a1742da0", "type": "github" }, "original": { @@ -181,15 +168,16 @@ ] }, "locked": { - "narHash": "sha256-TunvZMCxXHvU6fz5kq3XTLfojIvTDlbFGfPUFtwCU5o=", - "rev": "06a99941d72e2202ed62b8aa08b9869817fea56f", - "revCount": 332, + "lastModified": 1736429049, + "narHash": "sha256-np2K6lbTOq7yugwS0IsEmy+02vxTAF62bp8APnBHsE4=", + "rev": "5891bae1b7fbd8d3a138773fd751e7a532f914aa", + "revCount": 352, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.332%2Brev-06a99941d72e2202ed62b8aa08b9869817fea56f/018b61d4-48e5-77e8-8893-9f917732b11a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.352%2Brev-5891bae1b7fbd8d3a138773fd751e7a532f914aa/01944b3d-93aa-7d30-8c2b-bd5902521c73/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/nix-community/naersk/0.1.332.tar.gz" + "url": "https://flakehub.com/f/nix-community/naersk/0.1.345.tar.gz" } }, "nixpkgs": { @@ -210,16 +198,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1714971268, - "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -242,24 +230,25 @@ }, "nixpkgs_3": { "locked": { - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", - "revCount": 534806, + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "revCount": 714614, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.534806%2Brev-5e4c2ada4fcd54b99d56d7bd62f384511a7e2593/018b29e9-ae6d-72f2-993b-19cb9a64a3b5/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.714614%2Brev-c618e28f70257593de75a7044438efc1c1fc0791/0195155d-20df-7b25-ad70-45871483b8d2/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2411.%2A.tar.gz" } }, "nixpkgs_4": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -282,11 +271,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1696050837, - "narHash": "sha256-2K3Aq4gjPZBDnkAMJaMA4ElE+BNbmrqtSBWtt9kPGaM=", + "lastModified": 1735659655, + "narHash": "sha256-DQgwi3pwaasWWDfNtXIX0lW5KvxQ+qVhxO1J7l68Qcc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0840038f02daec6ba3238f05d8caa037d28701a0", + "rev": "085ad107943996c344633d58f26467b05f8e2ff0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 13c40ba..520e4c8 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ }; agenix.url = "github:ryantm/agenix"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz"; deploy-rs.url = "github:serokell/deploy-rs"; }; @@ -56,7 +56,7 @@ hostname = "lkk-nix-1"; sshUser = "root"; profiles.system = { - user = "root"; + user = "lkk-admin"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.lkk-nix-1; }; diff --git a/home/users/lkk-admin/base/default.nix b/home/users/lkk-admin/base/default.nix index 4a1db8d..8c03ae5 100644 --- a/home/users/lkk-admin/base/default.nix +++ b/home/users/lkk-admin/base/default.nix @@ -31,7 +31,7 @@ in { nix = { package = lib.mkDefault pkgs.nix; settings = { - experimental-features = [ "nix-command" "flakes" "repl-flake" ]; + experimental-features = [ "nix-command" "flakes" ]; warn-dirty = false; }; }; diff --git a/home/users/produktion/base/default.nix b/home/users/produktion/base/default.nix index 5ac8b44..cd3d71b 100644 --- a/home/users/produktion/base/default.nix +++ b/home/users/produktion/base/default.nix @@ -36,7 +36,7 @@ in { nix = { package = lib.mkDefault pkgs.nix; settings = { - experimental-features = ["nix-command" "flakes" "repl-flake"]; + experimental-features = ["nix-command" "flakes" ]; warn-dirty = false; }; }; diff --git a/hosts/common/users/lkk-admin/default.nix b/hosts/common/users/lkk-admin/default.nix index 61113ae..7b99e1e 100644 --- a/hosts/common/users/lkk-admin/default.nix +++ b/hosts/common/users/lkk-admin/default.nix @@ -22,5 +22,5 @@ packages = [ inputs.home-manager.packages.${pkgs.system}.default ]; }; home-manager.users.lkk-admin = - import lkk-admin/${config.networking.hostName}.nix; + import ../../../../home/users/lkk-admin/${config.networking.hostName}.nix; } diff --git a/hosts/common/users/lkk-admin/lkk-admin b/hosts/common/users/lkk-admin/lkk-admin deleted file mode 120000 index 1511bb1..0000000 --- a/hosts/common/users/lkk-admin/lkk-admin +++ /dev/null @@ -1 +0,0 @@ -../../../../home/users/lkk-admin/ \ No newline at end of file diff --git a/hosts/common/users/produktion/default.nix b/hosts/common/users/produktion/default.nix index 89acb3b..b4e5490 100644 --- a/hosts/common/users/produktion/default.nix +++ b/hosts/common/users/produktion/default.nix @@ -15,5 +15,5 @@ packages = [pkgs.home-manager]; }; nixpkgs.config.allowUnfree = true; - home-manager.users.produktion = import produktion/${config.networking.hostName}.nix; + home-manager.users.produktion = import ../../../../home/users/produktion/${config.networking.hostName}.nix; } diff --git a/hosts/common/users/produktion/produktion b/hosts/common/users/produktion/produktion deleted file mode 120000 index 3ce91f9..0000000 --- a/hosts/common/users/produktion/produktion +++ /dev/null @@ -1 +0,0 @@ -../../../../home/users/produktion \ No newline at end of file diff --git a/hosts/lkk-nix-1/services/gitea.nix b/hosts/lkk-nix-1/services/gitea.nix index 997f14a..3a28209 100644 --- a/hosts/lkk-nix-1/services/gitea.nix +++ b/hosts/lkk-nix-1/services/gitea.nix @@ -5,7 +5,11 @@ }: { services.gitea = { enable = true; - settings.server.ROOT_URL = "https://code.lanakk.com"; + settings = { + server.ROOT_URL = "https://code.lanakk.com"; + service.DISABLE_REGISTRATION = true; + }; + lfs.enable = true; dump = { enable = true;