diff --git a/desktop/gnome/default.nix b/desktop/gnome/default.nix index 7ae2f2d..c658ba9 100644 --- a/desktop/gnome/default.nix +++ b/desktop/gnome/default.nix @@ -12,9 +12,11 @@ # Configure keymap in X11 services.xserver = { - layout = "dk"; - xkbVariant = ""; - xkbOptions = "caps:swapescape"; + xkb = { + layout = "dk"; + variant = ""; + options = "caps:swapescape"; + }; }; environment.systemPackages = [ diff --git a/flake.lock b/flake.lock index 3e30f24..99c7ea8 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708294481, - "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", + "lastModified": 1712688495, + "narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", + "rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708091350, - "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", + "lastModified": 1712695607, + "narHash": "sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", + "rev": "05aa46a1f3b5ac92bfe84807868ba9670d48b031", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708296515, - "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -67,11 +67,11 @@ }, "nur": { "locked": { - "lastModified": 1708371921, - "narHash": "sha256-8EeraFy3KND9d8GZ0EjClXpHXIJn7KoC1ylJyFBArIg=", + "lastModified": 1712692796, + "narHash": "sha256-q3Tx4kS+nH4IDcEsZSv8o2IuCn475mGhCYBXxfxZ2gY=", "owner": "nix-community", "repo": "NUR", - "rev": "393fab7036bd90aea269f2b8c105e5cb8ba553c0", + "rev": "ee4ce451f46a08778d1a9f9837eff0750714b08b", "type": "github" }, "original": { diff --git a/modules/basic/security.nix b/modules/basic/security.nix index 7c63a8a..4f4f958 100644 --- a/modules/basic/security.nix +++ b/modules/basic/security.nix @@ -22,7 +22,7 @@ pkgs.yubikey-manager-qt pkgs.yubioath-flutter pkgs.gnupg - pkgs.pinentry-gnome + pkgs.pinentry-gnome3 ]; networking.firewall.checkReversePath = false; diff --git a/modules/docker/default.nix b/modules/docker/default.nix index 44fcee4..85ceee1 100644 --- a/modules/docker/default.nix +++ b/modules/docker/default.nix @@ -6,5 +6,17 @@ environment.systemPackages = with pkgs; [ docker-compose + k3s + ]; + + networking.firewall.allowedTCPPorts = [ + 6443 + ]; + + services.k3s.enable = true; + services.k3s.role = "server"; + services.k3s.extraFlags = toString [ + # "--disable servicelb" + "--disable traefik" ]; }