From 579e711735b3f0f4aa2662d86aa804767b478894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 25 Jun 2023 10:58:39 +0200 Subject: [PATCH 1/5] feat(nvim): add option for keyboard layouts --- hosts/nixos-desktop/default.nix | 1 + modules/programs/hyprland/_config.nix | 2 +- modules/programs/hyprland/default.nix | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 3b72865..43f39fa 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -18,6 +18,7 @@ personal.enable = true; }; programs.hyprland.nvidiaSupport = true; + programs.hyprland.keyboardLayouts = [ "us" "de" ]; services.mullvad.enable = true; programs.ledger.enable = true; }; diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix index c508c8a..67cd433 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 = de,us + kb_layout = ${concatStringsSep "," cfg.keyboardLayouts} 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 aec526e..2805a2e 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -25,6 +25,11 @@ 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 { From 7deef6eabdee02c031a2a1f5ee9ea6968ab1d181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 25 Jun 2023 11:15:08 +0200 Subject: [PATCH 2/5] feat(nvim): add typst lsp --- modules/programs/nvim/default.nix | 2 ++ modules/programs/nvim/plugins/default.nix | 4 ++++ modules/programs/nvim/plugins/nvim-lspconfig.lua | 1 + 3 files changed, 7 insertions(+) diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 47411b9..acb4f76 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -239,6 +239,8 @@ in stylua sumneko-lua-language-server taplo + typst + typst-lsp yamlfmt ]; plugins = with pkgs.vimPlugins; [ diff --git a/modules/programs/nvim/plugins/default.nix b/modules/programs/nvim/plugins/default.nix index f11b9d1..a1dc84d 100644 --- a/modules/programs/nvim/plugins/default.nix +++ b/modules/programs/nvim/plugins/default.nix @@ -234,6 +234,10 @@ 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 75c3e5d..d844ca5 100644 --- a/modules/programs/nvim/plugins/nvim-lspconfig.lua +++ b/modules/programs/nvim/plugins/nvim-lspconfig.lua @@ -127,6 +127,7 @@ local servers = { "pylsp", "ruff_lsp", "rust_analyzer", + "typst_lsp", } for _, lsp in ipairs(servers) do lspconfig_setup(lsp, {}) From 8161bfbbc8adfacd93a0fa506b336a9face8f8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 25 Jun 2023 11:21:24 +0200 Subject: [PATCH 3/5] build!: remove attic --- flake.nix | 5 ----- modules/profiles/base.nix | 1 - overlays/packages.nix | 1 - 3 files changed, 7 deletions(-) diff --git a/flake.nix b/flake.nix index 4fac534..6125a1e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,11 +17,6 @@ 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"; diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index a623af5..86a70be 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -100,7 +100,6 @@ in statix manix nix-output-monitor - attic # other bat diff --git a/overlays/packages.nix b/overlays/packages.nix index f541331..bb884a9 100644 --- a/overlays/packages.nix +++ b/overlays/packages.nix @@ -3,7 +3,6 @@ _: 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; From 5dc5cf0078a3b8257e80ea1f60b20690cb839569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Tue, 27 Jun 2023 22:03:38 +0200 Subject: [PATCH 4/5] feat: update nix super --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6125a1e..9eae8fc 100644 --- a/flake.nix +++ b/flake.nix @@ -26,8 +26,8 @@ pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; - nix-super.url = "github:privatevoid-net/nix-super/aaba1f91e7eba8ce029fa6bfa81ad9e14a13708d"; - nix-super.inputs.nixpkgs.follows = "nixpkgs"; + nix-super.url = "github:privatevoid-net/nix-super"; + nix-super.inputs.nixpkgs.follows = "stable"; rofi-wayland.url = "github:lbonn/rofi/wayland"; rofi-wayland.flake = false; From d87c4da49e8f46c8ed24739c99b787d6461ef4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Tue, 27 Jun 2023 22:04:17 +0200 Subject: [PATCH 5/5] fix(nvim): remove redundant treesitter plugin --- modules/programs/nvim/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index acb4f76..7e88008 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -243,9 +243,8 @@ in typst-lsp yamlfmt ]; - plugins = with pkgs.vimPlugins; [ - lazy-nvim - nvim-treesitter.withAllGrammars + plugins = [ + pkgs.vimPlugins.lazy-nvim ]; }; };