From 8a10ea437cf74619865e0966f8be8f16e6cba938 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Mon, 5 Dec 2022 16:37:27 +0100
Subject: update to nixos22.11

---
 common/cachix.nix               | 13 -------------
 common/cachix/nix-community.nix | 11 -----------
 common/cachix/veloren-nix.nix   | 12 ------------
 common/common.nix               |  1 +
 common/desktop.nix              |  1 -
 5 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 common/cachix.nix
 delete mode 100644 common/cachix/nix-community.nix
 delete mode 100644 common/cachix/veloren-nix.nix

(limited to 'common')

diff --git a/common/cachix.nix b/common/cachix.nix
deleted file mode 100644
index 88b2f08..0000000
--- a/common/cachix.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# WARN: this file will get overwritten by $ cachix use <name>
-{ pkgs, lib, ... }:
-
-let
-  folder = ./cachix;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
-}
diff --git a/common/cachix/nix-community.nix b/common/cachix/nix-community.nix
deleted file mode 100644
index 427a518..0000000
--- a/common/cachix/nix-community.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-
-{
-  nix = {
-    binaryCaches = [
-      "https://nix-community.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}
diff --git a/common/cachix/veloren-nix.nix b/common/cachix/veloren-nix.nix
deleted file mode 100644
index 37fb947..0000000
--- a/common/cachix/veloren-nix.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-
-{
-  nix = {
-    binaryCaches = [
-      "https://veloren-nix.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="
-    ];
-  };
-}
-    
\ No newline at end of file
diff --git a/common/common.nix b/common/common.nix
index a5d62f4..0f8cc11 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -8,6 +8,7 @@
 
   
   i18n.defaultLocale = "en_IE.UTF-8";
+  i18n.supportedLocales = [ "de_DE.UTF-8/UTF-8" "en_IE.UTF-8/UTF-8" ];
   time.timeZone = "Europe/Amsterdam";
 
   environment.systemPackages = with pkgs; [
diff --git a/common/desktop.nix b/common/desktop.nix
index 7b1f3ba..6d0999b 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./common.nix
-    ./cachix.nix
   ];
 
   nix.extraOptions = ''
-- 
cgit v1.2.3