palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Ingolf Wagner 2024-06-19 13:19:46 +02:00
parent 8dd8491e22
commit 5d9d4cfd23
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
2 changed files with 65 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
flake.lock
View file

@ -129,11 +129,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1718444309, "lastModified": 1718789981,
"narHash": "sha256-q/nc4X5o48mqB6ZSMTlrYqMUUq95MTVgCigAQ5lytSE=", "narHash": "sha256-07ZsyqsbzXEAzzpR+vf4vEZzBMd0nUKjprYcL6ykmy8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b28950f31058c60e6e8e338aaefb2a6019b7b2a0", "rev": "6c11e0ced7cc42f93b114c336792cba051eec279",
"revCount": 3135, "revCount": 3157,
"type": "git", "type": "git",
"url": "https://git.clan.lol/clan/clan-core" "url": "https://git.clan.lol/clan/clan-core"
}, },
@ -386,11 +386,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1718243258, "lastModified": 1718788307,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +485,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1718020342, "lastModified": 1718625083,
"narHash": "sha256-uFPCjTnwFcgxte/k+TsAcZAJigIUnrzpH9OXqot/q84=", "narHash": "sha256-0xv6VvK5wc1cqjx8KihufiIbQ5MiChiBiSr+ud+z7Zg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-anywhere", "repo": "nixos-anywhere",
"rev": "46dc28f4f89b747084c7dd6d273b1278142220ce", "rev": "3b3c6008375e5cca2bfdefe23eaf1e1fae875f28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,11 +522,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1718459188, "lastModified": 1718548414,
"narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=", "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29", "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nixpkgs-legacy_2311": { "nixpkgs-legacy_2311": {
"locked": { "locked": {
"lastModified": 1718229064, "lastModified": 1718447546,
"narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=", "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44", "rev": "842253bf992c3a7157b67600c2857193f126563a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,11 +650,11 @@
}, },
"nixpkgs-legacy_2405": { "nixpkgs-legacy_2405": {
"locked": { "locked": {
"lastModified": 1718208800, "lastModified": 1718437845,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,13 +676,29 @@
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
} }
}, },
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1718770573,
"narHash": "sha256-tnNrZhmle3RE6DtLFADO+nRy0QuzQp4ztVK0R4tUHSA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "31a131649c0bcd9d7d9b87786b3fbb54b4dbe6e0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1717786204, "lastModified": 1718530797,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -725,11 +741,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1718318537, "lastModified": 1718530797,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -771,11 +787,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1718210986, "lastModified": 1718541509,
"narHash": "sha256-349PlHisFAtaQD+D5zZnwOmH8lFkONARiC3awAW6asM=", "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4b755b0f089935ce5dbfead30ddc79e6dcd3f80e", "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -907,6 +923,7 @@
"nixpkgs-legacy_2211": "nixpkgs-legacy_2211", "nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
"nixpkgs-legacy_2311": "nixpkgs-legacy_2311", "nixpkgs-legacy_2311": "nixpkgs-legacy_2311",
"nixpkgs-legacy_2405": "nixpkgs-legacy_2405", "nixpkgs-legacy_2405": "nixpkgs-legacy_2405",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"overviewer": "overviewer", "overviewer": "overviewer",
"permown": "permown", "permown": "permown",
"polygon-art": "polygon-art", "polygon-art": "polygon-art",
@ -964,11 +981,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1718459800, "lastModified": 1718585173,
"narHash": "sha256-oRkHJbp/jIljo+yXY6sSjMMTBqWNhIjd4qhs0pTjwbs=", "narHash": "sha256-G5DB6D3p8ucyGfmWt3JmiWcVW55DeuUoiT230wQ9Am4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "b724a9ad24945a4d6fb11a42f1c2ce072fa3c4c2", "rev": "c607ffef7c234d88f37ed12d75b2c48de3f4b3fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -996,11 +1013,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718457106, "lastModified": 1718789425,
"narHash": "sha256-sVpsAuvXaSRHhcCw8XbVKlZe8GqB5jpGj4oyZaHAI/Y=", "narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a7fbda1fd965cc22e62463896a4af0342cb00e6a", "rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4",
"type": "github" "type": "github"
}, },
"original": { "original": {

22
flake.nix
View file

@ -22,6 +22,7 @@
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05";
@ -111,6 +112,7 @@
, nixpkgs-legacy_2211 , nixpkgs-legacy_2211
, nixpkgs-legacy_2311 , nixpkgs-legacy_2311
, nixpkgs-legacy_2405 , nixpkgs-legacy_2405
, nixpkgs-unstable-small
, overviewer , overviewer
, permown , permown
, polygon-art , polygon-art
@ -142,6 +144,10 @@
]; ];
overlays = [ overlays = [
(_self: _super: { (_self: _super: {
unstable-small = import nixpkgs-unstable-small {
inherit system;
config.allowUnfree = true;
};
legacy_2211 = import nixpkgs-legacy_2211 { legacy_2211 = import nixpkgs-legacy_2211 {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
@ -180,7 +186,7 @@
clan.networking.targetHost = lib.mkDefault "root@${host}"; clan.networking.targetHost = lib.mkDefault "root@${host}";
nixpkgs.pkgs = meta.pkgs; nixpkgs.pkgs = meta.pkgs;
nixpkgs.hostPlatform = meta.system; nixpkgs.hostPlatform = meta.system;
clanCore.facts.secretStore = "password-store"; clan.core.facts.secretStore = "password-store";
imports = modules ++ defaultModules ++ [ imports = modules ++ defaultModules ++ [
./machines/${name}/configuration.nix ./machines/${name}/configuration.nix
@ -217,8 +223,8 @@
# master key # master key
./assets/mrvandalo_rsa.pub ./assets/mrvandalo_rsa.pub
# backup key # backup key
"${config.clanCore.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub" "${config.clan.core.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub"
"${config.clanCore.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub" "${config.clan.core.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub"
]; ];
}) })
# configure nix # configure nix
@ -336,7 +342,7 @@
]; ];
}) })
{ {
clanCore.machineDescription = "LaLaptop"; clan.core.machineDescription = "LaLaptop";
} }
]; ];
}; };
@ -357,7 +363,7 @@
home-manager.users.root = import ./homes/root; home-manager.users.root = import ./homes/root;
} }
{ {
clanCore.machineDescription = "Laptop"; clan.core.machineDescription = "Laptop";
} }
]; ];
}; };
@ -377,7 +383,7 @@
home-manager.users.root = import ./homes/root; home-manager.users.root = import ./homes/root;
} }
{ {
clanCore.machineDescription = "Laptop"; clan.core.machineDescription = "Laptop";
} }
]; ];
}; };
@ -401,7 +407,7 @@
home-manager.users.root = import ./homes/root; home-manager.users.root = import ./homes/root;
} }
{ {
clanCore.machineDescription = "Home Server"; clan.core.machineDescription = "Home Server";
} }
]; ];
}; };
@ -426,7 +432,7 @@
home-manager.users.root = import ./homes/root; home-manager.users.root = import ./homes/root;
} }
{ {
clanCore.machineDescription = "Internet Server"; clan.core.machineDescription = "Internet Server";
} }
]; ];
}; };