diff --git a/flake.nix b/flake.nix
index 9eae8fc..4fac534 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,11 @@
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     agenix.url = "github:ryantm/agenix";
 
+    attic.inputs.flake-utils.follows = "flake-utils";
+    attic.inputs.nixpkgs-stable.follows = "stable";
+    attic.inputs.nixpkgs.follows = "nixpkgs";
+    attic.url = "github:zhaofengli/attic";
+
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
 
@@ -26,8 +31,8 @@
 
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
 
-    nix-super.url = "github:privatevoid-net/nix-super";
-    nix-super.inputs.nixpkgs.follows = "stable";
+    nix-super.url = "github:privatevoid-net/nix-super/aaba1f91e7eba8ce029fa6bfa81ad9e14a13708d";
+    nix-super.inputs.nixpkgs.follows = "nixpkgs";
 
     rofi-wayland.url = "github:lbonn/rofi/wayland";
     rofi-wayland.flake = false;
diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix
index 43f39fa..3b72865 100644
--- a/hosts/nixos-desktop/default.nix
+++ b/hosts/nixos-desktop/default.nix
@@ -18,7 +18,6 @@
       personal.enable = true;
     };
     programs.hyprland.nvidiaSupport = true;
-    programs.hyprland.keyboardLayouts = [ "us" "de" ];
     services.mullvad.enable = true;
     programs.ledger.enable = true;
   };
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 86a70be..a623af5 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -100,6 +100,7 @@ in
     statix
     manix
     nix-output-monitor
+    attic
 
     # other
     bat
diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix
index 67cd433..c508c8a 100644
--- a/modules/programs/hyprland/_config.nix
+++ b/modules/programs/hyprland/_config.nix
@@ -25,7 +25,7 @@ in
 
   # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
   input {
-      kb_layout = ${concatStringsSep "," cfg.keyboardLayouts}
+      kb_layout = de,us
       kb_variant =
       kb_model =
       kb_options = grp:win_space_toggle,caps:escape
diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix
index 2805a2e..aec526e 100644
--- a/modules/programs/hyprland/default.nix
+++ b/modules/programs/hyprland/default.nix
@@ -25,11 +25,6 @@ in
       description = "enable window shadows";
       default = true;
     };
-    keyboardLayouts = mkOption {
-      type = types.listOf types.str;
-      description = "list of keyboard layouts";
-      default = [ "de" "us" ];
-    };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 7e88008..47411b9 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -239,12 +239,11 @@ in
           stylua
           sumneko-lua-language-server
           taplo
-          typst
-          typst-lsp
           yamlfmt
         ];
-        plugins = [
-          pkgs.vimPlugins.lazy-nvim
+        plugins = with pkgs.vimPlugins; [
+          lazy-nvim
+          nvim-treesitter.withAllGrammars
         ];
       };
     };
diff --git a/modules/programs/nvim/plugins/default.nix b/modules/programs/nvim/plugins/default.nix
index a1dc84d..f11b9d1 100644
--- a/modules/programs/nvim/plugins/default.nix
+++ b/modules/programs/nvim/plugins/default.nix
@@ -234,10 +234,6 @@ with builtins;
       cmd = [ "StartupTime" ];
       conf = readFile ./vim-startuptime.lua;
     }
-    {
-      plugin = typst-vim;
-      ft = [ "typst" "typ" ];
-    }
     {
       plugin = comment-nvim;
       event = [ "BufReadPost" "BufNewFile" ];
diff --git a/modules/programs/nvim/plugins/nvim-lspconfig.lua b/modules/programs/nvim/plugins/nvim-lspconfig.lua
index d844ca5..75c3e5d 100644
--- a/modules/programs/nvim/plugins/nvim-lspconfig.lua
+++ b/modules/programs/nvim/plugins/nvim-lspconfig.lua
@@ -127,7 +127,6 @@ local servers = {
   "pylsp",
   "ruff_lsp",
   "rust_analyzer",
-  "typst_lsp",
 }
 for _, lsp in ipairs(servers) do
   lspconfig_setup(lsp, {})
diff --git a/overlays/packages.nix b/overlays/packages.nix
index bb884a9..f541331 100644
--- a/overlays/packages.nix
+++ b/overlays/packages.nix
@@ -3,6 +3,7 @@
 _: prev:
 {
   agenix = inputs.agenix.packages.${prev.system}.default;
+  attic = inputs.attic.packages.${prev.system}.default;
   hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
   nil = inputs.nil.packages.${prev.system}.default;
   nix-super = inputs.nix-super.packages.${prev.system}.default;