diff --git a/cachix.nix b/cachix.nix index ad66d700..d888840a 100644 --- a/cachix.nix +++ b/cachix.nix @@ -10,5 +10,5 @@ imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); in { inherit imports; - nix.binaryCaches = ["https://cache.nixos.org/"]; + nix.settings.substituters = ["https://cache.nixos.org/"]; } diff --git a/cachix/mweinelt.nix b/cachix/mweinelt.nix index cdfc2865..d6da2ef4 100644 --- a/cachix/mweinelt.nix +++ b/cachix/mweinelt.nix @@ -1,9 +1,9 @@ { nix = { - binaryCaches = [ + settings.substituters = [ "https://mweinelt.cachix.org" ]; - binaryCachePublicKeys = [ + settings.trusted-public-keys = [ "mweinelt.cachix.org-1:J9OCu2VAPJ2IHzpOfoJt16Fm5xl9q8VOHqcqCGSNKsM=" ]; }; diff --git a/cachix/pre-commit-hooks.nix b/cachix/pre-commit-hooks.nix index cc29d6ec..75d003c7 100644 --- a/cachix/pre-commit-hooks.nix +++ b/cachix/pre-commit-hooks.nix @@ -1,9 +1,9 @@ { nix = { - binaryCaches = [ + settings.substituters = [ "https://pre-commit-hooks.cachix.org" ]; - binaryCachePublicKeys = [ + settings.trusted-public-keys = [ "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" ]; }; diff --git a/cachix/srid.nix b/cachix/srid.nix index db45c08d..ad765413 100644 --- a/cachix/srid.nix +++ b/cachix/srid.nix @@ -1,9 +1,9 @@ { nix = { - binaryCaches = [ + settings.substituters = [ "https://srid.cachix.org" ]; - binaryCachePublicKeys = [ + settings.trusted-public-keys = [ "srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI=" ]; }; diff --git a/home-manager/roles/default.nix b/home-manager/roles/default.nix index e4bf8e2d..b02c6505 100644 --- a/home-manager/roles/default.nix +++ b/home-manager/roles/default.nix @@ -17,6 +17,8 @@ news.display = "silent"; + home.stateVersion = "22.05"; + programs = { home-manager.enable = true; exa = { diff --git a/nix/sources.json b/nix/sources.json index 181488b4..3ca98525 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,15 +24,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "home-manager-stable": { - "branch": "release-22.05", + "branch": "release-22.11", "description": "Manage a user environment using Nix", "homepage": "", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", - "sha256": "0vg6x7cw2bpiga9k6nlj2n1vrm4qw84721gmlhp3j1i58v100ybc", + "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9", + "sha256": "0pqzyb7ni9cviiiyhr9x7ri8mi400b2jjpqk873791mj76gfh0hv", "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///archive/.tar.gz" }, "kassandra": { @@ -80,21 +80,21 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixos-mailserver": { - "branch": "nixos-22.05", + "branch": "master", "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver", - "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d", + "rev": "fe36e7ae0db34862e5397544c7b01472b0febc3a", "type": "git" }, "nixos-stable": { - "branch": "nixos-22.05", + "branch": "nixos-22.11", "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "fecf05d4861f3985e8dee73f08bc82668ef75125", - "sha256": "0f55nj4x8splycfy32p4sjv1if2kg5wp90m9h90wpwrkm3sn9yqs", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", + "sha256": "1m6bdf74yr434m3xm2cw2frrby38fv1x6dbwk55ncrdrz2ivzlda", "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///archive/.tar.gz" }, "nixos-unstable": { @@ -121,10 +121,10 @@ "homepage": "", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "078b0dee35e2da01334af682ec347463b70a9986", - "sha256": "10d2bylrxgzhff3iw8dawgp181clh2kfsa6vf3br2n6bhixd2h0l", + "rev": "471c7f1ecace25e39099206431300322632d25c4", + "sha256": "091pgslw05f0mp0kwi33xiffvsix2bd2qcggjvp2mkyryh7qr9cm", "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///archive/.tar.gz" }, "wizards-dialog": { diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix index 280266e7..76025a40 100644 --- a/nixos/roles/default.nix +++ b/nixos/roles/default.nix @@ -6,7 +6,10 @@ }: { 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 nixpkgs.overlays = @@ -61,19 +64,19 @@ lib.mkIf (!pkgs.withSecrets) {text = "echo No secrets loaded!; exit 1;";}; nix = { - binaryCaches = lib.mkAfter ( + settings.substituters = lib.mkAfter ( pkgs.privateValue [] "binary-caches" # ++ ( # 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=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "nixbuild.net/maralorn-1:cpqv21sJgRL+ROaKY1Gr0k7AKolAKaP3S3iemGxK/30=" ]; nixPath = ["/etc/nix-path"]; - trustedUsers = ["maralorn" "laminar"]; + settings.trusted-users = ["maralorn" "laminar"]; buildMachines = pkgs.privateValue [] "remote-builders"; extraOptions = '' experimental-features = nix-command flakes diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix index 02019096..56d4d4e1 100644 --- a/overlays/10-previews.nix +++ b/overlays/10-previews.nix @@ -12,14 +12,9 @@ in { (unstable) nix home-assistant - vscode-extensions - vscodium cachix cabal2nix chrysalis - nil - taplo - tut emanote helix ; diff --git a/overlays/element-web/default.nix b/overlays/element-web/default.nix index 5fb8ab1d..9d0e3516 100644 --- a/overlays/element-web/default.nix +++ b/overlays/element-web/default.nix @@ -5,7 +5,7 @@ final: prev: { cat ${./user.css} >> $bundlecss bundlejs=$(find . -name 'vendors~init.js') 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 ''; }); } diff --git a/overlays/neovim.nix b/overlays/neovim.nix deleted file mode 100644 index 5385f57e..00000000 --- a/overlays/neovim.nix +++ /dev/null @@ -1,7 +0,0 @@ -self: super: { - neovim = super.neovim.override { - vimAlias = true; - withPython3 = true; - withPython = false; - }; -}