From e2bc5a3235dde2410d49cf87e22cbee337ac8104 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 20 Oct 2024 19:06:35 -0400 Subject: [PATCH] update flake, fix breaking changes --- flake.lock | 124 +++++++----------------- flake.nix | 18 ++-- systems/palatine-hill/attic/default.nix | 5 +- systems/palatine-hill/default.nix | 4 +- systems/palatine-hill/gitea.nix | 8 +- users/alice/home.nix | 2 +- 6 files changed, 56 insertions(+), 105 deletions(-) diff --git a/flake.lock b/flake.lock index 5d161e7..beda323 100644 --- a/flake.lock +++ b/flake.lock @@ -1,56 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane", - "flake-compat": [ - "flake-compat" - ], - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1728577371, - "narHash": "sha256-f3bKclEV5t1eP1OH7kTGv/tLzlToSRIe0ktkdl1jihw=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "e5c8d2d50981a34602358d917e7be011b2c397a8", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, - "crane": { - "inputs": { - "nixpkgs": [ - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", - "owner": "ipetkov", - "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "firefox-addons": { "inputs": { "flake-utils": [ @@ -62,11 +11,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1728965006, - "narHash": "sha256-TXBxJMGC6P+cn5La/lIgVzb9ETutsOI3A3urHihB7FA=", + "lastModified": 1729460064, + "narHash": "sha256-xhxuD0NKyQf+WrQL2qWvrZFHmZ22g/+1TUT+kOukL0k=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f4947cf2d1a469b23fee54ad948c539f6aa431a7", + "rev": "7aeeff126b300e2977fe04b3606669b28a5b4dfd", "type": "gitlab" }, "original": { @@ -156,11 +105,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -176,11 +125,11 @@ ] }, "locked": { - "lastModified": 1725551787, - "narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", + "lastModified": 1729224425, + "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=", "owner": "hyprwm", "repo": "contrib", - "rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", + "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6", "type": "github" }, "original": { @@ -196,11 +145,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1729394935, + "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "type": "github" }, "original": { @@ -232,11 +181,11 @@ ] }, "locked": { - "lastModified": 1728867876, - "narHash": "sha256-NCyOA8WZNoojmXH+kBDrQj3LwvakYNzSc0h+LTXkmPE=", + "lastModified": 1729127034, + "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "fdf142111597f6c6283cf5ffe092b6293a3911d0", + "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f", "type": "github" }, "original": { @@ -247,11 +196,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729455275, + "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", "type": "github" }, "original": { @@ -271,11 +220,11 @@ "search": "search" }, "locked": { - "lastModified": 1728919967, - "narHash": "sha256-zQl8z8iagvrekF4tFK1au7mGH8x0zoGppo6geLPioQk=", + "lastModified": 1729353767, + "narHash": "sha256-mrHq16rogwfLP3ivrx4O5NKNc0gBuBNyMcAfYWMcvEc=", "owner": "SuperSandro2000", "repo": "nixos-modules", - "rev": "1aba521c9cd2cd97490846ac83fd73ae84625c8a", + "rev": "0ea540261e88e3afc126e7df544ef0d2acd28ca4", "type": "github" }, "original": { @@ -286,11 +235,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -314,11 +263,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1729181673, + "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "type": "github" }, "original": { @@ -342,11 +291,11 @@ ] }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -357,7 +306,6 @@ }, "root": { "inputs": { - "attic": "attic", "firefox-addons": "firefox-addons", "flake-compat": "flake-compat", "flake-parts": "flake-parts", @@ -384,11 +332,11 @@ ] }, "locked": { - "lastModified": 1728959392, - "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", "type": "github" }, "original": { @@ -432,11 +380,11 @@ ] }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729394972, + "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 87b7786..a5b79f6 100644 --- a/flake.nix +++ b/flake.nix @@ -26,15 +26,15 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; systems.url = "github:nix-systems/default"; - attic = { - url = "github:zhaofengli/attic"; - inputs = { - nixpkgs.follows = "nixpkgs"; - nixpkgs-stable.follows = "nixpkgs-stable"; - flake-compat.follows = "flake-compat"; - flake-parts.follows = "flake-parts"; - }; - }; + # attic = { + # url = "github:zhaofengli/attic"; + # inputs = { + # nixpkgs.follows = "nixpkgs"; + # nixpkgs-stable.follows = "nixpkgs-stable"; + # flake-compat.follows = "flake-compat"; + # flake-parts.follows = "flake-parts"; + # }; + # }; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; diff --git a/systems/palatine-hill/attic/default.nix b/systems/palatine-hill/attic/default.nix index fc4e293..ecce229 100644 --- a/systems/palatine-hill/attic/default.nix +++ b/systems/palatine-hill/attic/default.nix @@ -8,7 +8,6 @@ { environment.systemPackages = with pkgs; [ attic-client - attic ]; services = { @@ -30,7 +29,7 @@ atticd = { enable = true; - credentialsFile = config.sops.secrets."attic/secret-key".path; + environmentFile = config.sops.secrets."attic/secret-key".path; settings = { listen = "[::]:8183"; @@ -96,7 +95,7 @@ serviceConfig = { User = "root"; Restart = "always"; - ExecStart = "${pkgs.attic}/bin/attic watch-store cache-nix-dot"; + ExecStart = "${pkgs.attic-client}/bin/attic watch-store cache-nix-dot"; }; }; attic-sync-hydra = { diff --git a/systems/palatine-hill/default.nix b/systems/palatine-hill/default.nix index 2523b31..d469ee0 100644 --- a/systems/palatine-hill/default.nix +++ b/systems/palatine-hill/default.nix @@ -1,5 +1,7 @@ { inputs, ... }: { users = [ "alice" ]; - modules = [ inputs.attic.nixosModules.atticd ]; + modules = [ + # inputs.attic.nixosModules.atticd + ]; } diff --git a/systems/palatine-hill/gitea.nix b/systems/palatine-hill/gitea.nix index ae0050e..16be428 100644 --- a/systems/palatine-hill/gitea.nix +++ b/systems/palatine-hill/gitea.nix @@ -16,9 +16,11 @@ in passwordFile = config.sops.secrets."gitea/dbpass".path; host = "127.0.0.1:5432"; }; - domain = "git.alicehuston.xyz"; - rootUrl = "https://git.alicehuston.xyz/"; - httpPort = 443; + settings.server = { + domain = "git.alicehuston.xyz"; + rootUrl = "https://git.alicehuston.xyz/"; + httpPort = 443; + }; stateDir = base_path; lfs.enable = true; recommendedDefaults = true; diff --git a/users/alice/home.nix b/users/alice/home.nix index 11a53d8..b8b1afb 100644 --- a/users/alice/home.nix +++ b/users/alice/home.nix @@ -105,7 +105,7 @@ eza = { enable = true; - icons = true; + icons = "auto"; git = true; };