From a64752da5aee7ec518ac2855c4da696f72abd6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 17 Oct 2024 13:01:39 +0200 Subject: [PATCH 1/6] style: move telescope to own file --- modules/programs/nvim/new_plugins/other.nix | 35 ----------------- .../programs/nvim/new_plugins/telescope.nix | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 modules/programs/nvim/new_plugins/telescope.nix diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix index 1b5d7c4..4d149e0 100644 --- a/modules/programs/nvim/new_plugins/other.nix +++ b/modules/programs/nvim/new_plugins/other.nix @@ -29,41 +29,6 @@ in ]; } { plugins.oil.enable = true; } - { - plugins = { - telescope = { - enable = true; - extensions.fzf-native.enable = true; - keymaps = { - "ff" = { - action = "find_files"; - options.desc = "Find files"; - }; - "fb" = { - action = "buffers"; - options.desc = "Find buffers"; - }; - "fl" = { - action = "current_buffer_fuzzy_find"; - options.desc = "Search lines"; - }; - "fg" = { - action = "live_grep"; - options.desc = "Live grep"; - }; - "fh" = { - action = "help_tags"; - options.desc = "Help tags"; - }; - "fr" = { - action = "oldfiles"; - options.desc = "Recent files"; - }; - }; - }; - web-devicons.enable = true; - }; - } { plugins.nvim-autopairs.enable = true; } { plugins.vim-surround.enable = true; } { diff --git a/modules/programs/nvim/new_plugins/telescope.nix b/modules/programs/nvim/new_plugins/telescope.nix new file mode 100644 index 0000000..a0f6b4b --- /dev/null +++ b/modules/programs/nvim/new_plugins/telescope.nix @@ -0,0 +1,39 @@ +_: + +{ + home-manager.users.moritz.programs.nixvim = { + plugins = { + telescope = { + enable = true; + extensions.fzf-native.enable = true; + keymaps = { + "ff" = { + action = "find_files"; + options.desc = "Find files"; + }; + "fb" = { + action = "buffers"; + options.desc = "Find buffers"; + }; + "fl" = { + action = "current_buffer_fuzzy_find"; + options.desc = "Search lines"; + }; + "fg" = { + action = "live_grep"; + options.desc = "Live grep"; + }; + "fh" = { + action = "help_tags"; + options.desc = "Help tags"; + }; + "fr" = { + action = "oldfiles"; + options.desc = "Recent files"; + }; + }; + }; + web-devicons.enable = true; + }; + }; +} From 8b76537d241afbfd9ed999e343796e3321dece5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 17 Oct 2024 13:02:38 +0200 Subject: [PATCH 2/6] feat: refactor kanshi --- hosts/nixos-laptop/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index 10754e9..14ac222 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -27,16 +27,19 @@ users.users.moritz.packages = [ pkgs.poetry ]; - home-manager.users.moritz.services.kanshi.profiles = { - undocked = { - outputs = [ + home-manager.users.moritz.services.kanshi.settings = [ + { + profile.name = "undocked"; + profile.outputs = [ { criteria = "eDP-1"; } ]; - }; - docked = { - outputs = [ + + } + { + profile.name = "docked"; + profile.outputs = [ { criteria = "eDP-1"; position = "640,1800"; # NOTE: 2160 / 1.2 = 1800 @@ -47,8 +50,9 @@ position = "0,0"; } ]; - }; - }; + + } + ]; services.kanata = { enable = true; From 4c82f7f76dd656c30ca0581f008ae855144071d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 17 Oct 2024 13:03:11 +0200 Subject: [PATCH 3/6] fix: flawed systemd stuff --- modules/programs/river/default.nix | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/modules/programs/river/default.nix b/modules/programs/river/default.nix index 9117504..774d1cb 100644 --- a/modules/programs/river/default.nix +++ b/modules/programs/river/default.nix @@ -273,27 +273,5 @@ in }; }; security.rtkit.enable = true; - - home-manager.users.moritz.systemd.user.services = - let - units = [ "waybar" ]; - mkAfter = _: { - Unit = { - After = [ "river-session.target" ]; - Wants = [ "river-session.target" ]; - }; - }; - in - lib.genAttrs units mkAfter; - - systemd.user.services = - let - units = [ "pipewire" "xdg-desktop-portal" "wireplumber" ]; - mkAfter = _: { - after = [ "river-session.target" ]; - wants = [ "river-session.target" ]; - }; - in - lib.genAttrs units mkAfter; }; } From f736721a1f87d7495a0d5104264723146d7bed4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 17 Oct 2024 13:03:45 +0200 Subject: [PATCH 4/6] feat(nvim): add helpview plugin --- modules/programs/nvim/new_plugins/other.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix index 4d149e0..a65cd02 100644 --- a/modules/programs/nvim/new_plugins/other.nix +++ b/modules/programs/nvim/new_plugins/other.nix @@ -49,6 +49,10 @@ in { plugins.friendly-snippets.enable = true; } { plugins.direnv.enable = true; } { plugins.crates-nvim.enable = true; } + { + plugins.helpview.enable = true; + performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ]; + } ]; }; } From 840d3d67d9388ac25e5c98e2283df5d4965f80be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 17 Oct 2024 13:04:11 +0200 Subject: [PATCH 5/6] feat(nvim): enable luaLoader --- modules/programs/nvim/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 7e26b6e..458c420 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -46,6 +46,7 @@ in package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default; vimAlias = true; extraConfigLuaPre = readFile ./options.lua; + luaLoader.enable = true; performance = { byteCompileLua = { enable = true; From 5f9aa7aa225d509e885f65e9a3614296be71fa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 17 Oct 2024 13:04:30 +0200 Subject: [PATCH 6/6] feat: add command to measure vim startup time --- flake.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flake.nix b/flake.nix index ec41ffd..1beea8b 100644 --- a/flake.nix +++ b/flake.nix @@ -98,6 +98,11 @@ help = "wrapper for nixos-rebuild switch"; command = "sudo nixos-rebuild boot --flake . $@"; } + { + name = "vim-startuptime"; + help = "test vim startup time"; + command = "${pkgs.lib.getExe pkgs.hyperfine} --warmup 5 --prepare 'sleep 2' 'vim -c exit'"; + } ]; packages = with pkgs; [ stylua