ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

update flake, fix breaking changes

Browse Source
This commit is contained in:
ahuston-0 2024-10-20 19:06:35 -04:00
parent e13ad85d0a
commit e2bc5a3235
No known key found for this signature in database
GPG Key ID: 47940175096C1330
6 changed files with 56 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
flake.lock generated
View File

@ -1,56 +1,5 @@
{ {
"nodes": { "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": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -62,11 +11,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1728965006, "lastModified": 1729460064,
"narHash": "sha256-TXBxJMGC6P+cn5La/lIgVzb9ETutsOI3A3urHihB7FA=", "narHash": "sha256-xhxuD0NKyQf+WrQL2qWvrZFHmZ22g/+1TUT+kOukL0k=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "f4947cf2d1a469b23fee54ad948c539f6aa431a7", "rev": "7aeeff126b300e2977fe04b3606669b28a5b4dfd",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -156,11 +105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728903686, "lastModified": 1729459288,
"narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725551787, "lastModified": 1729224425,
"narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +145,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728790083, "lastModified": 1729394935,
"narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,11 +181,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728867876, "lastModified": 1729127034,
"narHash": "sha256-NCyOA8WZNoojmXH+kBDrQj3LwvakYNzSc0h+LTXkmPE=", "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "fdf142111597f6c6283cf5ffe092b6293a3911d0", "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,11 +196,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728729581, "lastModified": 1729455275,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +220,11 @@
"search": "search" "search": "search"
}, },
"locked": { "locked": {
"lastModified": 1728919967, "lastModified": 1729353767,
"narHash": "sha256-zQl8z8iagvrekF4tFK1au7mGH8x0zoGppo6geLPioQk=", "narHash": "sha256-mrHq16rogwfLP3ivrx4O5NKNc0gBuBNyMcAfYWMcvEc=",
"owner": "SuperSandro2000", "owner": "SuperSandro2000",
"repo": "nixos-modules", "repo": "nixos-modules",
"rev": "1aba521c9cd2cd97490846ac83fd73ae84625c8a", "rev": "0ea540261e88e3afc126e7df544ef0d2acd28ca4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +235,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1729256560,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +263,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1728740863, "lastModified": 1729181673,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +291,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728778939, "lastModified": 1729104314,
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,7 +306,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"attic": "attic",
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@ -384,11 +332,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728959392, "lastModified": 1729391507,
"narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "rev": "784981a9feeba406de38c1c9a3decf966d853cca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,11 +380,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728345710, "lastModified": 1729394972,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
flake.nix
View File

@ -26,15 +26,15 @@
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
attic = { # attic = {
url = "github:zhaofengli/attic"; # url = "github:zhaofengli/attic";
inputs = { # inputs = {
nixpkgs.follows = "nixpkgs"; # nixpkgs.follows = "nixpkgs";
nixpkgs-stable.follows = "nixpkgs-stable"; # nixpkgs-stable.follows = "nixpkgs-stable";
flake-compat.follows = "flake-compat"; # flake-compat.follows = "flake-compat";
flake-parts.follows = "flake-parts"; # flake-parts.follows = "flake-parts";
}; # };
}; # };
firefox-addons = { firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";

5
systems/palatine-hill/attic/default.nix
View File

@ -8,7 +8,6 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
attic-client attic-client
attic
]; ];
services = { services = {
@ -30,7 +29,7 @@
atticd = { atticd = {
enable = true; enable = true;
credentialsFile = config.sops.secrets."attic/secret-key".path; environmentFile = config.sops.secrets."attic/secret-key".path;
settings = { settings = {
listen = "[::]:8183"; listen = "[::]:8183";
@ -96,7 +95,7 @@
serviceConfig = { serviceConfig = {
User = "root"; User = "root";
Restart = "always"; 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 = { attic-sync-hydra = {

4
systems/palatine-hill/default.nix
View File

@ -1,5 +1,7 @@
{ inputs, ... }: { inputs, ... }:
{ {
users = [ "alice" ]; users = [ "alice" ];
modules = [ inputs.attic.nixosModules.atticd ]; modules = [
# inputs.attic.nixosModules.atticd
];
} }

8
systems/palatine-hill/gitea.nix
View File

@ -16,9 +16,11 @@ in
passwordFile = config.sops.secrets."gitea/dbpass".path; passwordFile = config.sops.secrets."gitea/dbpass".path;
host = "127.0.0.1:5432"; host = "127.0.0.1:5432";
}; };
domain = "git.alicehuston.xyz"; settings.server = {
rootUrl = "https://git.alicehuston.xyz/"; domain = "git.alicehuston.xyz";
httpPort = 443; rootUrl = "https://git.alicehuston.xyz/";
httpPort = 443;
};
stateDir = base_path; stateDir = base_path;
lfs.enable = true; lfs.enable = true;
recommendedDefaults = true; recommendedDefaults = true;

2
users/alice/home.nix
View File

@ -105,7 +105,7 @@
eza = { eza = {
enable = true; enable = true;
icons = true; icons = "auto";
git = true; git = true;
}; };