maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Update to nixos 22.11

Browse source
This commit is contained in:
Malte 2022-11-30 22:52:14 +01:00
parent 4bda10a308
commit 8aa46b2c01
10 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cachix.nix
View file

@ -10,5 +10,5 @@
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
in { in {
inherit imports; inherit imports;
nix.binaryCaches = ["https://cache.nixos.org/"]; nix.settings.substituters = ["https://cache.nixos.org/"];
} }

4
cachix/mweinelt.nix
View file

@ -1,9 +1,9 @@
{ {
nix = { nix = {
binaryCaches = [ settings.substituters = [
"https://mweinelt.cachix.org" "https://mweinelt.cachix.org"
]; ];
binaryCachePublicKeys = [ settings.trusted-public-keys = [
"mweinelt.cachix.org-1:J9OCu2VAPJ2IHzpOfoJt16Fm5xl9q8VOHqcqCGSNKsM=" "mweinelt.cachix.org-1:J9OCu2VAPJ2IHzpOfoJt16Fm5xl9q8VOHqcqCGSNKsM="
]; ];
}; };

4
cachix/pre-commit-hooks.nix
View file

@ -1,9 +1,9 @@
{ {
nix = { nix = {
binaryCaches = [ settings.substituters = [
"https://pre-commit-hooks.cachix.org" "https://pre-commit-hooks.cachix.org"
]; ];
binaryCachePublicKeys = [ settings.trusted-public-keys = [
"pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
]; ];
}; };

4
cachix/srid.nix
View file

@ -1,9 +1,9 @@
{ {
nix = { nix = {
binaryCaches = [ settings.substituters = [
"https://srid.cachix.org" "https://srid.cachix.org"
]; ];
binaryCachePublicKeys = [ settings.trusted-public-keys = [
"srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI=" "srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI="
]; ];
}; };

2
home-manager/roles/default.nix
View file

@ -17,6 +17,8 @@
news.display = "silent"; news.display = "silent";
home.stateVersion = "22.05";
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
exa = { exa = {

26
nix/sources.json
View file

@ -24,15 +24,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"home-manager-stable": { "home-manager-stable": {
"branch": "release-22.05", "branch": "release-22.11",
"description": "Manage a user environment using Nix", "description": "Manage a user environment using Nix",
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
"sha256": "0vg6x7cw2bpiga9k6nlj2n1vrm4qw84721gmlhp3j1i58v100ybc", "sha256": "0pqzyb7ni9cviiiyhr9x7ri8mi400b2jjpqk873791mj76gfh0hv",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/6639e3a837fc5deb6f99554072789724997bc8e5.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/e891b060e7d11bb8f7dedb86a41d804891a6f5a9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"kassandra": { "kassandra": {
@ -80,21 +80,21 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixos-mailserver": { "nixos-mailserver": {
"branch": "nixos-22.05", "branch": "master",
"repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver", "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
"rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d", "rev": "fe36e7ae0db34862e5397544c7b01472b0febc3a",
"type": "git" "type": "git"
}, },
"nixos-stable": { "nixos-stable": {
"branch": "nixos-22.05", "branch": "nixos-22.11",
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fecf05d4861f3985e8dee73f08bc82668ef75125", "rev": "731cc710aeebecbf45a258e977e8b68350549522",
"sha256": "0f55nj4x8splycfy32p4sjv1if2kg5wp90m9h90wpwrkm3sn9yqs", "sha256": "1m6bdf74yr434m3xm2cw2frrby38fv1x6dbwk55ncrdrz2ivzlda",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fecf05d4861f3985e8dee73f08bc82668ef75125.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/731cc710aeebecbf45a258e977e8b68350549522.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixos-unstable": { "nixos-unstable": {
@ -121,10 +121,10 @@
"homepage": "", "homepage": "",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "078b0dee35e2da01334af682ec347463b70a9986", "rev": "471c7f1ecace25e39099206431300322632d25c4",
"sha256": "10d2bylrxgzhff3iw8dawgp181clh2kfsa6vf3br2n6bhixd2h0l", "sha256": "091pgslw05f0mp0kwi33xiffvsix2bd2qcggjvp2mkyryh7qr9cm",
"type": "tarball", "type": "tarball",
"url": "https://github.com/cachix/pre-commit-hooks.nix/archive/078b0dee35e2da01334af682ec347463b70a9986.tar.gz", "url": "https://github.com/cachix/pre-commit-hooks.nix/archive/471c7f1ecace25e39099206431300322632d25c4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"wizards-dialog": { "wizards-dialog": {

11
nixos/roles/default.nix
View file

@ -6,7 +6,10 @@
}: { }: {
imports = [../../common ./admin.nix ../../cachix.nix]; imports = [../../common ./admin.nix ../../cachix.nix];
i18n.defaultLocale = "en_US.UTF-8"; i18n = {
defaultLocale = "en_DK.UTF-8";
supportedLocales = ["en_DK.UTF-8/UTF-8" "de_DE.UTF-8/UTF-8" "en_US.UTF-8/UTF-8"];
};
# For nixos-rebuild # For nixos-rebuild
nixpkgs.overlays = nixpkgs.overlays =
@ -61,19 +64,19 @@
lib.mkIf (!pkgs.withSecrets) {text = "echo No secrets loaded!; exit 1;";}; lib.mkIf (!pkgs.withSecrets) {text = "echo No secrets loaded!; exit 1;";};
nix = { nix = {
binaryCaches = lib.mkAfter ( settings.substituters = lib.mkAfter (
pkgs.privateValue [] "binary-caches" pkgs.privateValue [] "binary-caches"
# ++ ( # ++ (
# if config.networking.hostName != "hera" then [ "ssh-ng://nix-ssh@hera.m-0.eu?trusted=true&priority=100" ] else [ ] # if config.networking.hostName != "hera" then [ "ssh-ng://nix-ssh@hera.m-0.eu?trusted=true&priority=100" ] else [ ]
# ) # )
); );
binaryCachePublicKeys = [ settings.trusted-public-keys = [
"ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=" "ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI="
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
"nixbuild.net/maralorn-1:cpqv21sJgRL+ROaKY1Gr0k7AKolAKaP3S3iemGxK/30=" "nixbuild.net/maralorn-1:cpqv21sJgRL+ROaKY1Gr0k7AKolAKaP3S3iemGxK/30="
]; ];
nixPath = ["/etc/nix-path"]; nixPath = ["/etc/nix-path"];
trustedUsers = ["maralorn" "laminar"]; settings.trusted-users = ["maralorn" "laminar"];
buildMachines = pkgs.privateValue [] "remote-builders"; buildMachines = pkgs.privateValue [] "remote-builders";
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes

5
overlays/10-previews.nix
View file

@ -12,14 +12,9 @@ in {
(unstable) (unstable)
nix nix
home-assistant home-assistant
vscode-extensions
vscodium
cachix cachix
cabal2nix cabal2nix
chrysalis chrysalis
nil
taplo
tut
emanote emanote
helix helix
; ;

2
overlays/element-web/default.nix
View file

@ -5,7 +5,7 @@ final: prev: {
cat ${./user.css} >> $bundlecss cat ${./user.css} >> $bundlecss
bundlejs=$(find . -name 'vendors~init.js') bundlejs=$(find . -name 'vendors~init.js')
sed -i 's/return n.room.roomId===e||n.isUnread}/return n.room.roomId===e||n.hasUnreadCount}/' $bundlejs sed -i 's/return n.room.roomId===e||n.isUnread}/return n.room.roomId===e||n.hasUnreadCount}/' $bundlejs
cp ${./orville_communicator.opus} media/message.ogg #cp ${./orville_communicator.opus} media/message.ogg
''; '';
}); });
} }

7
overlays/neovim.nix
View file

@ -1,7 +0,0 @@
self: super: {
neovim = super.neovim.override {
vimAlias = true;
withPython3 = true;
withPython = false;
};
}